fix(deps): update module github.com/ncw/swift to v2 (#13951)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Rogers <paul.rogers@grafana.com>

go.mod

@@ -72,7 +72,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/modern-go/reflect2 v1.0.2
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
-	github.com/ncw/swift v1.0.53
 	github.com/oklog/run v1.1.0
 	github.com/oklog/ulid v1.3.1
 	github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e
@@ -132,6 +131,7 @@ require (
 	github.com/heroku/x v0.0.61
 	github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
+	github.com/ncw/swift/v2 v2.0.2
 	github.com/prometheus/alertmanager v0.27.0
 	github.com/prometheus/common/sigv4 v0.1.0
 	github.com/richardartoul/molecule v1.0.0
@@ -169,6 +169,7 @@ require (
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
+	github.com/ncw/swift v1.0.53 // indirect
 	github.com/pires/go-proxyproto v0.7.0 // indirect
 	github.com/pkg/xattr v0.4.10 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect

go.sum

@@ -1497,6 +1497,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks=
 github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
+github.com/ncw/swift/v2 v2.0.2 h1:jx282pcAKFhmoZBSdMcCRFn9VWkoBIRsCpe+yZq7vEk=
+github.com/ncw/swift/v2 v2.0.2/go.mod h1:z0A9RVdYPjNjXVo2pDOPxZ4eu3oarO1P91fTItcb+Kg=
 github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=

pkg/storage/chunk/client/openstack/swift_object_client.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ncw/swift"
+	swift "github.com/ncw/swift/v2"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
@@ -61,7 +61,7 @@ func NewSwiftObjectClient(cfg SwiftConfig, hedgingCfg hedging.Config) (*SwiftObj
 		return nil, err
 	}
 	// Ensure the container is created, no error is returned if it already exists.
-	if err := c.ContainerCreate(cfg.ContainerName, nil); err != nil {
+	if err := c.ContainerCreate(context.Background(), cfg.Config.ContainerName, nil); err != nil {
 		return nil, err
 	}
 	hedging, err := createConnection(cfg, hedgingCfg, true)
@@ -78,30 +78,30 @@ func NewSwiftObjectClient(cfg SwiftConfig, hedgingCfg hedging.Config) (*SwiftObj
 func createConnection(cfg SwiftConfig, hedgingCfg hedging.Config, hedging bool) (*swift.Connection, error) {
 	// Create a connection
 	c := &swift.Connection{
-		AuthVersion:    cfg.AuthVersion,
-		AuthUrl:        cfg.AuthURL,
-		Internal:       cfg.Internal,
-		ApiKey:         cfg.Password,
-		UserName:       cfg.Username,
-		UserId:         cfg.UserID,
-		Retries:        cfg.MaxRetries,
-		ConnectTimeout: cfg.ConnectTimeout,
-		Timeout:        cfg.RequestTimeout,
-		TenantId:       cfg.ProjectID,
-		Tenant:         cfg.ProjectName,
-		TenantDomain:   cfg.ProjectDomainName,
-		TenantDomainId: cfg.ProjectDomainID,
-		Domain:         cfg.DomainName,
-		DomainId:       cfg.DomainID,
-		Region:         cfg.RegionName,
+		AuthVersion:    cfg.Config.AuthVersion,
+		AuthUrl:        cfg.Config.AuthURL,
+		Internal:       cfg.Config.Internal,
+		ApiKey:         cfg.Config.Password,
+		UserName:       cfg.Config.Username,
+		UserId:         cfg.Config.UserID,
+		Retries:        cfg.Config.MaxRetries,
+		ConnectTimeout: cfg.Config.ConnectTimeout,
+		Timeout:        cfg.Config.RequestTimeout,
+		TenantId:       cfg.Config.ProjectID,
+		Tenant:         cfg.Config.ProjectName,
+		TenantDomain:   cfg.Config.ProjectDomainName,
+		TenantDomainId: cfg.Config.ProjectDomainID,
+		Domain:         cfg.Config.DomainName,
+		DomainId:       cfg.Config.DomainID,
+		Region:         cfg.Config.RegionName,
 		Transport:      defaultTransport,
 	}
 
 	switch {
-	case cfg.UserDomainName != "":
-		c.Domain = cfg.UserDomainName
-	case cfg.UserDomainID != "":
-		c.DomainId = cfg.UserDomainID
+	case cfg.Config.UserDomainName != "":
+		c.Domain = cfg.Config.UserDomainName
+	case cfg.Config.UserDomainID != "":
+		c.DomainId = cfg.Config.UserDomainID
 	}
 	if hedging {
 		var err error
@@ -111,7 +111,7 @@ func createConnection(cfg SwiftConfig, hedgingCfg hedging.Config, hedging bool)
 		}
 	}
 
-	err := c.Authenticate()
+	err := c.Authenticate(context.TODO())
 	if err != nil {
 		return nil, err
 	}
@@ -124,8 +124,8 @@ func (s *SwiftObjectClient) Stop() {
 	s.hedgingConn.UnAuthenticate()
 }
 
-func (s *SwiftObjectClient) ObjectExists(_ context.Context, objectKey string) (bool, error) {
-	_, _, err := s.hedgingConn.Object(s.cfg.ContainerName, objectKey)
+func (s *SwiftObjectClient) ObjectExists(ctx context.Context, objectKey string) (bool, error) {
+	_, _, err := s.hedgingConn.Object(ctx, s.cfg.Config.ContainerName, objectKey)
 	if err != nil {
 		return false, err
 	}
@@ -134,9 +134,9 @@ func (s *SwiftObjectClient) ObjectExists(_ context.Context, objectKey string) (b
 }
 
 // GetObject returns a reader and the size for the specified object key from the configured swift container.
-func (s *SwiftObjectClient) GetObject(_ context.Context, objectKey string) (io.ReadCloser, int64, error) {
+func (s *SwiftObjectClient) GetObject(ctx context.Context, objectKey string) (io.ReadCloser, int64, error) {
 	var buf bytes.Buffer
-	_, err := s.hedgingConn.ObjectGet(s.cfg.ContainerName, objectKey, &buf, false, nil)
+	_, err := s.hedgingConn.ObjectGet(ctx, s.cfg.Config.ContainerName, objectKey, &buf, false, nil)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -145,12 +145,12 @@ func (s *SwiftObjectClient) GetObject(_ context.Context, objectKey string) (io.R
 }
 
 // GetObject returns a reader and the size for the specified object key from the configured swift container.
-func (s *SwiftObjectClient) GetObjectRange(_ context.Context, objectKey string, offset, length int64) (io.ReadCloser, error) {
+func (s *SwiftObjectClient) GetObjectRange(ctx context.Context, objectKey string, offset, length int64) (io.ReadCloser, error) {
 	var buf bytes.Buffer
 	h := swift.Headers{
 		"Range": fmt.Sprintf("bytes=%d-%d", offset, offset+length-1),
 	}
-	_, err := s.hedgingConn.ObjectGet(s.cfg.ContainerName, objectKey, &buf, false, h)
+	_, err := s.hedgingConn.ObjectGet(ctx, s.cfg.Config.ContainerName, objectKey, &buf, false, h)
 	if err != nil {
 		return nil, err
 	}
@@ -159,13 +159,13 @@ func (s *SwiftObjectClient) GetObjectRange(_ context.Context, objectKey string,
 }
 
 // PutObject puts the specified bytes into the configured Swift container at the provided key
-func (s *SwiftObjectClient) PutObject(_ context.Context, objectKey string, object io.Reader) error {
-	_, err := s.conn.ObjectPut(s.cfg.ContainerName, objectKey, object, false, "", "", nil)
+func (s *SwiftObjectClient) PutObject(ctx context.Context, objectKey string, object io.Reader) error {
+	_, err := s.conn.ObjectPut(ctx, s.cfg.Config.ContainerName, objectKey, object, false, "", "", nil)
 	return err
 }
 
 // List only objects from the store non-recursively
-func (s *SwiftObjectClient) List(_ context.Context, prefix, delimiter string) ([]client.StorageObject, []client.StorageCommonPrefix, error) {
+func (s *SwiftObjectClient) List(ctx context.Context, prefix, delimiter string) ([]client.StorageObject, []client.StorageCommonPrefix, error) {
 	if len(delimiter) > 1 {
 		return nil, nil, fmt.Errorf("delimiter must be a single character but was %s", delimiter)
 	}
@@ -177,7 +177,7 @@ func (s *SwiftObjectClient) List(_ context.Context, prefix, delimiter string) ([
 		opts.Delimiter = []rune(delimiter)[0]
 	}
 
-	objs, err := s.conn.ObjectsAll(s.cfg.ContainerName, opts)
+	objs, err := s.conn.ObjectsAll(ctx, s.cfg.Config.ContainerName, opts)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -203,8 +203,8 @@ func (s *SwiftObjectClient) List(_ context.Context, prefix, delimiter string) ([
 }
 
 // DeleteObject deletes the specified object key from the configured Swift container.
-func (s *SwiftObjectClient) DeleteObject(_ context.Context, objectKey string) error {
-	return s.conn.ObjectDelete(s.cfg.ContainerName, objectKey)
+func (s *SwiftObjectClient) DeleteObject(ctx context.Context, objectKey string) error {
+	return s.conn.ObjectDelete(ctx, s.cfg.Config.ContainerName, objectKey)
 }
 
 // IsObjectNotFoundErr returns true if error means that object is not found. Relevant to GetObject and DeleteObject operations.