diff --git a/go.mod b/go.mod index 3b9a6bd9c..135efaf9d 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/redis/go-redis/v9 v9.7.0 github.com/rs/cors v1.11.1 github.com/sapcc/go-api-declarations v1.12.9 - github.com/sapcc/go-bits v0.0.0-20241111142343-42fa891b5aae + github.com/sapcc/go-bits v0.0.0-20241112121120-a312b675efd7 github.com/spf13/cobra v1.8.1 github.com/timewasted/go-accept-headers v0.0.0-20130320203746-c78f304b1b09 go.uber.org/automaxprocs v1.6.0 diff --git a/go.sum b/go.sum index cc3e4959a..d0d08162f 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= github.com/sapcc/go-api-declarations v1.12.9 h1:4CWkt333oQxGnbka1TH4qApC0bxZe+WIBduygEcxiNw= github.com/sapcc/go-api-declarations v1.12.9/go.mod h1:83R3hTANhuRXt/pXDby37IJetw8l7DG41s33Tp9NXxI= -github.com/sapcc/go-bits v0.0.0-20241111142343-42fa891b5aae h1:35NZnnix3DricZDP0lCO9kziioZWJd3TPlIvFWYoUuc= -github.com/sapcc/go-bits v0.0.0-20241111142343-42fa891b5aae/go.mod h1:P4F8aMHla5I0gRW+eOEYrhM89h3heEg0nypTZZcKoBQ= +github.com/sapcc/go-bits v0.0.0-20241112121120-a312b675efd7 h1:jp2NiKpUY5Jzlfw1oFqg/EkMtq72OgQGV3KCIVDGlH0= +github.com/sapcc/go-bits v0.0.0-20241112121120-a312b675efd7/go.mod h1:P4F8aMHla5I0gRW+eOEYrhM89h3heEg0nypTZZcKoBQ= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= diff --git a/vendor/github.com/sapcc/go-bits/easypg/snapshot.go b/vendor/github.com/sapcc/go-bits/easypg/snapshot.go index d8dcd41ae..ef29ecaa1 100644 --- a/vendor/github.com/sapcc/go-bits/easypg/snapshot.go +++ b/vendor/github.com/sapcc/go-bits/easypg/snapshot.go @@ -203,7 +203,7 @@ func newTableSnapshot(t *testing.T, db *sql.DB, tableName string, keyColumnNames failOnErr(t, rows.Scan(scanTarget...)) row := make(rowSnapshot, len(columnNames)) for idx, columnName := range columnNames { - row[columnName] = scanTarget[idx].(*sqlValueSerializer).Serialized //nolint:errcheck // this type assertion cannot fail because of how the slice is constructed + row[columnName] = scanTarget[idx].(*sqlValueSerializer).Serialized } result.Rows[row.Key(result.KeyColumnNames)] = row } diff --git a/vendor/github.com/sapcc/go-bits/gophercloudext/auth.go b/vendor/github.com/sapcc/go-bits/gophercloudext/auth.go index a68f128d6..8d2c449af 100644 --- a/vendor/github.com/sapcc/go-bits/gophercloudext/auth.go +++ b/vendor/github.com/sapcc/go-bits/gophercloudext/auth.go @@ -129,6 +129,8 @@ func NewProviderClient(ctx context.Context, optsPtr *ClientOpts) (*gophercloud.P IdentityEndpoint: authURL, Username: os.Getenv(opts.EnvPrefix + "USERNAME"), UserID: os.Getenv(opts.EnvPrefix + "USER_ID"), + DomainName: os.Getenv(opts.EnvPrefix + "USER_DOMAIN_NAME"), + DomainID: os.Getenv(opts.EnvPrefix + "USER_DOMAIN_ID"), Password: os.Getenv(opts.EnvPrefix + "PASSWORD"), AllowReauth: true, Scope: &scope, diff --git a/vendor/modules.txt b/vendor/modules.txt index ffe1d06fd..5986f8321 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -181,7 +181,7 @@ github.com/samber/lo/internal/rand github.com/sapcc/go-api-declarations/bininfo github.com/sapcc/go-api-declarations/cadf github.com/sapcc/go-api-declarations/liquid -# github.com/sapcc/go-bits v0.0.0-20241111142343-42fa891b5aae +# github.com/sapcc/go-bits v0.0.0-20241112121120-a312b675efd7 ## explicit; go 1.23 github.com/sapcc/go-bits/assert github.com/sapcc/go-bits/audittools