Skip to content

Commit 1f1537f

Browse files
adfostAdam Stafford
andauthored
access rule delete bug fix (#978)
Co-authored-by: Adam Stafford <adamstafford@Adams-MacBook-Pro.local>
1 parent 5978553 commit 1f1537f

File tree

9 files changed

+147
-49
lines changed

9 files changed

+147
-49
lines changed

models/prefix_wrapper.go

Lines changed: 67 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

portal-ui/src/screens/Console/Buckets/BucketDetails/DeleteAccessRule.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ const DeleteAccessRule = ({
6464
}: IDeleteAccessRule) => {
6565
const deleteProcess = () => {
6666
api
67-
.invoke("DELETE", `/api/v1/bucket/${bucket}/access-rules/${toDelete}`)
67+
.invoke("DELETE", `/api/v1/bucket/${bucket}/access-rules`,
68+
{
69+
prefix: toDelete,
70+
})
6871
.then((res: any) => {})
6972
.catch((err: ErrorResponseHandler) => {
7073
setErrorSnackMessage(err);

restapi/admin_policies.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ func getSetAccessRuleWithBucketResponse(session *models.Principal, bucket string
146146
return true, nil
147147
}
148148

149-
func getDeleteAccessRuleWithBucketResponse(session *models.Principal, bucket string, prefix string) (bool, *models.Error) {
149+
func getDeleteAccessRuleWithBucketResponse(session *models.Principal, bucket string, prefix *models.PrefixWrapper) (bool, *models.Error) {
150150
ctx := context.Background()
151-
client, err := newS3BucketClient(session, bucket, prefix)
151+
client, err := newS3BucketClient(session, bucket, prefix.Prefix)
152152
if err != nil {
153153
return false, prepareError(err)
154154
}

restapi/embedded_spec.go

Lines changed: 28 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

restapi/operations/admin_api/delete_access_rule_with_bucket.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

restapi/operations/admin_api/delete_access_rule_with_bucket_parameters.go

Lines changed: 34 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

restapi/operations/admin_api/delete_access_rule_with_bucket_urlbuilder.go

Lines changed: 1 addition & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

restapi/operations/console_api.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swagger-console.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,8 +1649,6 @@ paths:
16491649
$ref: "#/definitions/error"
16501650
tags:
16511651
- AdminAPI
1652-
1653-
/bucket/{bucket}/access-rules/{prefix}:
16541652
delete:
16551653
summary: Delete Access Rule From Given Bucket
16561654
operationId: DeleteAccessRuleWithBucket
@@ -1660,9 +1658,10 @@ paths:
16601658
required: true
16611659
type: string
16621660
- name: prefix
1663-
in: path
1661+
in: body
16641662
required: true
1665-
type: string
1663+
schema:
1664+
$ref: "#/definitions/prefixWrapper"
16661665
responses:
16671666
200:
16681667
description: A successful response.
@@ -3517,6 +3516,12 @@ definitions:
35173516
access:
35183517
type: string
35193518

3519+
prefixWrapper:
3520+
type: object
3521+
properties:
3522+
prefix:
3523+
type: string
3524+
35203525
setConfigResponse:
35213526
type: object
35223527
properties:

0 commit comments

Comments
 (0)