Merge pull request #1370 from Tharsanan1/fix-ratelimit-bug

Add default value for api.organization and validation logic
wso2 · Jul 11, 2023 · a9f2939 · a9f2939
2 parents 73df4fe + d360a82
commit a9f2939
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/adapter/internal/operator/apis/dp/v1alpha1/api_webhook.go b/adapter/internal/operator/apis/dp/v1alpha1/api_webhook.go
@@ -112,6 +112,11 @@ func (r *API) validateAPI() error {
 		allErrs = append(allErrs, err)
 	}
 
+	// Organization value should not be empty as it required when applying ratelimit policy
+	if r.Spec.Organization == "" {
+		allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("organization"), "Organization can not be empty"))
+	}
+
 	if errMsg := validateAPITypeFormat(r.Spec.APIType); errMsg != "" {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("apiType"), r.Spec.APIType, errMsg))
 	} else {

diff --git a/helm-charts/crds/dp.wso2.com_apis.yaml b/helm-charts/crds/dp.wso2.com_apis.yaml
@@ -105,6 +105,7 @@ spec:
                 description: Organization denotes the organization. related to the
                   API
                 type: string
+                default: super-user
               production:
                 description: 'Production contains a list of references to HttpRoutes
                   of type HttpRoute. xref: https://github.com/kubernetes-sigs/gateway-api/blob/main/apis/v1beta1/httproute_types.go'