Skip to content

Commit

Permalink
Update GoCloud to a version that supports s3ForcePathStyle
Browse files Browse the repository at this point in the history
The upgrade to GoCloud v0.39.0 switched to AWS SDK v2 and dropped
support for the `s3ForcePathStyle` query parameter in the GoCloud URL.
Even though GoCloud v0.40.0 brought `use_path_style`, the legacy
`s3ForcePathStyle` parameter no longer worked with that version. This
would cause `gitaly` to fail with an `unknown query parameter`.

google/go-cloud#3505 adds back
`s3ForcePathStyle` as an alias for `use_path_style` to preserve
backwards compatibility. This commit bumps the version to a pseudo-ref
that supports `s3ForcePathStyle`.

Diff:
https://github.com/google/go-cloud/compare/v0.40.0..56954848c3

Relates to https://gitlab.com/gitlab-org/gitaly/-/issues/6489

Changelog: fixed
  • Loading branch information
stanhu authored and Mustafa Bayar committed Nov 8, 2024
1 parent 0b75910 commit 617e231
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ require (
gitlab.com/gitlab-org/labkit v1.21.2
go.uber.org/automaxprocs v1.6.0
go.uber.org/goleak v1.3.0
gocloud.dev v0.40.0
gocloud.dev v0.40.1-0.20241107185025-56954848c3aa
golang.org/x/crypto v0.28.0
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/sync v0.8.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -681,8 +681,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
gocloud.dev v0.40.0 h1:f8LgP+4WDqOG/RXoUcyLpeIAGOcAbZrZbDQCUee10ng=
gocloud.dev v0.40.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ=
gocloud.dev v0.40.1-0.20241107185025-56954848c3aa h1:2p0wdFRGiA+WwKE0lmKwPF0rI2clAkmPeJQD5rsfEPQ=
gocloud.dev v0.40.1-0.20241107185025-56954848c3aa/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down

0 comments on commit 617e231

Please sign in to comment.