added ctout check for update

SAP · Sep 6, 2024 · 7fad840 · 7fad840
1 parent 919e0a3
commit 7fad840
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/cmd/web-hooks/internal/handler/handler.go b/cmd/web-hooks/internal/handler/handler.go
@@ -544,26 +544,28 @@ func (wh *WebhookHandler) validateCAPTenant(w http.ResponseWriter, admissionRevi
 func (wh *WebhookHandler) validateCAPTenantOutput(w http.ResponseWriter, admissionReview *admissionv1.AdmissionReview) validateResource {
 	ctoutObjNew := ResponseCtout{}
 
-	if admissionReview.Request.Operation == admissionv1.Create {
-		if validatedResource := unmarshalRawObj(w, admissionReview.Request.Object.Raw, &ctoutObjNew, v1alpha1.CAPTenantOutputKind); !validatedResource.allowed {
-			return validatedResource
-		}
+	if admissionReview.Request.Operation == admissionv1.Delete {
+		return validAdmissionReviewObj()
+	}
+
+	if validatedResource := unmarshalRawObj(w, admissionReview.Request.Object.Raw, &ctoutObjNew, v1alpha1.CAPTenantOutputKind); !validatedResource.allowed {
+		return validatedResource
+	}
 
-		if _, exists := ctoutObjNew.Labels[LabelTenantId]; !exists {
+	if _, exists := ctoutObjNew.Labels[LabelTenantId]; !exists {
+		return validateResource{
+			allowed: false,
+			message: fmt.Sprintf("%s %s label %s missing on CAP tenant output %s", InvalidationMessage, v1alpha1.CAPTenantOutputKind, LabelTenantId, ctoutObjNew.Name),
+		}
+	} else {
+		labelSelector, _ := labels.ValidatedSelectorFromSet(map[string]string{
+			LabelTenantId: ctoutObjNew.Labels[LabelTenantId],
+		})
+		ctList, err := wh.CrdClient.SmeV1alpha1().CAPTenants(ctoutObjNew.Namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector.String()})
+		if err != nil || len(ctList.Items) == 0 {
 			return validateResource{
 				allowed: false,
-				message: fmt.Sprintf("%s %s label %s missing on CAP tenant output %s", InvalidationMessage, v1alpha1.CAPTenantOutputKind, LabelTenantId, ctoutObjNew.Name),
-			}
-		} else {
-			labelSelector, _ := labels.ValidatedSelectorFromSet(map[string]string{
-				LabelTenantId: ctoutObjNew.Labels[LabelTenantId],
-			})
-			ctList, err := wh.CrdClient.SmeV1alpha1().CAPTenants(ctoutObjNew.Namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector.String()})
-			if err != nil || len(ctList.Items) == 0 {
-				return validateResource{
-					allowed: false,
-					message: fmt.Sprintf("%s %s label %s on CAP tenant output %s does not contain a valid tenant ID", InvalidationMessage, v1alpha1.CAPTenantOutputKind, LabelTenantId, ctoutObjNew.Name),
-				}
+				message: fmt.Sprintf("%s %s label %s on CAP tenant output %s does not contain a valid tenant ID", InvalidationMessage, v1alpha1.CAPTenantOutputKind, LabelTenantId, ctoutObjNew.Name),
 			}
 		}
 	}

diff --git a/cmd/web-hooks/internal/handler/handler_test.go b/cmd/web-hooks/internal/handler/handler_test.go
@@ -1234,6 +1234,14 @@ func TestCtoutInvalidity(t *testing.T) {
 			operation:    admissionv1.Create,
 			labelPresent: false,
 		},
+		{
+			operation:    admissionv1.Update,
+			labelPresent: true,
+		},
+		{
+			operation:    admissionv1.Update,
+			labelPresent: false,
+		},
 	}
 	for _, test := range tests {
 		t.Run("Testing CAPTenantOutput invalidity for operation "+string(test.operation), func(t *testing.T) {