Skip to content

Commit 674a66f

Browse files
Merge branch 'main' into judith/edu-web-codeowners
2 parents bd274d6 + 2092455 commit 674a66f

File tree

8 files changed

+96
-105
lines changed

8 files changed

+96
-105
lines changed

.github/workflows/ci-github-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
17+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
1818
with:
1919
go-version-file: 'go.mod'
2020
- run: go install github.com/rhysd/actionlint/cmd/actionlint@latest

.github/workflows/ci-go.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
20+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
2121
with:
2222
go-version-file: 'go.mod'
2323
- run: go mod download
24-
- uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
24+
- uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
2525
test:
2626
name: test (Go ${{ matrix.go-version }} / TF ${{ matrix.terraform }})
2727
runs-on: ubuntu-latest
@@ -31,7 +31,7 @@ jobs:
3131
terraform: ${{ fromJSON(vars.TF_VERSIONS_PROTOCOL_V5) }}
3232
steps:
3333
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
34+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
3535
with:
3636
go-version: ${{ matrix.go-version }}
3737
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
@@ -49,7 +49,7 @@ jobs:
4949
wildcard=".*"
5050
echo "version=${orginal_version%"$wildcard"}" >> "$GITHUB_OUTPUT"
5151
- run: go tool cover -html=coverage.out -o coverage.html
52-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
52+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5353
with:
5454
name: go-${{ matrix.go-version }}-terraform-${{ steps.tf_version.outputs.version }}-coverage
5555
path: coverage.html

.github/workflows/ci-goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
18+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
1919
with:
2020
go-version-file: 'go.mod'
2121
- uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
ref: ${{ inputs.versionNumber }}
8585
fetch-depth: 0
8686

87-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
87+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
8888
with:
8989
go-version-file: 'go.mod'
9090

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ require (
1010
github.com/hashicorp/go-hclog v1.6.3
1111
github.com/hashicorp/go-uuid v1.0.3
1212
github.com/hashicorp/go-version v1.7.0
13-
github.com/hashicorp/hc-install v0.9.0
13+
github.com/hashicorp/hc-install v0.9.1
1414
github.com/hashicorp/hcl/v2 v2.23.0
1515
github.com/hashicorp/logutils v1.0.0
16-
github.com/hashicorp/terraform-exec v0.21.0
17-
github.com/hashicorp/terraform-json v0.23.0
18-
github.com/hashicorp/terraform-plugin-go v0.25.0
16+
github.com/hashicorp/terraform-exec v0.22.0
17+
github.com/hashicorp/terraform-json v0.24.0
18+
github.com/hashicorp/terraform-plugin-go v0.26.0
1919
github.com/hashicorp/terraform-plugin-log v0.9.0
2020
github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
2121
github.com/mitchellh/go-testing-interface v1.14.1
22-
github.com/zclconf/go-cty v1.15.1
23-
golang.org/x/crypto v0.31.0
22+
github.com/zclconf/go-cty v1.16.2
23+
golang.org/x/crypto v0.32.0
2424
)
2525

2626
require (
27-
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
27+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
2828
github.com/agext/levenshtein v1.2.2 // indirect
2929
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3030
github.com/cloudflare/circl v1.3.7 // indirect
@@ -36,7 +36,7 @@ require (
3636
github.com/hashicorp/go-multierror v1.1.1 // indirect
3737
github.com/hashicorp/go-plugin v1.6.2 // indirect
3838
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
39-
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
39+
github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
4040
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
4141
github.com/hashicorp/yamux v0.1.1 // indirect
4242
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -49,14 +49,14 @@ require (
4949
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
5050
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
5151
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
52-
golang.org/x/mod v0.21.0 // indirect
53-
golang.org/x/net v0.28.0 // indirect
52+
golang.org/x/mod v0.22.0 // indirect
53+
golang.org/x/net v0.34.0 // indirect
5454
golang.org/x/sync v0.10.0 // indirect
55-
golang.org/x/sys v0.28.0 // indirect
55+
golang.org/x/sys v0.29.0 // indirect
5656
golang.org/x/text v0.21.0 // indirect
5757
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
5858
google.golang.org/appengine v1.6.8 // indirect
59-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
60-
google.golang.org/grpc v1.67.1 // indirect
61-
google.golang.org/protobuf v1.35.1 // indirect
59+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
60+
google.golang.org/grpc v1.69.4 // indirect
61+
google.golang.org/protobuf v1.36.3 // indirect
6262
)

0 commit comments

Comments
 (0)