Skip to content

Commit 9059491

Browse files
google-oss-prow[bot]google-oss-prow[bot]
authored
Merge pull request GoogleCloudPlatform#1257 from acpana/acpana/c5
chore:lint: support revive part1
2 parents 976631c + a800126 commit 9059491

File tree

129 files changed

+1084
-1108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1084
-1108
lines changed

‎config/tests/samples/create/samples.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ func replaceResourceNamesWithUniqueIDs(t *testing.T, unstructs []*unstructured.U
379379
namesToUniqueIDs := make(map[string]string)
380380
idReg := regexp.MustCompile("[a-z]")
381381
for _, n := range namesToBeReplaced {
382-
namesToUniqueIDs[n] = testvariable.RandomIdGenerator(idReg, uint(len(n)))
382+
namesToUniqueIDs[n] = testvariable.RandomIDGenerator(idReg, uint(len(n)))
383383
}
384384

385385
newUnstructs := make([]*unstructured.Unstructured, 0)
@@ -484,7 +484,7 @@ func generateNewFolderDisplayName(folderUnstruct *unstructured.Unstructured, idR
484484
"least '%v' characters", folderUnstruct.GetName(), displayName, minDisplayNameLen)
485485
}
486486

487-
return newDisplayNamePrefix + testvariable.RandomIdGenerator(idReg, uint(len(displayName)-len(newDisplayNamePrefix))), nil
487+
return newDisplayNamePrefix + testvariable.RandomIDGenerator(idReg, uint(len(displayName)-len(newDisplayNamePrefix))), nil
488488
}
489489

490490
func getFolderDisplayName(folderUnstruct *unstructured.Unstructured) (string, error) {

‎config/tests/samples/create/samples_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,5 +295,5 @@ func setup() {
295295
}
296296

297297
func TestMain(m *testing.M) {
298-
testmain.TestMainForIntegrationTests(m, &unusedManager)
298+
testmain.ForIntegrationTests(m, &unusedManager)
299299
}

‎mockgcp/mockresourcemanager/projects_internal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (s *ProjectsInternal) tryGetProject(ctx context.Context, project *projects.
164164
// return nil, status.Error(codes.PermissionDenied, "permission denied")
165165
// }
166166

167-
// fqn := "projects/" + obj.ProjectId
167+
// fqn := "projects/" + obj.ProjectID
168168

169169
// // Only the `display_name` and `labels` fields can be change.
170170
// paths := req.GetUpdateMask().GetPaths()

‎mockgcp/mockresourcemanager/projectsv3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (s *ProjectsV3) GetProject(ctx context.Context, req *pb.GetProjectRequest)
5959
func (s *ProjectsV3) CreateProject(ctx context.Context, req *pb.CreateProjectRequest) (*longrunningpb.Operation, error) {
6060
projectID := req.GetProject().GetProjectId()
6161
if projectID == "" {
62-
return nil, status.Errorf(codes.InvalidArgument, "projectId is required")
62+
return nil, status.Errorf(codes.InvalidArgument, "projectID is required")
6363
}
6464

6565
hasher := adler32.New()

‎operator/pkg/controllers/configconnector/configconnector_controller.go

Lines changed: 41 additions & 47 deletions
Large diffs are not rendered by default.

‎operator/pkg/controllers/configconnector/configconnector_controller_test.go

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestHandleReconcileFailed(t *testing.T) {
5050
defer stop()
5151
c := mgr.GetClient()
5252
mockEventRecorder := testmocks.NewMockEventRecorder(t, mgr.GetScheme())
53-
r := ConfigConnectorReconciler{
53+
r := Reconciler{
5454
client: c,
5555
recorder: mockEventRecorder,
5656
}
@@ -108,7 +108,7 @@ func TestHandleReconcileSucceeded(t *testing.T) {
108108
defer stop()
109109
c := mgr.GetClient()
110110
mockEventRecorder := testmocks.NewMockEventRecorder(t, mgr.GetScheme())
111-
r := ConfigConnectorReconciler{
111+
r := Reconciler{
112112
client: c,
113113
recorder: mockEventRecorder,
114114
}
@@ -266,7 +266,7 @@ func TestHandleConfigConnectorCreate(t *testing.T) {
266266
c := mgr.GetClient()
267267
testcontroller.EnsureNamespaceExists(c, k8s.CNRMSystemNamespace)
268268
testcontroller.EnsureNamespaceExists(c, k8s.OperatorSystemNamespace)
269-
m := testcontroller.ParseObjects(t, ctx, tc.loadedManifest)
269+
m := testcontroller.ParseObjects(ctx, t, tc.loadedManifest)
270270
r := newConfigConnectorReconciler(c)
271271

272272
if err := c.Create(ctx, tc.cc); err != nil {
@@ -284,17 +284,17 @@ func TestHandleConfigConnectorCreate(t *testing.T) {
284284
t.Fatalf("unexpected error: %v", err)
285285
}
286286
expectedObjs := tc.resultsFunc(t, c)
287-
expectedManifest := testcontroller.ParseObjects(t, ctx, expectedObjs)
288-
expectedJson, err := expectedManifest.JSONManifest()
287+
expectedManifest := testcontroller.ParseObjects(ctx, t, expectedObjs)
288+
expectedJSON, err := expectedManifest.JSONManifest()
289289
if err != nil {
290290
t.Fatalf("unexpected error: %v", err)
291291
}
292-
resJson, err := m.JSONManifest()
292+
resJSON, err := m.JSONManifest()
293293
if err != nil {
294294
t.Fatalf("unexpected error: %v", err)
295295
}
296-
if !reflect.DeepEqual(resJson, expectedJson) {
297-
t.Fatalf("unexpected diff: %v", cmp.Diff(resJson, expectedJson))
296+
if !reflect.DeepEqual(resJSON, expectedJSON) {
297+
t.Fatalf("unexpected diff: %v", cmp.Diff(resJSON, expectedJSON))
298298
}
299299

300300
// Verify that CCC objects are NOT attached finalizers by the CC controller.
@@ -418,7 +418,7 @@ func TestHandleConfigConnectorDelete(t *testing.T) {
418418
c := mgr.GetClient()
419419
testcontroller.EnsureNamespaceExists(c, k8s.OperatorSystemNamespace)
420420
testcontroller.EnsureNamespaceExists(c, k8s.CNRMSystemNamespace)
421-
m := testcontroller.ParseObjects(t, ctx, tc.installedObjectsFunc(t, c))
421+
m := testcontroller.ParseObjects(ctx, t, tc.installedObjectsFunc(t, c))
422422
r := newConfigConnectorReconciler(c)
423423
if err := c.Create(ctx, tc.cc); err != nil {
424424
t.Fatalf("error creating %v %v: %v", tc.cc.Kind, tc.cc.Name, err)
@@ -467,17 +467,17 @@ func TestHandleConfigConnectorDelete(t *testing.T) {
467467
t.Fatalf("unexpected error: %v", err)
468468
}
469469
expectedObjs := tc.resultsFunc(t, c)
470-
expectedManifest := testcontroller.ParseObjects(t, ctx, expectedObjs)
471-
expectedJson, err := expectedManifest.JSONManifest()
470+
expectedManifest := testcontroller.ParseObjects(ctx, t, expectedObjs)
471+
expectedJSON, err := expectedManifest.JSONManifest()
472472
if err != nil {
473473
t.Fatalf("unexpected error: %v", err)
474474
}
475-
resJson, err := m.JSONManifest()
475+
resJSON, err := m.JSONManifest()
476476
if err != nil {
477477
t.Fatalf("unexpected error: %v", err)
478478
}
479-
if !reflect.DeepEqual(resJson, expectedJson) {
480-
t.Fatalf("unexpected diff: %v", cmp.Diff(resJson, expectedJson))
479+
if !reflect.DeepEqual(resJSON, expectedJSON) {
480+
t.Fatalf("unexpected diff: %v", cmp.Diff(resJSON, expectedJSON))
481481
}
482482

483483
// Assert that the ConfigConnector object is deleted.
@@ -761,7 +761,7 @@ func TestConfigConnectorUpdate(t *testing.T) {
761761
}
762762
}
763763
installedComponents := tc.installedObjectsFunc(t, c)
764-
installedManifest := testcontroller.ParseObjects(t, ctx, installedComponents)
764+
installedManifest := testcontroller.ParseObjects(ctx, t, installedComponents)
765765
for _, item := range installedManifest.Items {
766766
if err := c.Create(ctx, item.UnstructuredObject()); err != nil && !apierrors.IsAlreadyExists(err) {
767767
t.Fatalf("error creating %v %v: %v", item.GroupKind(), item.GetName(), err)
@@ -774,7 +774,7 @@ func TestConfigConnectorUpdate(t *testing.T) {
774774
t.Fatalf("error updating %v %v: %v", tc.updatedCc.Kind, tc.updatedCc.Name, err)
775775
}
776776

777-
m := testcontroller.ParseObjects(t, ctx, tc.manifest)
777+
m := testcontroller.ParseObjects(ctx, t, tc.manifest)
778778
if tc.cc.GetMode() == "namespaced" {
779779
if err := handleLifecycles(t, ctx, r, tc.updatedCc, m); err == nil {
780780
t.Fatalf("got nil, but want to have an error because the controller manager pod per namespace is not deleted")
@@ -792,17 +792,17 @@ func TestConfigConnectorUpdate(t *testing.T) {
792792
t.Fatalf("unexpected error: %v", err)
793793
}
794794
expectedObjs := tc.resultsFunc(t, c)
795-
expectedManifest := testcontroller.ParseObjects(t, ctx, expectedObjs)
796-
expectedJson, err := expectedManifest.JSONManifest()
795+
expectedManifest := testcontroller.ParseObjects(ctx, t, expectedObjs)
796+
expectedJSON, err := expectedManifest.JSONManifest()
797797
if err != nil {
798798
t.Fatalf("unexpected error: %v", err)
799799
}
800-
resJson, err := m.JSONManifest()
800+
resJSON, err := m.JSONManifest()
801801
if err != nil {
802802
t.Fatalf("unexpected error: %v", err)
803803
}
804-
if !reflect.DeepEqual(resJson, expectedJson) {
805-
t.Fatalf("unexpected diff: %v", cmp.Diff(resJson, expectedJson))
804+
if !reflect.DeepEqual(resJSON, expectedJSON) {
805+
t.Fatalf("unexpected diff: %v", cmp.Diff(resJSON, expectedJSON))
806806
}
807807
// assert unneeded components are deleted
808808
unneededComponents := tc.toDeleteObjectsFunc(t, c)
@@ -826,22 +826,20 @@ type testCaseStruct struct {
826826
}
827827

828828
func handleLifecycles(t *testing.T, ctx context.Context,
829-
r *ConfigConnectorReconciler, cc *corev1beta1.ConfigConnector, m *manifest.Objects) error {
829+
r *Reconciler, cc *corev1beta1.ConfigConnector, m *manifest.Objects) error {
830830
t.Helper()
831831

832832
fn := r.transformForClusterMode()
833833
if err := fn(ctx, cc, m); err != nil {
834834
return err
835835
}
836836
fn = r.handleConfigConnectorLifecycle()
837-
if err := fn(ctx, cc, m); err != nil {
838-
return err
839-
}
840-
return nil
837+
838+
return fn(ctx, cc, m)
841839
}
842840

843-
func newConfigConnectorReconciler(c client.Client) *ConfigConnectorReconciler {
844-
return &ConfigConnectorReconciler{
841+
func newConfigConnectorReconciler(c client.Client) *Reconciler {
842+
return &Reconciler{
845843
client: c,
846844
log: logr.Discard(),
847845
}
@@ -888,7 +886,7 @@ func TestSelectingCRDsByVersion(t *testing.T) {
888886
mgr, stop := testmain.StartTestManagerFromNewTestEnv()
889887
defer stop()
890888
c := mgr.GetClient()
891-
manifests := testcontroller.ParseObjects(t, ctx, tc.manifests)
889+
manifests := testcontroller.ParseObjects(ctx, t, tc.manifests)
892890
r := newConfigConnectorReconciler(c)
893891

894892
err := r.selectCRDsByVersion(manifests, tc.version)
@@ -905,7 +903,7 @@ func TestSelectingCRDsByVersion(t *testing.T) {
905903
if err != nil {
906904
t.Fatalf("unexpected error: %v", err)
907905
}
908-
expectedManifests := testcontroller.ParseObjects(t, ctx, tc.expectedManifests)
906+
expectedManifests := testcontroller.ParseObjects(ctx, t, tc.expectedManifests)
909907
expectedJSON, err := expectedManifests.JSONManifest()
910908
if err != nil {
911909
t.Fatalf("unexpected error: %v", err)
@@ -1197,7 +1195,7 @@ func TestApplyCustomizations(t *testing.T) {
11971195
t.Fatalf("error creating %v %v/%v: %v", cr.Kind, cr.Namespace, cr.Name, err)
11981196
}
11991197
}
1200-
manifests := testcontroller.ParseObjects(t, ctx, tc.manifests)
1198+
manifests := testcontroller.ParseObjects(ctx, t, tc.manifests)
12011199
r := newConfigConnectorReconciler(c)
12021200

12031201
// run the test function
@@ -1207,20 +1205,20 @@ func TestApplyCustomizations(t *testing.T) {
12071205
}
12081206

12091207
// check the resulting manifests
1210-
gotJson, err := manifests.JSONManifest()
1208+
gotJSON, err := manifests.JSONManifest()
12111209
if err != nil {
12121210
t.Fatalf("unexpected error: %v", err)
12131211
}
1214-
expectedManifests := testcontroller.ParseObjects(t, ctx, tc.expectedManifests)
1212+
expectedManifests := testcontroller.ParseObjects(ctx, t, tc.expectedManifests)
12151213
if err != nil {
12161214
t.Fatalf("unexpected error: %v", err)
12171215
}
1218-
expectedJson, err := expectedManifests.JSONManifest()
1216+
expectedJSON, err := expectedManifests.JSONManifest()
12191217
if err != nil {
12201218
t.Fatalf("unexpected error: %v", err)
12211219
}
1222-
if !reflect.DeepEqual(gotJson, expectedJson) {
1223-
t.Fatalf("unexpected diff: %v", cmp.Diff(gotJson, expectedJson))
1220+
if !reflect.DeepEqual(gotJSON, expectedJSON) {
1221+
t.Fatalf("unexpected diff: %v", cmp.Diff(gotJSON, expectedJSON))
12241222
}
12251223

12261224
// check the status of cluster-scoped customization CR
@@ -1239,8 +1237,8 @@ func TestApplyCustomizations(t *testing.T) {
12391237
}
12401238
}
12411239

1242-
func newConfigConnectorReconcilerWithCustomizationWatcher(m ctrl.Manager) *ConfigConnectorReconciler {
1243-
r := &ConfigConnectorReconciler{
1240+
func newConfigConnectorReconcilerWithCustomizationWatcher(m ctrl.Manager) *Reconciler {
1241+
r := &Reconciler{
12441242
client: m.GetClient(),
12451243
log: logr.Discard(),
12461244
}

‎operator/pkg/controllers/configconnectorcontext/configconnectorcontext_controller_test.go

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ spec:
112112
},
113113
}
114114

115-
m := testcontroller.ParseObjects(t, ctx, testcontroller.GetPerNamespaceManifest())
115+
m := testcontroller.ParseObjects(ctx, t, testcontroller.GetPerNamespaceManifest())
116116
_, err := transformNamespacedComponentTemplates(ctx, mgr.GetClient(), ccc, m.Items)
117117
if err != nil {
118118
t.Fatalf("unexpected error: %v", err)
@@ -254,7 +254,7 @@ func TestHandlePerNamespaceComponentsCreate(t *testing.T) {
254254
c := mgr.GetClient()
255255
testcontroller.EnsureNamespaceExists(c, k8s.OperatorSystemNamespace)
256256
testcontroller.EnsureNamespaceExists(c, k8s.CNRMSystemNamespace)
257-
m := testcontroller.ParseObjects(t, ctx, tc.loadedManifest)
257+
m := testcontroller.ParseObjects(ctx, t, tc.loadedManifest)
258258
r := newConfigConnectorReconciler(c)
259259

260260
if err := c.Create(ctx, tc.cc); err != nil {
@@ -275,17 +275,17 @@ func TestHandlePerNamespaceComponentsCreate(t *testing.T) {
275275
t.Fatalf("unexpected error: %v", err)
276276
}
277277
expectedObjs := tc.resultsFunc(t, c)
278-
expectedManifest := testcontroller.ParseObjects(t, ctx, expectedObjs)
279-
expectedJson, err := expectedManifest.JSONManifest()
278+
expectedManifest := testcontroller.ParseObjects(ctx, t, expectedObjs)
279+
expectedJSON, err := expectedManifest.JSONManifest()
280280
if err != nil {
281281
t.Fatalf("unexpected error: %v", err)
282282
}
283-
resJson, err := m.JSONManifest()
283+
resJSON, err := m.JSONManifest()
284284
if err != nil {
285285
t.Fatalf("unexpected error: %v", err)
286286
}
287-
if !reflect.DeepEqual(resJson, expectedJson) {
288-
t.Fatalf("unexpected diff: %v", cmp.Diff(resJson, expectedJson))
287+
if !reflect.DeepEqual(resJSON, expectedJSON) {
288+
t.Fatalf("unexpected diff: %v", cmp.Diff(resJSON, expectedJSON))
289289
}
290290

291291
// Verify that the CC object is NOT attached finalizers by the CCC controller.
@@ -448,7 +448,7 @@ func TestHandlePerNamespaceComponentsDelete(t *testing.T) {
448448
contextKey := client.ObjectKeyFromObject(tc.ccc)
449449
testcontroller.EnsureNamespaceExists(c, k8s.OperatorSystemNamespace)
450450
testcontroller.EnsureNamespaceExists(c, k8s.CNRMSystemNamespace)
451-
m := testcontroller.ParseObjects(t, ctx, tc.loadedManifest)
451+
m := testcontroller.ParseObjects(ctx, t, tc.loadedManifest)
452452
r := newConfigConnectorReconciler(c)
453453
if tc.cc != nil {
454454
if err := c.Create(ctx, tc.cc); err != nil {
@@ -497,17 +497,17 @@ func TestHandlePerNamespaceComponentsDelete(t *testing.T) {
497497
t.Fatalf("unexpected error: %v", err)
498498
}
499499
expectedObjs := tc.resultsFunc(t, c)
500-
expectedManifest := testcontroller.ParseObjects(t, ctx, expectedObjs)
501-
expectedJson, err := expectedManifest.JSONManifest()
500+
expectedManifest := testcontroller.ParseObjects(ctx, t, expectedObjs)
501+
expectedJSON, err := expectedManifest.JSONManifest()
502502
if err != nil {
503503
t.Fatalf("unexpected error: %v", err)
504504
}
505-
resJson, err := m.JSONManifest()
505+
resJSON, err := m.JSONManifest()
506506
if err != nil {
507507
t.Fatalf("unexpected error: %v", err)
508508
}
509-
if !reflect.DeepEqual(resJson, expectedJson) {
510-
t.Fatalf("unexpected diff: %v", cmp.Diff(resJson, expectedJson))
509+
if !reflect.DeepEqual(resJSON, expectedJSON) {
510+
t.Fatalf("unexpected diff: %v", cmp.Diff(resJSON, expectedJSON))
511511
}
512512
}
513513

@@ -853,7 +853,7 @@ func TestApplyNamespacedCustomizations(t *testing.T) {
853853
t.Fatalf("error creating %v %v/%v: %v", cr.Kind, cr.Namespace, cr.Name, err)
854854
}
855855
}
856-
manifests := testcontroller.ParseObjects(t, ctx, tc.manifests)
856+
manifests := testcontroller.ParseObjects(ctx, t, tc.manifests)
857857
r := newConfigConnectorReconciler(c)
858858

859859
// run the test function
@@ -863,20 +863,20 @@ func TestApplyNamespacedCustomizations(t *testing.T) {
863863
}
864864

865865
// check the resulting manifests
866-
gotJson, err := manifests.JSONManifest()
866+
gotJSON, err := manifests.JSONManifest()
867867
if err != nil {
868868
t.Fatalf("unexpected error: %v", err)
869869
}
870-
expectedManifests := testcontroller.ParseObjects(t, ctx, tc.expectedManifests)
870+
expectedManifests := testcontroller.ParseObjects(ctx, t, tc.expectedManifests)
871871
if err != nil {
872872
t.Fatalf("unexpected error: %v", err)
873873
}
874-
expectedJson, err := expectedManifests.JSONManifest()
874+
expectedJSON, err := expectedManifests.JSONManifest()
875875
if err != nil {
876876
t.Fatalf("unexpected error: %v", err)
877877
}
878-
if !reflect.DeepEqual(gotJson, expectedJson) {
879-
t.Fatalf("unexpected diff: %v", cmp.Diff(gotJson, expectedJson))
878+
if !reflect.DeepEqual(gotJSON, expectedJSON) {
879+
t.Fatalf("unexpected diff: %v", cmp.Diff(gotJSON, expectedJSON))
880880
}
881881

882882
// check the status of namespaced customization CR
@@ -907,10 +907,7 @@ func handleLifecycles(t *testing.T, ctx context.Context,
907907
return err
908908
}
909909
fn = r.handleCCContextLifecycle()
910-
if err := fn(ctx, ccc, m); err != nil {
911-
return err
912-
}
913-
return nil
910+
return fn(ctx, ccc, m)
914911
}
915912

916913
func newConfigConnectorReconciler(c client.Client) *ConfigConnectorContextReconciler {

0 commit comments

Comments
 (0)