Skip to content

Commit 4c7462f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1299 from hongkailiu/fix-lint-issues
NO-JIRA: Fix some lint issues
2 parents 9d362fb + 0ca673f commit 4c7462f

36 files changed

Lines changed: 128 additions & 102 deletions

‎lib/resourcebuilder/interface.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ type Interface interface {
8383
func New(mapper *ResourceMapper, rest *rest.Config, m manifest.Manifest) (Interface, error) {
8484
f, ok := mapper.gvkToNew[m.GVK]
8585
if !ok {
86-
return nil, fmt.Errorf("No mapping found for gvk: %v", m.GVK)
86+
return nil, fmt.Errorf("no mapping found for gvk: %v", m.GVK)
8787
}
8888
return f(rest, m), nil
8989
}

‎lib/resourcedelete/admissionregistration.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ func DeleteValidatingWebhookConfigurationv1(ctx context.Context,
3030
// Only request deletion when in update mode.
3131
if !deleteRequested && updateMode {
3232
if err := client.ValidatingWebhookConfigurations().Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
33-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
33+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3434
}
3535
SetDeleteRequested(existing, resource)
3636
}
3737
} else {
38-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
38+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3939
}
4040
return true, nil
4141
}

‎lib/resourcedelete/apiext.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func DeleteCustomResourceDefinitionv1(ctx context.Context, client apiextclientv1
2828
// Only request deletion when in update mode.
2929
if !deleteRequested && updateMode {
3030
if err := client.CustomResourceDefinitions().Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
31-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
31+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3232
}
3333
SetDeleteRequested(existing, resource)
3434
}
3535
} else {
36-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
36+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3737
}
3838
return true, nil
3939
}

‎lib/resourcedelete/apps.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func DeleteDeploymentv1(ctx context.Context, client appsclientv1.DeploymentsGett
2828
// Only request deletion when in update mode.
2929
if !deleteRequested && updateMode {
3030
if err := client.Deployments(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
31-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
31+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3232
}
3333
SetDeleteRequested(existing, resource)
3434
}
3535
} else {
36-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
36+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3737
}
3838
return true, nil
3939
}
@@ -57,12 +57,12 @@ func DeleteDaemonSetv1(ctx context.Context, client appsclientv1.DaemonSetsGetter
5757
// Only request deletion when in update mode.
5858
if !deleteRequested && updateMode {
5959
if err := client.DaemonSets(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
60-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
60+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
6161
}
6262
SetDeleteRequested(existing, resource)
6363
}
6464
} else {
65-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
65+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
6666
}
6767
return true, nil
6868
}

‎lib/resourcedelete/batch.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ func DeleteJobv1(ctx context.Context, client batchclientv1.JobsGetter, required
2626
}
2727
deleteRequested, err := GetDeleteProgress(resource, err)
2828
if err != nil {
29-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
29+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3030
}
3131
if !deleteRequested && updateMode {
3232
if err := client.Jobs(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
33-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
33+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3434
}
3535
SetDeleteRequested(existing, resource)
3636
}
@@ -54,11 +54,11 @@ func DeleteCronJobv1(ctx context.Context, client batchclientv1.CronJobsGetter, r
5454
}
5555
deleteRequested, err := GetDeleteProgress(resource, err)
5656
if err != nil {
57-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
57+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
5858
}
5959
if !deleteRequested && updateMode {
6060
if err := client.CronJobs(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
61-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
61+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
6262
}
6363
SetDeleteRequested(existing, resource)
6464
}

‎lib/resourcedelete/core.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func DeleteNamespacev1(ctx context.Context, client coreclientv1.NamespacesGetter
2828
// Only request deletion when in update mode.
2929
if !deleteRequested && updateMode {
3030
if err := client.Namespaces().Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
31-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
31+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3232
}
3333
SetDeleteRequested(existing, resource)
3434
}
3535
} else {
36-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
36+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3737
}
3838
return true, nil
3939
}
@@ -57,12 +57,12 @@ func DeleteServicev1(ctx context.Context, client coreclientv1.ServicesGetter, re
5757
// Only request deletion when in update mode.
5858
if !deleteRequested && updateMode {
5959
if err := client.Services(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
60-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
60+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
6161
}
6262
SetDeleteRequested(existing, resource)
6363
}
6464
} else {
65-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
65+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
6666
}
6767
return true, nil
6868
}
@@ -86,12 +86,12 @@ func DeleteServiceAccountv1(ctx context.Context, client coreclientv1.ServiceAcco
8686
// Only request deletion when in update mode.
8787
if !deleteRequested && updateMode {
8888
if err := client.ServiceAccounts(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
89-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
89+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
9090
}
9191
SetDeleteRequested(existing, resource)
9292
}
9393
} else {
94-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
94+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
9595
}
9696
return true, nil
9797
}
@@ -115,12 +115,12 @@ func DeleteConfigMapv1(ctx context.Context, client coreclientv1.ConfigMapsGetter
115115
// Only request deletion when in update mode.
116116
if !deleteRequested && updateMode {
117117
if err := client.ConfigMaps(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
118-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
118+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
119119
}
120120
SetDeleteRequested(existing, resource)
121121
}
122122
} else {
123-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
123+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
124124
}
125125
return true, nil
126126
}

‎lib/resourcedelete/helper.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func ValidDeleteAnnotation(annotations map[string]string) (bool, error) {
3737
if value, ok := annotations[DeleteAnnotation]; !ok {
3838
return false, nil
3939
} else if value != "true" {
40-
return true, fmt.Errorf("Invalid delete annotation \"%s\" value: \"%s\"", DeleteAnnotation, value)
40+
return true, fmt.Errorf("invalid delete annotation \"%s\" value: \"%s\"", DeleteAnnotation, value)
4141
}
4242
return true, nil
4343
}
@@ -126,7 +126,7 @@ func GetDeleteProgress(resource Resource, getError error) (bool, error) {
126126
return true, nil
127127
}
128128
if getError != nil {
129-
return false, fmt.Errorf("Cannot get %s to delete, err=%v.", resource, getError)
129+
return false, fmt.Errorf("cannot get %s to delete, err=%v", resource, getError)
130130
}
131131
return false, nil
132132
}

‎lib/resourcedelete/imagestream.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func DeleteImageStreamv1(ctx context.Context, client imageclientv1.ImageStreamsG
2828
// Only request deletion when in update mode.
2929
if !deleteRequested && updateMode {
3030
if err := client.ImageStreams(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
31-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
31+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3232
}
3333
SetDeleteRequested(existing, resource)
3434
}
3535
} else {
36-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
36+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3737
}
3838
return true, nil
3939
}

‎lib/resourcedelete/operators.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func DeleteOperatorGroupv1(ctx context.Context, client operatorsclientv1.Operato
2828
// Only request deletion when in update mode.
2929
if !deleteRequested && updateMode {
3030
if err := client.OperatorGroups(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
31-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
31+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3232
}
3333
SetDeleteRequested(existing, resource)
3434
}
3535
} else {
36-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
36+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3737
}
3838
return true, nil
3939
}

‎lib/resourcedelete/rbac.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func DeleteClusterRoleBindingv1(ctx context.Context, client rbacclientv1.Cluster
2828
// Only request deletion when in update mode.
2929
if !deleteRequested && updateMode {
3030
if err := client.ClusterRoleBindings().Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
31-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
31+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
3232
}
3333
SetDeleteRequested(existing, resource)
3434
}
3535
} else {
36-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
36+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
3737
}
3838
return true, nil
3939
}
@@ -57,12 +57,12 @@ func DeleteClusterRolev1(ctx context.Context, client rbacclientv1.ClusterRolesGe
5757
// Only request deletion when in update mode.
5858
if !deleteRequested && updateMode {
5959
if err := client.ClusterRoles().Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
60-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
60+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
6161
}
6262
SetDeleteRequested(existing, resource)
6363
}
6464
} else {
65-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
65+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
6666
}
6767
return true, nil
6868
}
@@ -86,12 +86,12 @@ func DeleteRoleBindingv1(ctx context.Context, client rbacclientv1.RoleBindingsGe
8686
// Only request deletion when in update mode.
8787
if !deleteRequested && updateMode {
8888
if err := client.RoleBindings(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
89-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
89+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
9090
}
9191
SetDeleteRequested(existing, resource)
9292
}
9393
} else {
94-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
94+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
9595
}
9696
return true, nil
9797
}
@@ -115,12 +115,12 @@ func DeleteRolev1(ctx context.Context, client rbacclientv1.RolesGetter, required
115115
// Only request deletion when in update mode.
116116
if !deleteRequested && updateMode {
117117
if err := client.Roles(required.Namespace).Delete(ctx, required.Name, metav1.DeleteOptions{}); err != nil {
118-
return true, fmt.Errorf("Delete request for %s failed, err=%v", resource, err)
118+
return true, fmt.Errorf("delete request for %s failed, err=%v", resource, err)
119119
}
120120
SetDeleteRequested(existing, resource)
121121
}
122122
} else {
123-
return true, fmt.Errorf("Error running delete for %s, err=%v", resource, err)
123+
return true, fmt.Errorf("error running delete for %s, err=%v", resource, err)
124124
}
125125
return true, nil
126126
}

0 commit comments

Comments
 (0)