fix(deps): update github.com/thanos-io/objstore digest to a0136a6 (main)

go.mod

@@ -75,7 +75,7 @@ require (
 	github.com/prometheus/otlptranslator v0.0.0-20250501145537-53ceaec28820
 	github.com/prometheus/procfs v0.15.1
 	github.com/shirou/gopsutil/v4 v4.24.12
-	github.com/thanos-io/objstore v0.0.0-20250129163715-ec72e5a88a79
+	github.com/thanos-io/objstore v0.0.0-20250317105316-a0136a6f898d
 	github.com/tjhop/slog-gokit v0.1.4
 	github.com/twmb/franz-go v1.19.1
 	github.com/twmb/franz-go/pkg/kadm v1.15.0

go.sum

@@ -1010,8 +1010,8 @@ github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.40 h1:W6vDGKCHe4wBACI1d2UgE6+50sJFhRWU4O8IB2ozzxM=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.40/go.mod h1:4dCEtLHGh8QPxHEkgq+nFaky7yZxQuYwgSJM87icDaw=
-github.com/thanos-io/objstore v0.0.0-20250129163715-ec72e5a88a79 h1:sVc5fCMlPFEZfhIfdiEJqMmNIP3sEnRZv9K83Nz/mR8=
-github.com/thanos-io/objstore v0.0.0-20250129163715-ec72e5a88a79/go.mod h1:Quz9HUDjGidU0RQpoytzK4KqJ7kwzP+DMAm4K57/usM=
+github.com/thanos-io/objstore v0.0.0-20250317105316-a0136a6f898d h1:L4k+8i1cl0h3MscslVUAcBpvA5i9UYzE0DybcOxzvlM=
+github.com/thanos-io/objstore v0.0.0-20250317105316-a0136a6f898d/go.mod h1:Nmy3+M2UM7wu2sEvg0h5M/c3mu1QaxmdyPvoGUPGlaU=
 github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
 github.com/tjhop/slog-gokit v0.1.4 h1:uj/vbDt3HaF0Py8bHPV4ti/s0utnO0miRbO277FLBKM=
 github.com/tjhop/slog-gokit v0.1.4/go.mod h1:Bbu5v2748qpAWH7k6gse/kw3076IJf6owJmh7yArmJs=

pkg/ingester/shipper_test.go

@@ -170,8 +170,8 @@ type deceivingUploadBucket struct {
 	objectBaseName string
 }
 
-func (b deceivingUploadBucket) Upload(ctx context.Context, name string, r io.Reader) error {
-	actualErr := b.Bucket.Upload(ctx, name, r)
+func (b deceivingUploadBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
+	actualErr := b.Bucket.Upload(ctx, name, r, opts...)
 	if actualErr != nil {
 		return actualErr
 	} else if path.Base(name) == b.objectBaseName {

pkg/mimirtool/commands/bucket_validation.go

@@ -65,8 +65,8 @@ func (c *retryingBucketClient) withRetries(f func() error) error {
 	}
 }
 
-func (c *retryingBucketClient) Upload(ctx context.Context, name string, r io.Reader) error {
-	return c.withRetries(func() error { return c.Bucket.Upload(ctx, name, r) })
+func (c *retryingBucketClient) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
+	return c.withRetries(func() error { return c.Bucket.Upload(ctx, name, r, opts...) })
 }
 
 func (c *retryingBucketClient) Exists(ctx context.Context, name string) (bool, error) {

pkg/storage/bucket/client_mock.go

@@ -29,13 +29,13 @@ func (m *ClientMock) Provider() objstore.ObjProvider {
 }
 
 // Upload mocks objstore.Bucket.Upload()
-func (m *ClientMock) Upload(ctx context.Context, name string, r io.Reader) error {
-	args := m.Called(ctx, name, r)
+func (m *ClientMock) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
+	args := m.Called(ctx, name, r, opts)
 	return args.Error(0)
 }
 
 func (m *ClientMock) MockUpload(name string, err error) {
-	m.On("Upload", mock.Anything, name, mock.Anything).Return(err)
+	m.On("Upload", mock.Anything, name, mock.Anything, mock.Anything).Return(err)
 }
 
 // Delete mocks objstore.Bucket.Delete()

pkg/storage/bucket/delayed_bucket_client.go

@@ -36,11 +36,11 @@ func (m *DelayedBucketClient) Provider() objstore.ObjProvider {
 	return m.wrapped.Provider()
 }
 
-func (m *DelayedBucketClient) Upload(ctx context.Context, name string, r io.Reader) error {
+func (m *DelayedBucketClient) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
 	m.delay()
 	defer m.delay()
 
-	return m.wrapped.Upload(ctx, name, r)
+	return m.wrapped.Upload(ctx, name, r, opts...)
 }
 
 func (m *DelayedBucketClient) Delete(ctx context.Context, name string) error {

pkg/storage/bucket/error_injected_bucket_client.go

@@ -57,11 +57,11 @@ func (b *ErrorInjectedBucketClient) Exists(ctx context.Context, name string) (bo
 	return b.Bucket.Exists(ctx, name)
 }
 
-func (b *ErrorInjectedBucketClient) Upload(ctx context.Context, name string, r io.Reader) error {
+func (b *ErrorInjectedBucketClient) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
 	if err := b.injectError(OpUpload, name); err != nil {
 		return err
 	}
-	return b.Bucket.Upload(ctx, name, r)
+	return b.Bucket.Upload(ctx, name, r, opts...)
 }
 
 func (b *ErrorInjectedBucketClient) Delete(ctx context.Context, name string) error {

pkg/storage/bucket/prefixed_bucket_client.go

@@ -40,8 +40,8 @@ func (b *PrefixedBucketClient) Provider() objstore.ObjProvider {
 }
 
 // Upload the contents of the reader as an object into the bucket.
-func (b *PrefixedBucketClient) Upload(ctx context.Context, name string, r io.Reader) (err error) {
-	err = b.bucket.Upload(ctx, b.fullName(name), r)
+func (b *PrefixedBucketClient) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) (err error) {
+	err = b.bucket.Upload(ctx, b.fullName(name), r, opts...)
 	return
 }
 

pkg/storage/bucket/sse_bucket_client.go

@@ -56,7 +56,7 @@ func (b *SSEBucketClient) Provider() objstore.ObjProvider {
 }
 
 // Upload the contents of the reader as an object into the bucket.
-func (b *SSEBucketClient) Upload(ctx context.Context, name string, r io.Reader) error {
+func (b *SSEBucketClient) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
 	if sse, err := b.getCustomS3SSEConfig(); err != nil {
 		return err
 	} else if sse != nil {
@@ -65,7 +65,7 @@ func (b *SSEBucketClient) Upload(ctx context.Context, name string, r io.Reader)
 		ctx = s3.ContextWithSSEConfig(ctx, sse)
 	}
 
-	return b.bucket.Upload(ctx, name, r)
+	return b.bucket.Upload(ctx, name, r, opts...)
 }
 
 // Delete implements objstore.Bucket.

pkg/storage/tsdb/block/block_test.go

@@ -509,8 +509,8 @@ type errBucket struct {
 	failSuffix string
 }
 
-func (eb errBucket) Upload(ctx context.Context, name string, r io.Reader) error {
-	err := eb.Bucket.Upload(ctx, name, r)
+func (eb errBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
+	err := eb.Bucket.Upload(ctx, name, r, opts...)
 	if err != nil {
 		return err
 	}

pkg/storage/tsdb/block/global_markers_bucket_client.go

@@ -35,10 +35,10 @@ func (b *globalMarkersBucket) Provider() objstore.ObjProvider {
 }
 
 // Upload implements objstore.Bucket.
-func (b *globalMarkersBucket) Upload(ctx context.Context, name string, r io.Reader) error {
+func (b *globalMarkersBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
 	globalMarkPath := getGlobalMarkPathFromBlockMark(name)
 	if globalMarkPath == "" {
-		return b.parent.Upload(ctx, name, r)
+		return b.parent.Upload(ctx, name, r, opts...)
 	}
 
 	// Read the marker.
@@ -48,12 +48,12 @@ func (b *globalMarkersBucket) Upload(ctx context.Context, name string, r io.Read
 	}
 
 	// Upload it to the original location.
-	if err := b.parent.Upload(ctx, name, bytes.NewReader(body)); err != nil {
+	if err := b.parent.Upload(ctx, name, bytes.NewReader(body), opts...); err != nil {
 		return err
 	}
 
 	// Upload it to the global markers location too.
-	return b.parent.Upload(ctx, globalMarkPath, bytes.NewReader(body))
+	return b.parent.Upload(ctx, globalMarkPath, bytes.NewReader(body), opts...)
 }
 
 // Delete implements objstore.Bucket.

pkg/storage/tsdb/bucketcache/caching_bucket.go

@@ -166,10 +166,10 @@ func NewCachingBucket(bucketID string, bucketClient objstore.Bucket, cfg *Cachin
 	return cb, nil
 }
 
-func (cb *CachingBucket) Upload(ctx context.Context, name string, r io.Reader) error {
+func (cb *CachingBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) error {
 	keyGen := newCacheKeyBuilder(cb.bucketID, name)
 	cb.invalidation.start(ctx, name, keyGen)
-	err := cb.Bucket.Upload(ctx, name, r)
+	err := cb.Bucket.Upload(ctx, name, r, opts...)
 	if err == nil {
 		cb.invalidation.finish(ctx, name, keyGen)
 	}