Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update github.com/sapcc/swift-http-import digest to 201fb16 #35

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Update github.com/sapcc/swift-http-import digest to 201fb16 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eadb77
Update github.com/sapcc/swift-http-import digest to 201fb16
renovate[bot] Dec 12, 2024
563849a
Fix int64 to uint64
kayrus Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/machinebox/progress v0.2.0
github.com/majewsky/schwift/v2 v2.0.0
github.com/sapcc/go-bits v0.0.0-20241212034813-27ef1bf5d5d2
github.com/sapcc/swift-http-import v0.0.0-20240712085221-f33ec7ac8e34
github.com/sapcc/swift-http-import v0.0.0-20241211164212-201fb1677052
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/xhit/go-str2duration/v2 v2.1.0
Expand All @@ -22,6 +22,7 @@ require (
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gofrs/uuid/v5 v5.3.0 // indirect
github.com/google/go-github/v63 v63.0.0 // indirect
github.com/google/go-github/v67 v67.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -45,12 +46,12 @@ require (
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
pault.ag/go/debian v0.16.0 // indirect
pault.ag/go/debian v0.17.0 // indirect
pault.ag/go/topsort v0.1.1 // indirect
)
8 changes: 8 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-github/v63 v63.0.0 h1:13xwK/wk9alSokujB9lJkuzdmQuVn2QCPeck76wR3nE=
github.com/google/go-github/v63 v63.0.0/go.mod h1:IqbcrgUmIcEaioWrGYei/09o+ge5vhffGOcxrO0AfmA=
github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg=
github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
Expand Down Expand Up @@ -71,6 +73,8 @@ github.com/sapcc/go-bits v0.0.0-20241212034813-27ef1bf5d5d2 h1:gbY7yTvJmZy5jSLTb
github.com/sapcc/go-bits v0.0.0-20241212034813-27ef1bf5d5d2/go.mod h1:oR93CpnT+D4dwHB3j97lD9v+E68fpGKk7xxR1yFJE1g=
github.com/sapcc/swift-http-import v0.0.0-20240712085221-f33ec7ac8e34 h1:DR4hRouMC7PvRwHjxe5HfQVFAhBSlJj6l3V8d95PbcE=
github.com/sapcc/swift-http-import v0.0.0-20240712085221-f33ec7ac8e34/go.mod h1:7purlezg80hcLAM18jTNLc1RGBXno6MZ3DOmj9wJSww=
github.com/sapcc/swift-http-import v0.0.0-20241211164212-201fb1677052 h1:qvKDqkUrB6IbVvcbZNPQSBiebVSLkxmsNaxcNVd6GLg=
github.com/sapcc/swift-http-import v0.0.0-20241211164212-201fb1677052/go.mod h1:H87kgFElhPPv+4thzQ6+bwFf3IO7WERscZmjruQ2qJ8=
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
Expand Down Expand Up @@ -114,6 +118,8 @@ golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
Expand All @@ -133,5 +139,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
pault.ag/go/debian v0.16.0 h1:fivXn/IO9rn2nzTGndflDhOkNU703Axs/StWihOeU2g=
pault.ag/go/debian v0.16.0/go.mod h1:JFl0XWRCv9hWBrB5MDDZjA5GSEs1X3zcFK/9kCNIUmE=
pault.ag/go/debian v0.17.0 h1:H+frUQv9X5yoJpYE0MLdqoAdyoHQizFL6vq+4qMMKrc=
pault.ag/go/debian v0.17.0/go.mod h1:JFl0XWRCv9hWBrB5MDDZjA5GSEs1X3zcFK/9kCNIUmE=
pault.ag/go/topsort v0.1.1 h1:L0QnhUly6LmTv0e3DEzbN2q6/FGgAcQvaEw65S53Bg4=
pault.ag/go/topsort v0.1.1/go.mod h1:r1kc/L0/FZ3HhjezBIPaNVhkqv8L0UJ9bxRuHRVZ0q4=
2 changes: 1 addition & 1 deletion pkg/backup_clone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func cloneBackup(ctx context.Context, srcVolumeClient, srcObjectClient, dstVolum
return nil, fmt.Errorf("error while transferring objects")
}

expectedObjectsCount := int64(*backupRecord.ObjectCount) + 2 // + metadata and sha256file
expectedObjectsCount := uint64(*backupRecord.ObjectCount) + 2 // + metadata and sha256file
// TODO: stats.FilesFound vs stats.FilesTransferred
if stats.FilesFound != expectedObjectsCount {
return nil, fmt.Errorf("error while transferring objects: an amount of transferred files doesn't correspond to an amount of file in the record: %d != %d", stats.FilesFound, expectedObjectsCount)
Expand Down
Loading