Merge pull request #71 from slr71/main

Fix a schema validation error for group deletion requests.

Author: slr71

skaffold.yaml

@@ -1,14 +1,17 @@
-apiVersion: skaffold/v1
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: data-info
-deploy:
-  kubectl:
-    manifests:
-    - k8s/data-info.yml
 build:
+  artifacts:
+    - image: harbor.cyverse.org/de/data-info
   tagPolicy:
     gitCommit: {}
-  artifacts:
-  - image: harbor.cyverse.org/de/data-info
   local: {}
+  platforms:
+    - "linux/amd64"
+manifests:
+  rawYaml:
+    - k8s/data-info.yml
+deploy:
+  kubectl: {}

src/data_info/routes/groups.clj

@@ -41,6 +41,9 @@
   (assoc GroupErrorResponses
          :error_code DeleteErrorCodes))
 
+(s/defschema GroupDeleted
+  {:name (describe String "group name")})
+
 (defroutes groups-routes
   (context "/groups" []
     :tags ["groups"]
@@ -94,7 +97,8 @@
                                   :description data-schema/CommonErrorCodeDocs}}
                             {403 {:schema ErrorResponseForbidden
                                   :description "No access to group administration"}}
-                            {200 {:description "Successful response"}})
+                            {200 {:schema GroupDeleted
+                                  :description "Successful response"}})
         :summary     "Delete group"
         :description "Delete an IRODS group's members"
         (ok (groups/delete-group params group-name))))))

src/data_info/services/groups.clj

@@ -59,4 +59,4 @@
     (validators/user-is-group-admin cm user)
     (when (users/group-exists? cm group-name)
       (users/delete-user-group cm group-name))
-    nil))
+    {:name group-name}))