From fe9d515cedd50f218ea420bb6497b3db4d6db92a Mon Sep 17 00:00:00 2001 From: Oded Viner Date: Thu, 23 Apr 2026 18:54:48 +0300 Subject: [PATCH] object: migrate bucket policy methods to aws sdk v2 migrate PutBucketPolicy and GetBucketPolicy to use aws sdk v2 client. Signed-off-by: Oded Viner (cherry picked from commit 88e0047d9bc569a5b59155ae939d49b8b9e9049d) --- pkg/operator/ceph/object/policy.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/operator/ceph/object/policy.go b/pkg/operator/ceph/object/policy.go index 0f278b414..5abe466dc 100644 --- a/pkg/operator/ceph/object/policy.go +++ b/pkg/operator/ceph/object/policy.go @@ -17,9 +17,10 @@ limitations under the License. package object import ( + "context" "fmt" - "github.com/aws/aws-sdk-go/service/s3" + s3v2 "github.com/aws/aws-sdk-go-v2/service/s3" "k8s.io/apimachinery/pkg/util/json" ) @@ -161,17 +162,17 @@ func NewBucketPolicy(ps ...PolicyStatement) *BucketPolicy { } // PutBucketPolicy applies the policy to the bucket -func (s *S3Agent) PutBucketPolicy(bucket string, policy BucketPolicy) (*s3.PutBucketPolicyOutput, error) { +func (s *S3Agent) PutBucketPolicy(bucket string, policy BucketPolicy) (*s3v2.PutBucketPolicyOutput, error) { confirmRemoveSelfBucketAccess := false serializedPolicy, _ := json.Marshal(policy) consumablePolicy := string(serializedPolicy) - p := &s3.PutBucketPolicyInput{ + p := &s3v2.PutBucketPolicyInput{ Bucket: &bucket, ConfirmRemoveSelfBucketAccess: &confirmRemoveSelfBucketAccess, Policy: &consumablePolicy, } - out, err := s.Client.PutBucketPolicy(p) + out, err := s.ClientV2.PutBucketPolicy(context.TODO(), p) if err != nil { return out, err } @@ -179,7 +180,7 @@ func (s *S3Agent) PutBucketPolicy(bucket string, policy BucketPolicy) (*s3.PutBu } func (s *S3Agent) GetBucketPolicy(bucket string) (*BucketPolicy, error) { - out, err := s.Client.GetBucketPolicy(&s3.GetBucketPolicyInput{ + out, err := s.ClientV2.GetBucketPolicy(context.TODO(), &s3v2.GetBucketPolicyInput{ Bucket: &bucket, }) if err != nil {