Skip to content

Commit 252a250

Browse files
committed
🐛 For go/v3 plugin: Avoid to add duplicated code fragments
1 parent 08a55d1 commit 252a250

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ func (f *WebhookSuite) SetTemplateDefaults() error {
5757

5858
f.TemplateBody = fmt.Sprintf(webhookTestSuiteTemplate,
5959
machinery.NewMarkerFor(f.Path, importMarker),
60+
admissionImportAlias,
6061
machinery.NewMarkerFor(f.Path, addSchemeMarker),
6162
machinery.NewMarkerFor(f.Path, addWebhookManagerMarker),
6263
"%s",
@@ -113,7 +114,6 @@ func (f *WebhookSuite) GetCodeFragments() machinery.CodeFragmentsMap {
113114

114115
// Generate add scheme code fragments
115116
addScheme := make([]string, 0)
116-
addScheme = append(addScheme, fmt.Sprintf(addschemeCodeFragment, admissionImportAlias))
117117

118118
// Generate add webhookManager code fragments
119119
addWebhookManager := make([]string, 0)
@@ -198,6 +198,9 @@ var _ = BeforeSuite(func() {
198198
err = AddToScheme(scheme)
199199
Expect(err).NotTo(HaveOccurred())
200200
201+
err = %s.AddToScheme(scheme)
202+
Expect(err).NotTo(HaveOccurred())
203+
201204
%s
202205
203206
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})

testdata/project-v3-config/api/v1/webhook_suite_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ var _ = BeforeSuite(func() {
8484
err = admissionv1beta1.AddToScheme(scheme)
8585
Expect(err).NotTo(HaveOccurred())
8686

87-
err = admissionv1beta1.AddToScheme(scheme)
88-
Expect(err).NotTo(HaveOccurred())
89-
9087
//+kubebuilder:scaffold:scheme
9188

9289
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})

testdata/project-v3/api/v1/webhook_suite_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@ var _ = BeforeSuite(func() {
8484
err = admissionv1beta1.AddToScheme(scheme)
8585
Expect(err).NotTo(HaveOccurred())
8686

87-
err = admissionv1beta1.AddToScheme(scheme)
88-
Expect(err).NotTo(HaveOccurred())
89-
90-
err = admissionv1beta1.AddToScheme(scheme)
91-
Expect(err).NotTo(HaveOccurred())
92-
9387
//+kubebuilder:scaffold:scheme
9488

9589
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})

0 commit comments

Comments
 (0)