diff --git a/vendor/github.com/grafana/dskit/aws/config.go b/pkg/storage/chunk/client/aws/config.go similarity index 100% rename from vendor/github.com/grafana/dskit/aws/config.go rename to pkg/storage/chunk/client/aws/config.go diff --git a/pkg/storage/chunk/client/aws/dynamodb_storage_client.go b/pkg/storage/chunk/client/aws/dynamodb_storage_client.go index 10516e4f87..091d47fb86 100644 --- a/pkg/storage/chunk/client/aws/dynamodb_storage_client.go +++ b/pkg/storage/chunk/client/aws/dynamodb_storage_client.go @@ -18,7 +18,6 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface" "github.com/go-kit/log/level" - awscommon "github.com/grafana/dskit/aws" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" "github.com/grafana/dskit/instrument" @@ -802,7 +801,7 @@ func awsSessionFromURL(awsURL *url.URL) (client.ConfigProvider, error) { if len(path) > 0 { level.Warn(log.Logger).Log("msg", "ignoring DynamoDB URL path", "path", path) } - config, err := awscommon.ConfigFromURL(awsURL) + config, err := ConfigFromURL(awsURL) if err != nil { return nil, err } diff --git a/pkg/storage/chunk/client/aws/s3_storage_client.go b/pkg/storage/chunk/client/aws/s3_storage_client.go index 0487157d93..d685f55885 100644 --- a/pkg/storage/chunk/client/aws/s3_storage_client.go +++ b/pkg/storage/chunk/client/aws/s3_storage_client.go @@ -20,14 +20,11 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" - awscommon "github.com/grafana/dskit/aws" - "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" "github.com/grafana/dskit/instrument" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - amnet "k8s.io/apimachinery/pkg/util/net" bucket_s3 "github.com/grafana/loki/v3/pkg/storage/bucket/s3" @@ -194,7 +191,7 @@ func buildS3Client(cfg S3Config, hedgingCfg hedging.Config, hedging bool) (*s3.S // if an s3 url is passed use it to initialize the s3Config and then override with any additional params if cfg.S3.URL != nil { - s3Config, err = awscommon.ConfigFromURL(cfg.S3.URL) + s3Config, err = ConfigFromURL(cfg.S3.URL) if err != nil { return nil, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index f3120de208..44d49cdb1c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1054,7 +1054,6 @@ github.com/grafana/ckit/shard github.com/grafana/cloudflare-go # github.com/grafana/dskit v0.0.0-20241007172036-53283a0f6b41 ## explicit; go 1.21 -github.com/grafana/dskit/aws github.com/grafana/dskit/backoff github.com/grafana/dskit/cancellation github.com/grafana/dskit/concurrency