Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Add Webhooks in alpha generate subcommand #3497

Merged
merged 2 commits into from
Jul 14, 2023
Merged

✨ Add Webhooks in alpha generate subcommand #3497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5330254
feat: support webhook in alpha generate
yyy1000 Jul 14, 2023
38ee2c9
fix: lint
yyy1000 Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 42 additions & 10 deletions pkg/rescaffold/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ func kubebuilderCreate(store store.Store) error {
if err = createAPI(r); err != nil {
return err
}
if err = createWebhook(r); err != nil {
return err
}
}

return nil
Expand All @@ -153,18 +156,12 @@ func getInitArgs(store store.Store) []string {
return args
}

func createAPI(resource resource.Resource) error {
var args []string
args = append(args, "create")
args = append(args, "api")
args = append(args, getAPIGVKFlags(resource)...)
args = append(args, getAPIResourceFlags(resource)...)
return util.RunCmd("kubebuilder create api", "kubebuilder", args...)
}

func getAPIGVKFlags(resource resource.Resource) []string {
func getGVKFlags(resource resource.Resource) []string {
var args []string

if len(resource.Plural) > 0 {
args = append(args, "--plural", resource.Plural)
}
if len(resource.Group) > 0 {
args = append(args, "--group", resource.Group)
}
Expand All @@ -177,6 +174,15 @@ func getAPIGVKFlags(resource resource.Resource) []string {
return args
}

func createAPI(resource resource.Resource) error {
var args []string
args = append(args, "create")
args = append(args, "api")
args = append(args, getGVKFlags(resource)...)
args = append(args, getAPIResourceFlags(resource)...)
return util.RunCmd("kubebuilder create api", "kubebuilder", args...)
}

func getAPIResourceFlags(resource resource.Resource) []string {
var args []string
if resource.API == nil || resource.API.IsEmpty() {
Expand All @@ -196,3 +202,29 @@ func getAPIResourceFlags(resource resource.Resource) []string {
}
return args
}

func createWebhook(resource resource.Resource) error {
if resource.Webhooks == nil || resource.Webhooks.IsEmpty() {
return nil
}
var args []string
args = append(args, "create")
args = append(args, "webhook")
args = append(args, getGVKFlags(resource)...)
args = append(args, getWebhookResourceFlags(resource)...)
return util.RunCmd("kubebuilder create webhook", "kubebuilder", args...)
}

func getWebhookResourceFlags(resource resource.Resource) []string {
var args []string
if resource.HasConversionWebhook() {
args = append(args, "--conversion")
}
if resource.HasValidationWebhook() {
args = append(args, "--programmatic-validation")
}
if resource.HasDefaultingWebhook() {
args = append(args, "--defaulting")
}
return args
}
19 changes: 19 additions & 0 deletions test/e2e/alphagenerate/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,16 @@ func ReGenerateProject(kbc *utils.TestContext) {
)
ExpectWithOffset(1, err).NotTo(HaveOccurred())

By("create Webhooks with conversion and validating webhook")
err = kbc.CreateWebhook(
"--group", "crew",
"--version", "v1",
"--kind", "Captain",
"--programmatic-validation",
"--conversion",
)
ExpectWithOffset(1, err).NotTo(HaveOccurred())

By("regenerating the project at another output directory")
err = kbc.Regenerate(
"--input-dir", kbc.Dir,
Expand Down Expand Up @@ -159,4 +169,13 @@ func ReGenerateProject(kbc *utils.TestContext) {
filepath.Join(kbc.Dir, "testdir2", "PROJECT"), controller)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
ExpectWithOffset(1, fileContainsExpr).To(BeTrue())

By("checking if the project file was generated with the expected webhook")
var webhook = `webhooks:
conversion: true
validation: true`
fileContainsExpr, err = pluginutil.HasFileContentWith(
filepath.Join(kbc.Dir, "testdir2", "PROJECT"), webhook)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
ExpectWithOffset(1, fileContainsExpr).To(BeTrue())
}
Loading