Skip to content

Commit ee87dff

Browse files
yeya24yeya24
authored
update objstore to revert thanos-io/objstore#148 (#6297)
* update objstore to revert thanos-io/objstore#148 Signed-off-by: Ben Ye <[email protected]> * fix bucket client due to signature change Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Ben Ye <[email protected]>
1 parent 00c7b68 commit ee87dff

File tree

18 files changed

+91
-69
lines changed

18 files changed

+91
-69
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
github.com/sony/gobreaker v1.0.0
5252
github.com/spf13/afero v1.11.0
5353
github.com/stretchr/testify v1.9.0
54-
github.com/thanos-io/objstore v0.0.0-20240913074259-63feed0da069
54+
github.com/thanos-io/objstore v0.0.0-20241010161353-f90c89a0ef90
5555
github.com/thanos-io/promql-engine v0.0.0-20240921092401-37747eddbd31
5656
github.com/thanos-io/thanos v0.35.2-0.20241029125830-62038110b1bc
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,8 +1686,8 @@ github.com/tencentyun/cos-go-sdk-v5 v0.7.40 h1:W6vDGKCHe4wBACI1d2UgE6+50sJFhRWU4
16861686
github.com/tencentyun/cos-go-sdk-v5 v0.7.40/go.mod h1:4dCEtLHGh8QPxHEkgq+nFaky7yZxQuYwgSJM87icDaw=
16871687
github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1Zsv7OAU9iQhZwigp50Yl38W10g/vd5NC8Rdk1Jzng=
16881688
github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM=
1689-
github.com/thanos-io/objstore v0.0.0-20240913074259-63feed0da069 h1:TUPZ6euAh8I62KrpDnBIg7k2C5HjgXQnVHoUUMacGwM=
1690-
github.com/thanos-io/objstore v0.0.0-20240913074259-63feed0da069/go.mod h1:Cba80S8NbVBBdyZKzra7San/jXvpAxArbpFymWzIZhg=
1689+
github.com/thanos-io/objstore v0.0.0-20241010161353-f90c89a0ef90 h1:+gDIM0kLg4mpwU4RjvG09KiZsPrCy9EBHf8J/uJ+Ve0=
1690+
github.com/thanos-io/objstore v0.0.0-20241010161353-f90c89a0ef90/go.mod h1:/ZMUxFcp/nT6oYV5WslH9k07NU/+86+aibgZRmMMr/4=
16911691
github.com/thanos-io/promql-engine v0.0.0-20240921092401-37747eddbd31 h1:xPaP58g+3EPohdw4cv+6jv5+LcX6LynhHvQcYwTAMxQ=
16921692
github.com/thanos-io/promql-engine v0.0.0-20240921092401-37747eddbd31/go.mod h1:wx0JlRZtsB2S10JYUgeg5GqLfMxw31SzArP+28yyE00=
16931693
github.com/thanos-io/thanos v0.35.2-0.20241029125830-62038110b1bc h1:AoIDFFb3xjED+mmf5g6bnULDgNJWeXtKyjAQ1CKtqfk=

‎integration/alertmanager_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func TestAlertmanagerClustering(t *testing.T) {
156156
Bucket: alertsBucketName,
157157
AccessKey: e2edb.MinioAccessKey,
158158
SecretKey: e2edb.MinioSecretKey,
159-
}, "alertmanager-test")
159+
}, "alertmanager-test", nil)
160160
require.NoError(t, err)
161161

162162
// Create and upload an Alertmanager configuration.
@@ -219,7 +219,7 @@ func TestAlertmanagerSharding(t *testing.T) {
219219
Bucket: alertsBucketName,
220220
AccessKey: e2edb.MinioAccessKey,
221221
SecretKey: e2edb.MinioSecretKey,
222-
}, "alertmanager-test")
222+
}, "alertmanager-test", nil)
223223
require.NoError(t, err)
224224

225225
// Create and upload Alertmanager configurations.
@@ -537,7 +537,7 @@ func TestAlertmanagerShardingScaling(t *testing.T) {
537537
Bucket: alertsBucketName,
538538
AccessKey: e2edb.MinioAccessKey,
539539
SecretKey: e2edb.MinioSecretKey,
540-
}, "alertmanager-test")
540+
}, "alertmanager-test", nil)
541541
require.NoError(t, err)
542542

543543
// Create and upload Alertmanager configurations.

‎integration/e2e/scenario_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func testMinioWorking(t *testing.T, m *e2e.HTTPService) {
5757
})
5858
require.NoError(t, err)
5959

60-
bkt, err := s3.NewBucket(log.NewNopLogger(), b, "test")
60+
bkt, err := s3.NewBucket(log.NewNopLogger(), b, "test", nil)
6161
require.NoError(t, err)
6262

6363
require.NoError(t, bkt.Upload(ctx, "recipe", bytes.NewReader([]byte("Just go to Pastry Shop and buy."))))
@@ -116,7 +116,7 @@ func TestScenario(t *testing.T) {
116116
SecretKey: e2edb.MinioSecretKey,
117117
})
118118
require.NoError(t, err)
119-
bkt, err := s3.NewBucket(log.NewNopLogger(), b, "test")
119+
bkt, err := s3.NewBucket(log.NewNopLogger(), b, "test", nil)
120120
require.NoError(t, err)
121121

122122
_, err = bkt.Get(context.Background(), "recipe")
@@ -140,7 +140,7 @@ func TestScenario(t *testing.T) {
140140
SecretKey: e2edb.MinioSecretKey,
141141
})
142142
require.NoError(t, err)
143-
bkt, err = s3.NewBucket(log.NewNopLogger(), b, "test")
143+
bkt, err = s3.NewBucket(log.NewNopLogger(), b, "test", nil)
144144
require.NoError(t, err)
145145

146146
_, err = bkt.Get(context.Background(), "recipe")

‎integration/query_frontend_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ func TestQueryFrontendQueryRejection(t *testing.T) {
641641
Bucket: bucketName,
642642
AccessKey: e2edb.MinioAccessKey,
643643
SecretKey: e2edb.MinioSecretKey,
644-
}, "runtime-config-test")
644+
}, "runtime-config-test", nil)
645645

646646
require.NoError(t, err)
647647

‎integration/ruler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ func TestRulerDisablesRuleGroups(t *testing.T) {
933933
Bucket: bucketName,
934934
AccessKey: e2edb.MinioAccessKey,
935935
SecretKey: e2edb.MinioSecretKey,
936-
}, "runtime-config-test")
936+
}, "runtime-config-test", nil)
937937

938938
require.NoError(t, err)
939939

‎integration/runtime_config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func TestLoadRuntimeConfigFromCloudStorage(t *testing.T) {
132132
Bucket: bucketName,
133133
AccessKey: e2edb.MinioAccessKey,
134134
SecretKey: e2edb.MinioSecretKey,
135-
}, "runtime-config-test")
135+
}, "runtime-config-test", nil)
136136
require.NoError(t, err)
137137

138138
content, err := os.ReadFile(filepath.Join(getCortexProjectDir(), "docs/configuration/runtime-config.yaml"))

‎pkg/storage/bucket/azure/bucket_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucke
3737
return nil, err
3838
}
3939

40-
return azure.NewBucket(logger, serialized, name)
40+
return azure.NewBucket(logger, serialized, name, nil)
4141
}

‎pkg/storage/bucket/gcs/bucket_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ func NewBucketClient(ctx context.Context, cfg Config, name string, logger log.Lo
2323
return nil, err
2424
}
2525

26-
return gcs.NewBucket(ctx, logger, serialized, name)
26+
return gcs.NewBucket(ctx, logger, serialized, name, nil)
2727
}

‎pkg/storage/bucket/s3/bucket_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucke
2727
return nil, err
2828
}
2929

30-
bucket, err := s3.NewBucketWithConfig(logger, s3Cfg, name)
30+
bucket, err := s3.NewBucketWithConfig(logger, s3Cfg, name, nil)
3131
if err != nil {
3232
return nil, err
3333
}
@@ -47,7 +47,7 @@ func NewBucketReaderClient(cfg Config, name string, logger log.Logger) (objstore
4747
return nil, err
4848
}
4949

50-
bucket, err := s3.NewBucketWithConfig(logger, s3Cfg, name)
50+
bucket, err := s3.NewBucketWithConfig(logger, s3Cfg, name, nil)
5151
if err != nil {
5252
return nil, err
5353
}

0 commit comments

Comments
 (0)