Skip to content

Commit e10f3ab

Browse files
authored
go: update deps (#127)
Update our dependencies to resolve some proto vulnerabilities As part of this we also had to resolve some issues with the latest version of golangci-lint. * Update Go modules * Remove .go-version file * Remove unnecessary copied loop variables * Range over integers where possible Signed-off-by: Ryan Cragun <[email protected]>
1 parent e3dffbc commit e10f3ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+72
-152
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4545
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
4646
with:
47-
go-version-file: .go-version
47+
go-version-file: go.mod
4848
- id: product-metadata
4949
run: |
5050
make version
@@ -92,7 +92,7 @@ jobs:
9292
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
9393
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
9494
with:
95-
go-version-file: .go-version
95+
go-version-file: go.mod
9696
- uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
9797
id: download
9898
with:

.github/workflows/pr_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3131
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3232
with:
33-
go-version-file: .go-version
33+
go-version-file: go.mod
3434
- name: Get Product Version
3535
id: get-product-version
3636
run: |

.github/workflows/update_homebrew_formula.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
path: enos-checkout
7474
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
7575
with:
76-
go-version-file: enos-checkout/.go-version
76+
go-version-file: enos-checkout/go.mod
7777
# Set up bob CLI
7878
- name: Setup bob CLI
7979
uses: hashicorp/action-setup-bob@v1

.github/workflows/validate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2626
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2727
with:
28-
go-version-file: .go-version
28+
go-version-file: go.mod
2929
- uses: ./.github/actions/set-up-buf
3030
- uses: ./.github/actions/set-up-gofumpt
3131
- uses: ./.github/actions/set-up-golangci-lint
@@ -55,7 +55,7 @@ jobs:
5555
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5656
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
5757
with:
58-
go-version-file: .go-version
58+
go-version-file: go.mod
5959
- uses: hashicorp/setup-terraform@v2
6060
with:
6161
# the terraform wrapper will break terraform execution in enos because

.go-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

acceptance/scenario_check_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func TestAcc_Cmd_Scenario_Check(t *testing.T) {
3737
[][]string{{"skip", "keep"}, {"skip", "skip"}},
3838
},
3939
} {
40-
test := test
4140
t.Run(fmt.Sprintf("%s %s %s", test.dir, test.name, test.variants), func(t *testing.T) {
4241
t.Parallel()
4342

@@ -129,7 +128,6 @@ func TestAcc_Cmd_Scenario_Check_WithWarnings(t *testing.T) {
129128
t.Cleanup(func() { os.RemoveAll(tmpDir) })
130129

131130
for _, failOnWarnings := range []bool{true, false} {
132-
failOnWarnings := failOnWarnings
133131
t.Run(fmt.Sprintf("fail_on_warnings_%t", failOnWarnings), func(t *testing.T) {
134132
t.Parallel()
135133
outDir := filepath.Join(tmpDir, "scenario_generate_has_warnings")

acceptance/scenario_destroy_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ func TestAcc_Cmd_Scenario_Destroy(t *testing.T) {
4444
false,
4545
},
4646
} {
47-
test := test
4847
t.Run(fmt.Sprintf("%s %s %s %t", test.dir, test.name, test.variants, test.launch), func(t *testing.T) {
4948
t.Parallel()
5049
enos := newAcceptanceRunner(t, skipUnlessTerraformCLI())

acceptance/scenario_e2e_aws_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func TestAcc_Cmd_Scenario_E2E_AWS(t *testing.T) {
5050
},
5151
},
5252
} {
53-
test := test
5453
t.Run(test.dir, func(t *testing.T) {
5554
t.Parallel()
5655

acceptance/scenario_exec_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func TestAcc_Cmd_Scenario_Exec(t *testing.T) {
4141
fmt.Sprintf("%x", sha256.Sum256([]byte("test [foo:matrixbar]"))),
4242
},
4343
} {
44-
test := test
4544
t.Run(fmt.Sprintf("%s %s %s", test.dir, test.name, test.variants), func(t *testing.T) {
4645
t.Parallel()
4746

acceptance/scenario_generate_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ func TestAcc_Cmd_Scenario_Generate(t *testing.T) {
7171
fmt.Sprintf("%x", sha256.Sum256([]byte("kubernetes"))),
7272
},
7373
} {
74-
test := test
7574
t.Run(fmt.Sprintf("%s %s %s", test.dir, test.name, test.variants), func(t *testing.T) {
7675
t.Parallel()
7776

0 commit comments

Comments
 (0)