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.

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

gcs/v2: bump cloud.google.com/go/storage to 1.34.0 #488

Merged
merged 3 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 23 additions & 18 deletions .github/workflows/go-getter.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: go-getter

on:
on:
push:
branches:
- v2
Expand All @@ -18,10 +18,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# Note: while strictly speaking quoting the versions is not necessary
# however for versions like 1.10, 1.20, 1.30, etc. without quotes, YAML
# renders these versions as floats, so the least-significant 0 gets
# dropped from the version number, so those become like 1.1, 1.2, 1.3, etc.
# To avoid the issue, we quote them systematically.
go-version:
- 1.17
- 1.18
- 1.19
- "1.19"
- "1.20"
lbajolet-hashicorp marked this conversation as resolved.
Show resolved Hide resolved
- "1.21"
directory:
- s3
- gcs
Expand All @@ -34,14 +39,14 @@ jobs:
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}

- name: Checkout code
uses: actions/checkout@v3

- name: Create test directory
run: |
mkdir -p ${{ env.TEST_RESULTS_PATH }}/go-getter

- name: Setup cache for go modules
uses: actions/cache@v3
with:
Expand All @@ -51,10 +56,10 @@ jobs:
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-

- name: Download go modules
run: go mod download

# Check go fmt output because it does not report non-zero when there are fmt changes
- name: Run gofmt
run: |
Expand All @@ -65,7 +70,7 @@ jobs:
echo "$files"
exit 1
fi

- name: Install gotestsum
run: go install gotest.tools/gotestsum@v1.8.2

Expand Down Expand Up @@ -110,9 +115,9 @@ jobs:
strategy:
matrix:
go-version:
- 1.17
- 1.18
- 1.19
- "1.19"
- "1.20"
- "1.21"
directory:
- s3
- gcs
Expand Down Expand Up @@ -168,7 +173,7 @@ jobs:
cd cmd/go-getter
go run . go.mod tmpdir
diff tmpdir/go.mod go.mod

- name: Run Go tests
shell: bash
working-directory: ${{ matrix.directory }}
Expand All @@ -177,7 +182,7 @@ jobs:
echo "Running $(echo $PACKAGE_NAMES | wc -w) packages"
echo $PACKAGE_NAMES
gotestsum --format=short-verbose --junitfile $TEST_RESULTS_PATH/go-getter/gotestsum-report.xml -- -p 2 $PACKAGE_NAMES

# Save coverage report parts
- name: Upload and save artifacts
uses: actions/upload-artifact@v3
Expand All @@ -190,9 +195,9 @@ jobs:
strategy:
matrix:
go-version:
- 1.17
- 1.18
- 1.19
- "1.19"
- "1.20"
- "1.21"
permissions:
id-token: write
contents: read
Expand All @@ -215,6 +220,6 @@ jobs:
run: |
docker-compose build
docker-compose up -d

- name: Run SMB getter tests
run: docker exec -i gogetter bash -c "env ACC_SMB_TEST=1 go test -v ./... -run=TestSmb_"
45 changes: 25 additions & 20 deletions cmd/go-getter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/go-getter/cmd/go-getter/v2

go 1.18
go 1.19

replace (
github.com/hashicorp/go-getter/gcs/v2 => ../../gcs
Expand All @@ -17,19 +17,19 @@ require (
)

require (
cloud.google.com/go v0.105.0 // indirect
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.1.1 // indirect
cloud.google.com/go/iam v0.6.0 // indirect
cloud.google.com/go/storage v1.27.0 // indirect
cloud.google.com/go v0.110.8 // indirect
cloud.google.com/go/compute v1.23.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.3 // indirect
cloud.google.com/go/storage v1.35.1 // indirect
github.com/aws/aws-sdk-go v1.44.114 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand All @@ -40,15 +40,20 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.101.0 // indirect
google.golang.org/api v0.150.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Loading
Loading