Skip to content

Commit

Permalink
fix compile + update docs
Browse files Browse the repository at this point in the history
  • Loading branch information
ashwanthgoli committed Oct 15, 2024
1 parent 5788eec commit f473928
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
14 changes: 0 additions & 14 deletions docs/sources/shared/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -3725,20 +3725,6 @@ ruler_remote_write_sigv4_config:
# CLI flag: -limits.per-user-override-period
[per_tenant_override_period: <duration> | 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: <string> | default = ""]

# S3 server-side encryption KMS Key ID. Ignored if the SSE type override is not
# set.
[s3_sse_kms_key_id: <string> | 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: <string> | default = ""]

# Deprecated: Use deletion_mode per tenant configuration instead.
[allow_deletes: <boolean>]

Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/bucket/azure/bucket_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
4 changes: 2 additions & 2 deletions pkg/storage/bucket/s3/bucket_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/bucket/swift/bucket_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

0 comments on commit f473928

Please sign in to comment.