Merge pull request #113 from kuudori/HYPERFLEET-971

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

Author: openshift-merge-bot[bot]

openapi/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: HyperFleet API
-  version: 1.0.8
+  version: 1.0.9
   contact:
     name: HyperFleet Team
   license:
@@ -125,6 +125,8 @@ paths:
           description: The server could not understand the request due to invalid syntax.
         '404':
           description: The server cannot find the requested resource.
+        '409':
+          description: The request conflicts with the current state of the server.
         default:
           description: An unexpected error response.
           content:
@@ -173,8 +175,8 @@ paths:
                   conditions:
                     - type: Ready
                       status: 'True'
-                      reason: All adapters reported Ready True for the current generation
-                      message: All adapters reported Ready True for the current generation
+                      reason: All adapters reported Available=True for the current generation
+                      message: All adapters reported Available=True for the current generation
                       observed_generation: 2
                       created_time: '2021-01-01T10:00:00Z'
                       last_updated_time: '2021-01-01T10:00:00Z'
@@ -283,6 +285,8 @@ paths:
                 $ref: '#/components/schemas/NodePoolCreateResponse'
         '400':
           description: The server could not understand the request due to invalid syntax.
+        '409':
+          description: The request conflicts with the current state of the server.
         default:
           description: An unexpected error response.
           content:
@@ -376,8 +380,8 @@ paths:
                   conditions:
                     - type: Ready
                       status: 'True'
-                      reason: All adapters reported Ready True for the current generation
-                      message: All adapters reported Ready True for the current generation
+                      reason: All adapters reported Available=True for the current generation
+                      message: All adapters reported Available=True for the current generation
                       observed_generation: 2
                       created_time: '2021-01-01T10:00:00Z'
                       last_updated_time: '2021-01-01T10:00:00Z'
@@ -460,6 +464,8 @@ paths:
           description: The server could not understand the request due to invalid syntax.
         '404':
           description: The server cannot find the requested resource.
+        '409':
+          description: The request conflicts with the current state of the server.
         default:
           description: An unexpected error response.
           content:
@@ -1055,8 +1061,8 @@ components:
           conditions:
             - type: Ready
               status: 'True'
-              reason: All adapters reported Ready True for the current generation
-              message: All adapters reported Ready True for the current generation
+              reason: All adapters reported Available=True for the current generation
+              message: All adapters reported Available=True for the current generation
               observed_generation: 1
               created_time: '2021-01-01T10:00:00Z'
               last_updated_time: '2021-01-01T10:00:00Z'
@@ -1354,8 +1360,8 @@ components:
           conditions:
             - type: Ready
               status: 'True'
-              reason: All adapters reported Ready True for the current generation
-              message: All adapters reported Ready True for the current generation
+              reason: All adapters reported Available=True for the current generation
+              message: All adapters reported Available=True for the current generation
               observed_generation: 1
               created_time: '2021-01-01T10:00:00Z'
               last_updated_time: '2021-01-01T10:00:00Z'

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 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.go

@@ -76,6 +76,10 @@ func (h ClusterHandler) Patch(w http.ResponseWriter, r *http.Request) {
 				return nil, err
 			}
 
+			if found.DeletedTime != nil {
+				return nil, errors.ConflictState("Cluster '%s' is marked for deletion", id)
+			}
+
 			if patch.Spec != nil {
 				specJSON, err := json.Marshal(*patch.Spec)
 				if err != nil {

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 {