Skip to content

Commit

Permalink
Update github.com/thanos-io/objstore digest to f90c89a
Browse files Browse the repository at this point in the history
Signed-off-by: Arve Knudsen <[email protected]>
  • Loading branch information
renovate[bot] authored and aknuds1 committed Oct 14, 2024
1 parent 3ceec52 commit 19da86c
Show file tree
Hide file tree
Showing 13 changed files with 87 additions and 63 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
github.com/thanos-io/objstore v0.0.0-20240913165201-fd105025a2e5
github.com/thanos-io/objstore v0.0.0-20241010161353-f90c89a0ef90
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-20241010233600-b66ceb79e585
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1701,8 +1701,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-20240913165201-fd105025a2e5 h1:sb2s6y+T5+iaNElATi4bpzw2lGMcd5YjAUvxQp9ePtw=
github.com/thanos-io/objstore v0.0.0-20240913165201-fd105025a2e5/go.mod h1:A5Rlc/vdyENE5D0as6+6kp4kxWO72b4R0Q1ay/1d230=
github.com/thanos-io/objstore v0.0.0-20241010161353-f90c89a0ef90 h1:+gDIM0kLg4mpwU4RjvG09KiZsPrCy9EBHf8J/uJ+Ve0=
github.com/thanos-io/objstore v0.0.0-20241010161353-f90c89a0ef90/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=
Expand Down
6 changes: 4 additions & 2 deletions pkg/storage/bucket/azure/bucket_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
package azure

import (
"net/http"

"github.com/go-kit/log"
"github.com/thanos-io/objstore"
"github.com/thanos-io/objstore/providers/azure"
Expand All @@ -15,7 +17,7 @@ func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucke
return newBucketClient(cfg, name, logger, azure.NewBucketWithConfig)
}

func newBucketClient(cfg Config, name string, logger log.Logger, factory func(log.Logger, azure.Config, string) (*azure.Bucket, error)) (objstore.Bucket, error) {
func newBucketClient(cfg Config, name string, logger log.Logger, factory func(log.Logger, azure.Config, string, http.RoundTripper) (*azure.Bucket, error)) (objstore.Bucket, error) {
// Start with default config to make sure that all parameters are set to sensible values, especially
// HTTP Config field.
bucketConfig := azure.DefaultConfig
Expand All @@ -31,5 +33,5 @@ func newBucketClient(cfg Config, name string, logger log.Logger, factory func(lo
bucketConfig.Endpoint = cfg.Endpoint
}

return factory(logger, bucketConfig, name)
return factory(logger, bucketConfig, name, nil)
}
5 changes: 3 additions & 2 deletions pkg/storage/bucket/azure/bucket_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package azure

import (
"net/http"
"testing"

"github.com/go-kit/log"
Expand Down Expand Up @@ -54,7 +55,7 @@ func TestNewBucketClient(t *testing.T) {
}

// fakeFactory is a test utility to act as an azure.Bucket factory, but in reality verify the input config.
func fakeFactory(t *testing.T, cfg Config) func(log.Logger, azure.Config, string) (*azure.Bucket, error) {
func fakeFactory(t *testing.T, cfg Config) func(log.Logger, azure.Config, string, http.RoundTripper) (*azure.Bucket, error) {
expCfg := azure.DefaultConfig
expCfg.StorageAccountName = cfg.StorageAccountName
expCfg.StorageAccountKey = cfg.StorageAccountKey.String()
Expand All @@ -66,7 +67,7 @@ func fakeFactory(t *testing.T, cfg Config) func(log.Logger, azure.Config, string
expCfg.Endpoint = cfg.Endpoint
}

return func(_ log.Logger, azCfg azure.Config, _ string) (*azure.Bucket, error) {
return func(_ log.Logger, azCfg azure.Config, _ string, _ http.RoundTripper) (*azure.Bucket, error) {
t.Helper()

assert.Equal(t, expCfg, azCfg)
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/bucket/gcs/bucket_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ func NewBucketClient(ctx context.Context, cfg Config, name string, logger log.Lo
Bucket: cfg.BucketName,
ServiceAccount: cfg.ServiceAccount.String(),
}
return gcs.NewBucketWithConfig(ctx, logger, bucketConfig, name)
return gcs.NewBucketWithConfig(ctx, logger, bucketConfig, 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 @@ -25,7 +25,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 @@ -35,7 +35,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 @@ -50,5 +50,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)
}
12 changes: 8 additions & 4 deletions vendor/github.com/thanos-io/objstore/providers/azure/azure.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 16 additions & 13 deletions vendor/github.com/thanos-io/objstore/providers/gcs/gcs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 27 additions & 17 deletions vendor/github.com/thanos-io/objstore/providers/s3/s3.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 19da86c

Please sign in to comment.