From 3b32695a6dd38c5ad17d7af81f0b6bb30109ef13 Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Mon, 20 Apr 2026 13:19:46 +0200 Subject: [PATCH 1/2] bump schwift to v2.1.0 The module path change requires manual intervention. --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- pkg/backup_clone.go | 3 ++- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 8b1c8e8..8eba4e0 100644 --- a/go.mod +++ b/go.mod @@ -4,17 +4,17 @@ go 1.26 require ( github.com/google/uuid v1.6.0 - github.com/gophercloud/gophercloud/v2 v2.11.1 - github.com/gophercloud/utils/v2 v2.0.0-20260107124036-1d7954eb9711 + github.com/gophercloud/gophercloud/v2 v2.12.0 + github.com/gophercloud/utils/v2 v2.0.0-20260409164906-cd2167a8681a github.com/klauspost/compress v1.18.5 github.com/machinebox/progress v0.2.0 github.com/majewsky/gg v1.6.0 - github.com/majewsky/schwift/v2 v2.0.0 - github.com/sapcc/go-bits v0.0.0-20260410082200-20a228a480cb - github.com/sapcc/swift-http-import v0.0.0-20260409190454-312477b85b4a + github.com/sapcc/go-bits v0.0.0-20260416170349-9b32d8192041 + github.com/sapcc/swift-http-import v0.0.0-20260420111637-e9ed28d6fea0 github.com/spf13/cobra v1.10.2 github.com/spf13/viper v1.21.0 github.com/xhit/go-str2duration/v2 v2.1.0 + go.xyrillian.de/schwift/v2 v2.1.0 golang.org/x/term v0.42.0 ) @@ -37,10 +37,10 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/ulikunitz/xz v0.5.15 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.49.0 // indirect - golang.org/x/net v0.52.0 // indirect + golang.org/x/crypto v0.50.0 // indirect + golang.org/x/net v0.53.0 // indirect golang.org/x/sys v0.43.0 // indirect - golang.org/x/text v0.35.0 // indirect + golang.org/x/text v0.36.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect pault.ag/go/debian v0.19.0 // indirect diff --git a/go.sum b/go.sum index 87d3180..bb1ca50 100644 --- a/go.sum +++ b/go.sum @@ -15,10 +15,10 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gophercloud/gophercloud/v2 v2.11.1 h1:jCs4vLH8sJgRqrPzqVfWgl7uI6JnIIlsgeIRM0uHjxY= -github.com/gophercloud/gophercloud/v2 v2.11.1/go.mod h1:Rm0YvKQ4QYX2rY9XaDKnjRzSGwlG5ge4h6ABYnmkKQM= -github.com/gophercloud/utils/v2 v2.0.0-20260107124036-1d7954eb9711 h1:LgYkb/jttJKwFwZHZjaT8zA/Ef4HMtrosABO/pnSaJI= -github.com/gophercloud/utils/v2 v2.0.0-20260107124036-1d7954eb9711/go.mod h1:X6Plvu4Iot+ebr3g7tmw439sin+eGzDbO3tdjUOOP2I= +github.com/gophercloud/gophercloud/v2 v2.12.0 h1:Gxmc/Bog1UDKkxTcQW7MSPTDviJXpLeEgVeN5KrxoCo= +github.com/gophercloud/gophercloud/v2 v2.12.0/go.mod h1:H7TTOxbLy8RIaHSNhI2GCrWIzw4Xpw8Xn2mBhCUT5kA= +github.com/gophercloud/utils/v2 v2.0.0-20260409164906-cd2167a8681a h1:Md/Kmqzazrvf81kUN9GkseKFnHFj8PMH/UTJOQBvF8o= +github.com/gophercloud/utils/v2 v2.0.0-20260409164906-cd2167a8681a/go.mod h1:tcAw3y34swLI7UgDNH8jRZZGpImly6Me/DFZDQa1iyw= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -35,8 +35,6 @@ github.com/machinebox/progress v0.2.0 h1:7z8+w32Gy1v8S6VvDoOPPBah3nLqdKjr3GUly18 github.com/machinebox/progress v0.2.0/go.mod h1:hl4FywxSjfmkmCrersGhmJH7KwuKl+Ueq9BXkOny+iE= github.com/majewsky/gg v1.6.0 h1:QyUP+a1YHlCRmcvAlyVhOnqdpeDQogmAygQaeGU0VPc= github.com/majewsky/gg v1.6.0/go.mod h1:KC7qUlln1VBY90OE0jXMNjXW2b9B4jJ1heYQ08OzeAg= -github.com/majewsky/schwift/v2 v2.0.0 h1:Rgzv/18yMAej3bBZWoxYmS2lZMiCKD6P451dU8TyQtE= -github.com/majewsky/schwift/v2 v2.0.0/go.mod h1:qqN4N7s2+jhwebBgxFZm/e2NOqDzNphwb7SnAIB5G+4= github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ= github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= @@ -50,10 +48,10 @@ github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDc github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= github.com/sapcc/go-api-declarations v1.21.0 h1:Ag6GXgJLTFdBDKmrJU4QFllQbgGSenSGeHpLuvuxeDk= github.com/sapcc/go-api-declarations v1.21.0/go.mod h1:eiRrXXUeQS5C/1kKn8/KMjk0Y0goUzgDQswj30rH0Zc= -github.com/sapcc/go-bits v0.0.0-20260410082200-20a228a480cb h1:wPJDpXIh8QVvuU3cutTkymYo6ulHG8weajF+0iAW9Jo= -github.com/sapcc/go-bits v0.0.0-20260410082200-20a228a480cb/go.mod h1:o1ld51gRnKbNYTUtx5czsuO8zczc9/iGkEjcwDQb9wA= -github.com/sapcc/swift-http-import v0.0.0-20260409190454-312477b85b4a h1:7IE6GD1KG3zipsxqDtzQSw9VE2vEYFlQ0Gfweq2RM6E= -github.com/sapcc/swift-http-import v0.0.0-20260409190454-312477b85b4a/go.mod h1:avM4CheYa4ISCYEN8AJx6vIdAUDHGTw25KFKT5pNb6Q= +github.com/sapcc/go-bits v0.0.0-20260416170349-9b32d8192041 h1:oNaNyLQ32/rdaG2YljF1eMXeA2KxXVnWiPUSDg1fcgo= +github.com/sapcc/go-bits v0.0.0-20260416170349-9b32d8192041/go.mod h1:o1ld51gRnKbNYTUtx5czsuO8zczc9/iGkEjcwDQb9wA= +github.com/sapcc/swift-http-import v0.0.0-20260420111637-e9ed28d6fea0 h1:6CAGLrWz7MDjoPkIX+cY6x9O21jMU66+GdckSZeGVFg= +github.com/sapcc/swift-http-import v0.0.0-20260420111637-e9ed28d6fea0/go.mod h1:D/yt0ZJCHgIFBRnccdYDG+MJ/OkiCbzuk/iH38T0KxU= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= @@ -77,18 +75,20 @@ github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= +go.xyrillian.de/schwift/v2 v2.1.0 h1:KEnEJTdUbCXnoESUK/waaEiegXQs+L7WZquHOgbrGZw= +go.xyrillian.de/schwift/v2 v2.1.0/go.mod h1:05JqPAQQzeRTPJtpUD7NciJpjpDhS57/MDEMrH5SJy0= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= +golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/backup_clone.go b/pkg/backup_clone.go index 9f42204..9251dbe 100644 --- a/pkg/backup_clone.go +++ b/pkg/backup_clone.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "log" "os" "os/signal" "path/filepath" @@ -16,7 +17,6 @@ import ( "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/backups" backups_utils "github.com/gophercloud/utils/v2/openstack/blockstorage/v3/backups" "github.com/majewsky/gg/option" - "github.com/majewsky/schwift/v2/gopherschwift" "github.com/sapcc/go-bits/logg" "github.com/sapcc/go-bits/regexpext" "github.com/sapcc/go-bits/secrets" @@ -24,6 +24,7 @@ import ( "github.com/sapcc/swift-http-import/pkg/objects" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.xyrillian.de/schwift/v2/gopherschwift" ) func prepareSwiftConfig(ctx context.Context, srcObjectClient, dstObjectClient *gophercloud.ServiceClient, srcContainerName, dstContainerName, prefix string, threads uint) (*objects.Configuration, error) { From dac93ab79614563fd2e15d3ceed065a19036a11d Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Mon, 20 Apr 2026 13:21:17 +0200 Subject: [PATCH 2/2] fix lints --- pkg/backup_clone.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/backup_clone.go b/pkg/backup_clone.go index 9251dbe..3eaa6a2 100644 --- a/pkg/backup_clone.go +++ b/pkg/backup_clone.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "log" + std_log "log" // imported with different name to avoid conflict with variable `log` declared in pkg/logger.go "os" "os/signal" "path/filepath" @@ -310,7 +310,7 @@ var BackupCloneCmd = &cobra.Command{ return err } - log.Printf("Migrated target backup name is %q (id: %q)", dstBackup.Name, dstBackup.ID) + std_log.Printf("Migrated target backup name is %q (id: %q)", dstBackup.Name, dstBackup.ID) return nil },