access rule delete bug fix (#978)

Co-authored-by: Adam Stafford <adamstafford@Adams-MacBook-Pro.local>
minio · Aug 24, 2021 · 1f1537f · 1f1537f
1 parent 5978553
commit 1f1537f
Show file tree

Hide file tree

Showing 9 changed files with 147 additions and 49 deletions.
diff --git a/models/prefix_wrapper.go b/models/prefix_wrapper.go
diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/DeleteAccessRule.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/DeleteAccessRule.tsx
@@ -64,7 +64,10 @@ const DeleteAccessRule = ({
 }: IDeleteAccessRule) => {
   const deleteProcess = () => {
     api
-      .invoke("DELETE", `/api/v1/bucket/${bucket}/access-rules/${toDelete}`)
+      .invoke("DELETE", `/api/v1/bucket/${bucket}/access-rules`,
+        {
+          prefix: toDelete,
+        })
       .then((res: any) => {})
       .catch((err: ErrorResponseHandler) => {
         setErrorSnackMessage(err);

diff --git a/restapi/admin_policies.go b/restapi/admin_policies.go
@@ -146,9 +146,9 @@ func getSetAccessRuleWithBucketResponse(session *models.Principal, bucket string
 	return true, nil
 }
 
-func getDeleteAccessRuleWithBucketResponse(session *models.Principal, bucket string, prefix string) (bool, *models.Error) {
+func getDeleteAccessRuleWithBucketResponse(session *models.Principal, bucket string, prefix *models.PrefixWrapper) (bool, *models.Error) {
 	ctx := context.Background()
-	client, err := newS3BucketClient(session, bucket, prefix)
+	client, err := newS3BucketClient(session, bucket, prefix.Prefix)
 	if err != nil {
 		return false, prepareError(err)
 	}

diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket.go b/restapi/operations/admin_api/delete_access_rule_with_bucket.go
diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket_parameters.go b/restapi/operations/admin_api/delete_access_rule_with_bucket_parameters.go
diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket_urlbuilder.go b/restapi/operations/admin_api/delete_access_rule_with_bucket_urlbuilder.go
diff --git a/restapi/operations/console_api.go b/restapi/operations/console_api.go
diff --git a/swagger-console.yml b/swagger-console.yml
@@ -1649,8 +1649,6 @@ paths:
             $ref: "#/definitions/error"
       tags:
         - AdminAPI
-
-  /bucket/{bucket}/access-rules/{prefix}:
     delete:
       summary: Delete Access Rule From Given Bucket
       operationId: DeleteAccessRuleWithBucket
@@ -1660,9 +1658,10 @@ paths:
           required: true
           type: string
         - name: prefix
-          in: path
+          in: body
           required: true
-          type: string
+          schema:
+            $ref: "#/definitions/prefixWrapper"
       responses:
         200:
           description: A successful response.
@@ -3517,6 +3516,12 @@ definitions:
       access:
         type: string
 
+  prefixWrapper:
+    type: object
+    properties:
+      prefix:
+        type: string
+
   setConfigResponse:
     type: object
     properties: