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

go.mod

@@ -74,7 +74,7 @@ require (
 	github.com/okzk/sdnotify v0.0.0-20240725214427-1c1fdd37c5ac
 	github.com/prometheus/procfs v0.15.1
 	github.com/shirou/gopsutil/v4 v4.24.10
-	github.com/thanos-io/objstore v0.0.0-20241028150459-cfdd0e50390d
+	github.com/thanos-io/objstore v0.0.0-20241105144332-b598dceacb13
 	github.com/twmb/franz-go v1.17.1
 	github.com/twmb/franz-go/pkg/kadm v1.13.0
 	github.com/twmb/franz-go/pkg/kfake v0.0.0-20241015013301-cea7aa5d8037

go.sum

@@ -1699,8 +1699,8 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8
 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-20241028150459-cfdd0e50390d h1:k+SLTP1mjNqXxsCiq4UYeKCe07le0ieffyuHm/YfmH8=
-github.com/thanos-io/objstore v0.0.0-20241028150459-cfdd0e50390d/go.mod h1:/ZMUxFcp/nT6oYV5WslH9k07NU/+86+aibgZRmMMr/4=
+github.com/thanos-io/objstore v0.0.0-20241105144332-b598dceacb13 h1:PQd6xZs18KGoCZJgL9eyYsrRGzzRwYCr4iXuehZm++w=
+github.com/thanos-io/objstore v0.0.0-20241105144332-b598dceacb13/go.mod h1:/ZMUxFcp/nT6oYV5WslH9k07NU/+86+aibgZRmMMr/4=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
 github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=

pkg/compactor/blocks_cleaner.go

@@ -674,7 +674,7 @@ func stalePartialBlockLastModifiedTime(ctx context.Context, blockID ulid.ULID, u
 			lastModified = attrib.LastModified
 		}
 		return nil
-	}, objstore.WithRecursiveIter)
+	}, objstore.WithRecursiveIter())
 
 	if errors.Is(err, errStopIter) {
 		return time.Time{}, nil

pkg/ruler/rulestore/bucketclient/bucket_client.go

@@ -150,7 +150,7 @@ func (b *BucketRuleStore) ListRuleGroupsForUserAndNamespace(ctx context.Context,
 			Name:      group,
 		})
 		return nil
-	}, objstore.WithRecursiveIter)
+	}, objstore.WithRecursiveIter())
 	if err != nil {
 		return nil, err
 	}

pkg/storage/bucket/client_mock.go

@@ -51,6 +51,17 @@ func (m *ClientMock) Iter(ctx context.Context, dir string, f func(string) error,
 	return args.Error(0)
 }
 
+// IterWithAttributes mocks objstore.Bucket.IterWithAttributes().
+func (m *ClientMock) IterWithAttributes(ctx context.Context, dir string, f func(attrs objstore.IterObjectAttributes) error, options ...objstore.IterOption) error {
+	return m.Called(ctx, dir, f, options).Error(0)
+}
+
+// SupportedIterOptions mocks objstore.Bucket.SupportedIterOptions().
+func (m *ClientMock) SupportedIterOptions() []objstore.IterOptionType {
+	m.Called()
+	return nil
+}
+
 // MockIter is a convenient method to mock Iter()
 func (m *ClientMock) MockIter(prefix string, objects []string, err error) {
 	m.MockIterWithCallback(prefix, objects, err, nil)

pkg/storage/bucket/delayed_bucket_client.go

@@ -57,6 +57,20 @@ func (m *DelayedBucketClient) Iter(ctx context.Context, dir string, f func(strin
 	return m.wrapped.Iter(ctx, dir, f, options...)
 }
 
+func (m *DelayedBucketClient) IterWithAttributes(ctx context.Context, dir string, f func(attrs objstore.IterObjectAttributes) error, options ...objstore.IterOption) error {
+	m.delay()
+	defer m.delay()
+
+	return m.wrapped.IterWithAttributes(ctx, dir, f, options...)
+}
+
+func (m *DelayedBucketClient) SupportedIterOptions() []objstore.IterOptionType {
+	m.delay()
+	defer m.delay()
+
+	return m.wrapped.SupportedIterOptions()
+}
+
 func (m *DelayedBucketClient) Get(ctx context.Context, name string) (io.ReadCloser, error) {
 	m.delay()
 	defer m.delay()

pkg/storage/bucket/prefixed_bucket_client.go

@@ -58,6 +58,23 @@ func (b *PrefixedBucketClient) Iter(ctx context.Context, dir string, f func(stri
 	}, options...)
 }
 
+// IterWithAttributes calls f for each entry in the given directory similar to Iter.
+// In addition to Name, it also includes requested object attributes in the argument to f.
+//
+// Attributes can be requested using IterOption.
+// Not all IterOptions are supported by all providers, requesting for an unsupported option will fail with ErrOptionNotSupported.
+func (b *PrefixedBucketClient) IterWithAttributes(ctx context.Context, dir string, f func(objstore.IterObjectAttributes) error, options ...objstore.IterOption) error {
+	return b.bucket.IterWithAttributes(ctx, b.fullName(dir), func(attrs objstore.IterObjectAttributes) error {
+		attrs.Name = strings.TrimPrefix(attrs.Name, b.prefix+objstore.DirDelim)
+		return f(attrs)
+	}, options...)
+}
+
+// SupportedIterOptions returns a list of supported IterOptions by the underlying provider.
+func (b *PrefixedBucketClient) SupportedIterOptions() []objstore.IterOptionType {
+	return b.bucket.SupportedIterOptions()
+}
+
 // Get returns a reader for the given object name.
 func (b *PrefixedBucketClient) Get(ctx context.Context, name string) (io.ReadCloser, error) {
 	return b.bucket.Get(ctx, b.fullName(name))

pkg/storage/bucket/sse_bucket_client.go

@@ -104,6 +104,16 @@ func (b *SSEBucketClient) Iter(ctx context.Context, dir string, f func(string) e
 	return b.bucket.Iter(ctx, dir, f, options...)
 }
 
+// IterWithAttributes implements objstore.Bucket.
+func (b *SSEBucketClient) IterWithAttributes(ctx context.Context, dir string, f func(attrs objstore.IterObjectAttributes) error, options ...objstore.IterOption) error {
+	return b.bucket.IterWithAttributes(ctx, dir, f, options...)
+}
+
+// SupportedIterOptions implements objstore.Bucket.
+func (b *SSEBucketClient) SupportedIterOptions() []objstore.IterOptionType {
+	return b.bucket.SupportedIterOptions()
+}
+
 // Get implements objstore.Bucket.
 func (b *SSEBucketClient) Get(ctx context.Context, name string) (io.ReadCloser, error) {
 	return b.bucket.Get(ctx, name)

pkg/storage/tsdb/block/global_markers_bucket_client.go

@@ -97,6 +97,16 @@ func (b *globalMarkersBucket) Iter(ctx context.Context, dir string, f func(strin
 	return b.parent.Iter(ctx, dir, f, options...)
 }
 
+// IterWithAttributes implements objstore.Bucket.
+func (b *globalMarkersBucket) IterWithAttributes(ctx context.Context, dir string, f func(objstore.IterObjectAttributes) error, options ...objstore.IterOption) error {
+	return b.parent.IterWithAttributes(ctx, dir, f, options...)
+}
+
+// SupportedIterOptions implements objstore.Bucket.
+func (b *globalMarkersBucket) SupportedIterOptions() []objstore.IterOptionType {
+	return b.parent.SupportedIterOptions()
+}
+
 // Get implements objstore.Bucket.
 func (b *globalMarkersBucket) Get(ctx context.Context, name string) (io.ReadCloser, error) {
 	return b.parent.Get(ctx, name)

pkg/storage/tsdb/bucketcache/caching_bucket_test.go

@@ -846,9 +846,9 @@ func TestCachingKeyObjectSubrange(t *testing.T) {
 
 func TestCachingKeyIter(t *testing.T) {
 	assert.Equal(t, "iter:/object", cachingKeyIter("", "/object"))
-	assert.Equal(t, "iter:/object:recursive", cachingKeyIter("", "/object", objstore.WithRecursiveIter))
+	assert.Equal(t, "iter:/object:recursive", cachingKeyIter("", "/object", objstore.WithRecursiveIter()))
 	assert.Equal(t, "test:iter:/object", cachingKeyIter("test", "/object"))
-	assert.Equal(t, "test:iter:/object:recursive", cachingKeyIter("test", "/object", objstore.WithRecursiveIter))
+	assert.Equal(t, "test:iter:/object:recursive", cachingKeyIter("test", "/object", objstore.WithRecursiveIter()))
 }
 
 func TestCachingKeyExists(t *testing.T) {
@@ -886,7 +886,7 @@ func TestCachingKey_ShouldKeepAllocationsToMinimum(t *testing.T) {
 		},
 		"cachingKeyIter() recursive": {
 			run: func(bucketID string) {
-				cachingKeyIter(bucketID, "/dir", objstore.WithRecursiveIter)
+				cachingKeyIter(bucketID, "/dir", objstore.WithRecursiveIter())
 			},
 			expectedAllocs: 2.0,
 		},
@@ -1023,7 +1023,7 @@ func BenchmarkCachingKey(b *testing.B) {
 		},
 		"cachingKeyIter() recursive": {
 			run: func(bucketID string) {
-				cachingKeyIter(bucketID, "/dir", objstore.WithRecursiveIter)
+				cachingKeyIter(bucketID, "/dir", objstore.WithRecursiveIter())
 			},
 		},
 		"cachingKeyExists()": {