HYPERFLEET-971 - feat: reject nodepool create/patch on soft-deleted cluster

Author: kuudori

pkg/errors/errors.go

@@ -52,6 +52,7 @@ const (
 	// Conflict errors (CNF) - 409
 	CodeConflictExists  = "HYPERFLEET-CNF-001"
 	CodeConflictVersion = "HYPERFLEET-CNF-002"
+	CodeConflictState   = "HYPERFLEET-CNF-003"
 
 	// Rate Limit errors (LMT) - 429
 	CodeRateLimitExceeded = "HYPERFLEET-LMT-001"
@@ -166,6 +167,10 @@ var errorDefinitions = map[string]errorDefinition{
 	CodeConflictVersion: {
 		ErrorTypeConflict, "Version Conflict", "The resource version does not match", http.StatusConflict,
 	},
+	CodeConflictState: {
+		ErrorTypeConflict, "State Conflict",
+		"Operation not allowed in current resource state", http.StatusConflict,
+	},
 
 	// Rate Limit errors (LMT) - 429
 	CodeRateLimitExceeded: {
@@ -363,6 +368,10 @@ func Conflict(reason string, values ...interface{}) *ServiceError {
 	return New(CodeConflictExists, reason, values...)
 }
 
+func ConflictState(reason string, values ...interface{}) *ServiceError {
+	return New(CodeConflictState, reason, values...)
+}
+
 func Validation(reason string, values ...interface{}) *ServiceError {
 	return New(CodeValidationMultiple, reason, values...)
 }

pkg/handlers/cluster_nodepools.go

@@ -190,11 +190,15 @@ func (h ClusterNodePoolsHandler) Patch(w http.ResponseWriter, r *http.Request) {
 			clusterID := mux.Vars(r)["id"]
 			nodePoolID := mux.Vars(r)["nodepool_id"]
 
-			_, err := h.clusterService.Get(ctx, clusterID)
+			cluster, err := h.clusterService.Get(ctx, clusterID)
 			if err != nil {
 				return nil, err
 			}
 
+			if cluster.DeletedTime != nil {
+				return nil, errors.ConflictState("Cluster '%s' is marked for deletion", clusterID)
+			}
+
 			found, err := h.nodePoolService.Get(ctx, nodePoolID)
 			if err != nil {
 				return nil, err
@@ -204,6 +208,10 @@ func (h ClusterNodePoolsHandler) Patch(w http.ResponseWriter, r *http.Request) {
 				return nil, errors.NotFound("NodePool '%s' not found for cluster '%s'", nodePoolID, clusterID)
 			}
 
+			if found.DeletedTime != nil {
+				return nil, errors.ConflictState("NodePool '%s' is marked for deletion", nodePoolID)
+			}
+
 			if patch.Spec != nil {
 				specJSON, jsonErr := json.Marshal(*patch.Spec)
 				if jsonErr != nil {
@@ -258,6 +266,10 @@ func (h ClusterNodePoolsHandler) Create(w http.ResponseWriter, r *http.Request)
 				return nil, err
 			}
 
+			if cluster.DeletedTime != nil {
+				return nil, errors.ConflictState("Cluster '%s' is marked for deletion", clusterID)
+			}
+
 			// Use the presenters.ConvertNodePool helper to convert the request
 			nodePoolModel, convErr := presenters.ConvertNodePool(&req, cluster.ID, "system@hyperfleet.local")
 			if convErr != nil {