fix(Deployment): Bulk delete support(#937)

fix(Deployment): Delete operation should not be available to deployment in ERROR state
nuvla · Aug 29, 2024 · 08a58ab · 08a58ab
1 parent 7ca78d2
commit 08a58ab
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/code/src/com/sixsq/nuvla/server/resources/deployment.clj b/code/src/com/sixsq/nuvla/server/resources/deployment.clj
@@ -482,6 +482,10 @@ a container orchestration engine.
   [request]
   (bulk-action-impl request))
 
+(defmethod crud/bulk-action [resource-type "bulk-delete"]
+  [request]
+  (bulk-action-impl request))
+
 (defmethod crud/bulk-action [resource-type "bulk-force-delete"]
   [request]
   (bulk-action-impl request))

diff --git a/code/src/com/sixsq/nuvla/server/resources/deployment/utils.clj b/code/src/com/sixsq/nuvla/server/resources/deployment/utils.clj
@@ -135,7 +135,7 @@
 
 (defn can-delete?
   [{:keys [state] :as _resource}]
-  (#{"CREATED" "STOPPED" "ERROR"} state))
+  (#{"CREATED" "STOPPED"} state))
 
 
 (defn can-start?

diff --git a/code/test/com/sixsq/nuvla/server/resources/deployment_lifecycle_test.clj b/code/test/com/sixsq/nuvla/server/resources/deployment_lifecycle_test.clj
@@ -763,15 +763,13 @@
           valid-deployment {:module {:href module-id}}]
 
       ;; check deployment creation
-      (let [deployment-id  (-> session-user
+      (let [deployment-url (-> session-user
                                (request base-uri
                                         :request-method :post
                                         :body (json/write-str valid-deployment))
                                (ltu/body->edn)
                                (ltu/is-status 201)
-                               (ltu/location))
-
-            deployment-url (str p/service-context deployment-id)]
+                               (ltu/location-url))]
 
         ;; admin/user should see one deployment
         (doseq [session [session-user session-admin]]
@@ -791,18 +789,23 @@
             (ltu/body->edn)
             (ltu/is-status 200))
 
-        ;; verify that the user can delete the deployment
-        (-> session-user
-            (request deployment-url
-                     :request-method :delete)
-            (ltu/body->edn)
-            (ltu/is-status 200))
+        (testing "verify that the user cannot delete the deployment"
+          (-> session-user
+              (request deployment-url
+                       :request-method :delete)
+              (ltu/body->edn)
+              (ltu/is-status 409)))
 
-        ;; verify that the deployment has disappeared
-        (-> session-user
-            (request deployment-url)
-            (ltu/body->edn)
-            (ltu/is-status 404)))
+        (let [force-delete-url (-> session-user
+                                   (request deployment-url)
+                                   (ltu/body->edn)
+                                   (ltu/is-status 200)
+                                   (ltu/get-op-url :force-delete))]
+          (testing "verify that the user can force delete the deployment"
+            (-> session-user
+                (request force-delete-url)
+                (ltu/body->edn)
+                (ltu/is-status 200)))))
 
       (-> session-user
           (request (str p/service-context module-id)