fix: return code for denied webhook request (#49)

Author: jokuniew

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1-dev

api/openapi/openapi.yaml

@@ -6,7 +6,7 @@ openapi: 3.0.3
 info:
   title: Cluster Manager 2.0
   description: This document defines the schema for the Cluster Manager 2.0 REST API.
-  version: 2.1.0
+  version: 2.1.1-dev
 
 security:
   - HTTP: []
@@ -536,6 +536,8 @@ paths:
           $ref: '#/components/responses/400-BadRequest'
         "404":
           $ref: '#/components/responses/404-NotFound'
+        "409":
+          $ref: '#/components/responses/409-Conflict'
         "500":
           $ref: '#/components/responses/500-InternalServerError'
 

deployment/charts/cluster-manager/Chart.yaml

@@ -16,6 +16,6 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.0
-appVersion: 2.1.0
+version: 2.1.1-dev
+appVersion: 2.1.1-dev
 annotations: {}

deployment/charts/cluster-template-crd/Chart.yaml

@@ -6,6 +6,6 @@ apiVersion: v2
 name: cluster-template-crd
 description: A Helm chart for the ClusterTemplate CRD
 type: application
-version: 2.1.0
-appVersion: 2.1.0
+version: 2.1.1-dev
+appVersion: 2.1.1-dev
 annotations: {}

internal/rest/deletev2templatesname.go

@@ -32,6 +32,10 @@ func (s *Server) DeleteV2TemplatesNameVersion(ctx context.Context, request api.D
 		message := fmt.Sprintf("Template '%s' not found: %v", templateName, err)
 		slog.Error(message)
 		return api.DeleteV2TemplatesNameVersion404JSONResponse{N404NotFoundJSONResponse: api.N404NotFoundJSONResponse{Message: &message}}, nil
+	case errors.IsConflict(err):
+		message := fmt.Sprintf("Template '%s' is in use: %v", templateName, err)
+		slog.Error(message)
+		return api.DeleteV2TemplatesNameVersion409JSONResponse{N409ConflictJSONResponse: api.N409ConflictJSONResponse{Message: &message}}, nil
 	case err != nil:
 		message := fmt.Sprintf("Failed to delete template '%s': %v", templateName, err)
 		slog.Error(message)

internal/rest/deletev2templatesname_test.go

@@ -58,6 +58,19 @@ func TestDeleteV2TemplatesNameVersion(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:                 "409 Conflict - template in use",
+			expectedStatusCode:   http.StatusConflict,
+			expectedErrorMessage: "Is in use",
+			mockDeleteReturn: &errors.StatusError{
+				ErrStatus: metav1.Status{
+					Status:  metav1.StatusFailure,
+					Code:    http.StatusConflict,
+					Reason:  metav1.StatusReasonConflict,
+					Message: "Is in use",
+				},
+			},
+		},
 		{
 			name:                 "500 Internal Server Error",
 			expectedStatusCode:   http.StatusInternalServerError,
@@ -113,6 +126,8 @@ func TestDeleteV2TemplatesNameVersion(t *testing.T) {
 					actualMessage = resp.JSON400.Message
 				case http.StatusNotFound:
 					actualMessage = resp.JSON404.Message
+				case http.StatusConflict:
+					actualMessage = resp.JSON409.Message
 				case http.StatusInternalServerError:
 					actualMessage = resp.JSON500.Message
 				}

internal/webhook/v1alpha1/clustertemplate_webhook.go

@@ -11,14 +11,17 @@ import (
 	"reflect"
 
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
+	"github.com/open-edge-platform/cluster-manager/v2/api/v1alpha1"
 	clusterv1alpha1 "github.com/open-edge-platform/cluster-manager/v2/api/v1alpha1"
 	"github.com/open-edge-platform/cluster-manager/v2/pkg/api"
 	rke2cpv1beta1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	capi "sigs.k8s.io/cluster-api/api/v1beta1"
 	kubeadmcp "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -132,7 +135,11 @@ func (v *ClusterTemplateCustomValidator) templateNotInUse(ctx context.Context, t
 	}
 
 	if len(clusters.Items) > 0 {
-		return fmt.Errorf("clusterTemplate is in use")
+		return k8serrors.NewConflict(
+			schema.GroupResource{Group: v1alpha1.SchemeBuilder.GroupVersion.Group, Resource: "clustertemplates"},
+			template.Name,
+			fmt.Errorf("clusterTemplate is in use"),
+		)
 	}
 	return nil
 }