Merge pull request #15 from maxdrib/account-domain-webhook

maxdrib · web-flow · commit 49dc10f5c459 · 2022-01-21T08:57:24.000-06:00
Refactoring account/domain validation webhook logic
diff --git a/api/v1alpha3/cloudstackcluster_webhook.go b/api/v1alpha3/cloudstackcluster_webhook.go
@@ -62,8 +62,8 @@ func (r *CloudStackCluster) ValidateCreate() error {
 		errorList = append(errorList, field.Forbidden(field.NewPath("spec", "identityRef", "kind"), "must be a Secret"))
 	}
 
-	if (r.Spec.Account == "") != (r.Spec.Domain == "") {
-		errorList = append(errorList, field.Required(field.NewPath("spec", "account"), "account and domain must be specified together"))
+	if (r.Spec.Account != "") && (r.Spec.Domain == "") {
+		errorList = append(errorList, field.Required(field.NewPath("spec", "account"), "specifying account requires additionally specifying domain"))
 	}
 
 	// Zone and Network are required fields

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ func (r *CloudStackCluster) ValidateCreate() error {`
`62`	`62`	`errorList = append(errorList, field.Forbidden(field.NewPath("spec", "identityRef", "kind"), "must be a Secret"))`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (r.Spec.Account == "") != (r.Spec.Domain == "") {`
`66`		`- errorList = append(errorList, field.Required(field.NewPath("spec", "account"), "account and domain must be specified together"))`
	`65`	`+ if (r.Spec.Account != "") && (r.Spec.Domain == "") {`
	`66`	`+ errorList = append(errorList, field.Required(field.NewPath("spec", "account"), "specifying account requires additionally specifying domain"))`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// Zone and Network are required fields`