From d62d8f3874e57f05052b96d18ba3567c055ff89f Mon Sep 17 00:00:00 2001 From: Artem Tataurov Date: Tue, 14 May 2024 16:40:58 +0300 Subject: [PATCH] [#385] Support the renaming of ObjectRequest and ObjectContainer Signed-off-by: Artem Tataurov --- api/handler/put.go | 16 ++++++++-------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/handler/put.go b/api/handler/put.go index 830dfe3..9ef7dfd 100644 --- a/api/handler/put.go +++ b/api/handler/put.go @@ -1058,10 +1058,10 @@ func bucketCannedACLToAPERules(cannedACL string, reqInfo *middleware.ReqInfo, ke fmt.Sprintf(s3.ResourceFormatS3BucketObjects, reqInfo.BucketName), }}, Condition: []chain.Condition{{ - Op: chain.CondStringEquals, - Object: chain.ObjectRequest, - Key: s3.PropertyKeyOwner, - Value: key.Address(), + Op: chain.CondStringEquals, + Kind: chain.KindRequest, + Key: s3.PropertyKeyOwner, + Value: key.Address(), }}, }}}, { @@ -1074,10 +1074,10 @@ func bucketCannedACLToAPERules(cannedACL string, reqInfo *middleware.ReqInfo, ke fmt.Sprintf(native.ResourceFormatNamespaceContainerObjects, reqInfo.Namespace, cnrIDStr), }}, Condition: []chain.Condition{{ - Op: chain.CondStringEquals, - Object: chain.ObjectRequest, - Key: native.PropertyKeyActorPublicKey, - Value: hex.EncodeToString(key.Bytes()), + Op: chain.CondStringEquals, + Kind: chain.KindRequest, + Key: native.PropertyKeyActorPublicKey, + Value: hex.EncodeToString(key.Bytes()), }}, }}, }, diff --git a/go.mod b/go.mod index 77c80ab..bd855b3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240409115729-6eb492025bdd git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6 git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240402141549-3790142b10c7 - git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240416071728-04a79f57ef1f + git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240513163744-1f6f4163d40d git.frostfs.info/TrueCloudLab/zapjournald v0.0.0-20240124114243-cb2e66427d02 github.com/aws/aws-sdk-go v1.44.6 github.com/bluele/gcache v0.0.2 diff --git a/go.sum b/go.sum index 042a80e..40faea8 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240402141549-3790142b10c7 git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240402141549-3790142b10c7/go.mod h1:i0RKqiF4z3UOxLSNwhHw+cUz/JyYWuTRpnn9ere4Y3w= git.frostfs.info/TrueCloudLab/hrw v1.2.1 h1:ccBRK21rFvY5R1WotI6LNoPlizk7qSvdfD8lNIRudVc= git.frostfs.info/TrueCloudLab/hrw v1.2.1/go.mod h1:C1Ygde2n843yTZEQ0FP69jYiuaYV0kriLvP4zm8JuvM= -git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240416071728-04a79f57ef1f h1:hP1Q/MJvRsHSBIWXn48C+hVsRHfPWWLhdOg6IxjaWBs= -git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240416071728-04a79f57ef1f/go.mod h1:H/AW85RtYxVTbcgwHW76DqXeKlsiCIOeNXHPqyDBrfQ= +git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240513163744-1f6f4163d40d h1:hHk8FWbWgEnwm2I045CaBIrZBjy/o81CehIVOySA/pQ= +git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240513163744-1f6f4163d40d/go.mod h1:SgioiGhQNWqiV5qpFAXRDJF81SEFRBhtwGEiU0FViyA= git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 h1:M2KR3iBj7WpY3hP10IevfIB9MURr4O9mwVfJ+SjT3HA= git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0/go.mod h1:okpbKfVYf/BpejtfFTfhZqFP+sZ8rsHrP8Rr/jYPNRc= git.frostfs.info/TrueCloudLab/tzhash v1.8.0 h1:UFMnUIk0Zh17m8rjGHJMqku2hCgaXDqjqZzS4gsb4UA= -- 2.45.2