Merge pull request #4843 from camilamacedo86/fix-alpha-postscaffold

k8s-ci-robot · web-flow · commit 06a047f20505 · 2025-06-01T01:08:12.000-07:00
🐛 fix(cli): ensure 'alpha generate' runs 'make manifests generate fmt vet lint-fix' after scaffolding
diff --git a/pkg/cli/alpha/internal/generate.go b/pkg/cli/alpha/internal/generate.go
@@ -115,7 +115,18 @@ func (opts *Generate) Generate() error {
 		}
 	}
 
-	return migrateDeployImagePlugin(projectConfig)
+	if err = migrateDeployImagePlugin(projectConfig); err != nil {
+		return fmt.Errorf("error migrating deploy-image plugin: %w", err)
+	}
+
+	log.Info("Running: make manifests generate fmt vet lint-fix")
+	err = util.RunCmd("Running make targets", "make", "manifests", "generate", "fmt", "vet", "lint-fix")
+	if err != nil {
+		log.Error("Post-scaffold make commands failed:", err)
+		return fmt.Errorf("post-scaffold make commands failed: %w", err)
+	}
+
+	return nil
 }
 
 // Validate ensures the options are valid and kubebuilder is installed.

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,18 @@ func (opts *Generate) Generate() error {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- return migrateDeployImagePlugin(projectConfig)`
	`118`	`+ if err = migrateDeployImagePlugin(projectConfig); err != nil {`
	`119`	`+ return fmt.Errorf("error migrating deploy-image plugin: %w", err)`
	`120`	`+ }`
	`121`	`+`
	`122`	`+ log.Info("Running: make manifests generate fmt vet lint-fix")`
	`123`	`+ err = util.RunCmd("Running make targets", "make", "manifests", "generate", "fmt", "vet", "lint-fix")`
	`124`	`+ if err != nil {`
	`125`	`+ log.Error("Post-scaffold make commands failed:", err)`
	`126`	`+ return fmt.Errorf("post-scaffold make commands failed: %w", err)`
	`127`	`+ }`
	`128`	`+`
	`129`	`+ return nil`
`119`	`130`	`}`
`120`	`131`
`121`	`132`	`// Validate ensures the options are valid and kubebuilder is installed.`