From f473928785abdb4c2c2946262c558157c34a6129 Mon Sep 17 00:00:00 2001 From: Ashwanth Goli Date: Tue, 15 Oct 2024 16:41:02 +0530 Subject: [PATCH] fix compile + update docs --- docs/sources/shared/configuration.md | 14 -------------- pkg/storage/bucket/azure/bucket_client.go | 2 +- pkg/storage/bucket/s3/bucket_client.go | 4 ++-- pkg/storage/bucket/swift/bucket_client.go | 2 +- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/docs/sources/shared/configuration.md b/docs/sources/shared/configuration.md index 465b44ea06f0..3c1f434d2ba7 100644 --- a/docs/sources/shared/configuration.md +++ b/docs/sources/shared/configuration.md @@ -3725,20 +3725,6 @@ ruler_remote_write_sigv4_config: # CLI flag: -limits.per-user-override-period [per_tenant_override_period: | default = 10s] -# S3 server-side encryption type. Required to enable server-side encryption -# overrides for a specific tenant. If not set, the default S3 client settings -# are used. -[s3_sse_type: | default = ""] - -# S3 server-side encryption KMS Key ID. Ignored if the SSE type override is not -# set. -[s3_sse_kms_key_id: | default = ""] - -# S3 server-side encryption KMS encryption context. If unset and the key ID -# override is set, the encryption context will not be provided to S3. Ignored if -# the SSE type override is not set. -[s3_sse_kms_encryption_context: | default = ""] - # Deprecated: Use deletion_mode per tenant configuration instead. [allow_deletes: ] diff --git a/pkg/storage/bucket/azure/bucket_client.go b/pkg/storage/bucket/azure/bucket_client.go index 7cc9a9176740..c7d1e580bcca 100644 --- a/pkg/storage/bucket/azure/bucket_client.go +++ b/pkg/storage/bucket/azure/bucket_client.go @@ -35,5 +35,5 @@ func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucke return nil, err } - return azure.NewBucket(logger, serialized, name) + return azure.NewBucket(logger, serialized, name, nil) } diff --git a/pkg/storage/bucket/s3/bucket_client.go b/pkg/storage/bucket/s3/bucket_client.go index c66322aef3c4..107e18b3c7bb 100644 --- a/pkg/storage/bucket/s3/bucket_client.go +++ b/pkg/storage/bucket/s3/bucket_client.go @@ -19,7 +19,7 @@ func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucke return nil, err } - return s3.NewBucketWithConfig(logger, s3Cfg, name) + return s3.NewBucketWithConfig(logger, s3Cfg, name, nil) } // NewBucketReaderClient creates a new S3 bucket client @@ -29,7 +29,7 @@ func NewBucketReaderClient(cfg Config, name string, logger log.Logger) (objstore return nil, err } - return s3.NewBucketWithConfig(logger, s3Cfg, name) + return s3.NewBucketWithConfig(logger, s3Cfg, name, nil) } func newS3Config(cfg Config) (s3.Config, error) { diff --git a/pkg/storage/bucket/swift/bucket_client.go b/pkg/storage/bucket/swift/bucket_client.go index 4508f1ca7326..b36c07e506b8 100644 --- a/pkg/storage/bucket/swift/bucket_client.go +++ b/pkg/storage/bucket/swift/bucket_client.go @@ -42,5 +42,5 @@ func NewBucketClient(cfg Config, _ string, logger log.Logger) (objstore.Bucket, return nil, err } - return swift.NewContainer(logger, serialized) + return swift.NewContainer(logger, serialized, nil) }