Merge pull request #2573 from mrkm4ntr/assign-config

k8s-ci-robot · web-flow · commit 472cc07b7ee2 · 2022-04-01T10:54:47.000-07:00
🐛 For go/v3 plugin: assign config to global config
diff --git a/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers/controller_suitetest.go
@@ -162,6 +162,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers/controller_suitetest.go
@@ -166,7 +166,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: {{ .Resource.HasAPI }},
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v2-addon/controllers/suite_test.go b/testdata/project-v2-addon/controllers/suite_test.go
@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/apps/suite_test.go b/testdata/project-v2-multigroup/controllers/apps/suite_test.go
@@ -57,6 +57,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/crew/suite_test.go b/testdata/project-v2-multigroup/controllers/crew/suite_test.go
@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/fiz/suite_test.go b/testdata/project-v2-multigroup/controllers/fiz/suite_test.go
@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go b/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go
@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/foo/suite_test.go b/testdata/project-v2-multigroup/controllers/foo/suite_test.go
@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go b/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go
@@ -59,6 +59,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2-multigroup/controllers/ship/suite_test.go b/testdata/project-v2-multigroup/controllers/ship/suite_test.go
@@ -60,6 +60,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v2/controllers/suite_test.go b/testdata/project-v2/controllers/suite_test.go
@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 	}
 
 	var err error
+	// cfg is defined in this file globally.
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
diff --git a/testdata/project-v3-addon/controllers/suite_test.go b/testdata/project-v3-addon/controllers/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-config/controllers/suite_test.go b/testdata/project-v3-config/controllers/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/apps/suite_test.go b/testdata/project-v3-multigroup/controllers/apps/suite_test.go
@@ -57,7 +57,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: false,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/crew/suite_test.go b/testdata/project-v3-multigroup/controllers/crew/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/fiz/suite_test.go b/testdata/project-v3-multigroup/controllers/fiz/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go b/testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/foo/suite_test.go b/testdata/project-v3-multigroup/controllers/foo/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go b/testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go
@@ -59,7 +59,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/ship/suite_test.go b/testdata/project-v3-multigroup/controllers/ship/suite_test.go
@@ -60,7 +60,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-multigroup/controllers/suite_test.go b/testdata/project-v3-multigroup/controllers/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3-v1beta1/controllers/suite_test.go b/testdata/project-v3-v1beta1/controllers/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
diff --git a/testdata/project-v3/controllers/suite_test.go b/testdata/project-v3/controllers/suite_test.go
@@ -58,7 +58,9 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	// cfg is defined in this file globally.
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ var _ = BeforeSuite(func(done Done) {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`var err error`
	`165`	`+ // cfg is defined in this file globally.`
`165`	`166`	`cfg, err = testEnv.Start()`
`166`	`167`	`Expect(err).ToNot(HaveOccurred())`
`167`	`168`	`Expect(cfg).ToNot(BeNil())`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,9 @@ var _ = BeforeSuite(func() {`
`166`	`166`	`ErrorIfCRDPathMissing: {{ .Resource.HasAPI }},`
`167`	`167`	`}`
`168`	`168`
`169`		`- cfg, err := testEnv.Start()`
	`169`	`+ var err error`
	`170`	`+ // cfg is defined in this file globally.`
	`171`	`+ cfg, err = testEnv.Start()`
`170`	`172`	`Expect(err).NotTo(HaveOccurred())`
`171`	`173`	`Expect(cfg).NotTo(BeNil())`
`172`	`174`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ var _ = BeforeSuite(func(done Done) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`var err error`
	`61`	`+ // cfg is defined in this file globally.`
`61`	`62`	`cfg, err = testEnv.Start()`
`62`	`63`	`Expect(err).ToNot(HaveOccurred())`
`63`	`64`	`Expect(cfg).ToNot(BeNil())`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ var _ = BeforeSuite(func(done Done) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`var err error`
	`60`	`+ // cfg is defined in this file globally.`
`60`	`61`	`cfg, err = testEnv.Start()`
`61`	`62`	`Expect(err).ToNot(HaveOccurred())`
`62`	`63`	`Expect(cfg).ToNot(BeNil())`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ var _ = BeforeSuite(func(done Done) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`var err error`
	`62`	`+ // cfg is defined in this file globally.`
`62`	`63`	`cfg, err = testEnv.Start()`
`63`	`64`	`Expect(err).ToNot(HaveOccurred())`
`64`	`65`	`Expect(cfg).ToNot(BeNil())`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ var _ = BeforeSuite(func(done Done) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`var err error`
	`63`	`+ // cfg is defined in this file globally.`
`63`	`64`	`cfg, err = testEnv.Start()`
`64`	`65`	`Expect(err).ToNot(HaveOccurred())`
`65`	`66`	`Expect(cfg).ToNot(BeNil())`