Skip to content

Commit 9a6875d

Browse files
stevehipwellkfcampbell
stevehipwell
and
kfcampbell
authored
chore: Refactored tooling for best practices (integrations#2193)
Signed-off-by: Steve Hipwell <[email protected]> Co-authored-by: Keegan Campbell <[email protected]>
1 parent 1cf79f2 commit 9a6875d

15 files changed

+213
-165
lines changed

‎.github/dependabot.yml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
4-
directory: "/"
3+
- package-ecosystem: github-actions
4+
directory: /
5+
groups:
6+
github-actions:
7+
patterns:
8+
- "*"
9+
update-types:
10+
- minor
11+
- patch
512
schedule:
6-
interval: "weekly"
13+
interval: weekly
714

8-
- package-ecosystem: "gomod"
9-
directory: "/"
15+
- package-ecosystem: gomod
16+
directory: /
17+
groups:
18+
gomod:
19+
patterns:
20+
- "*"
21+
update-types:
22+
- minor
23+
- patch
1024
schedule:
11-
interval: "weekly"
25+
interval: weekly

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ jobs:
1111
env:
1212
GITHUB_TEST_ORGANIZATION: 'kfcampbell-terraform-provider'
1313
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-go@v5
14+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
15+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1616
with:
17-
go-version: '1.21'
17+
go-version-file: 'go.mod'
18+
cache: true
1819
- run: make tools
1920
- run: make lint
2021
- run: make website-lint

‎.github/workflows/codeql.yml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,24 @@ jobs:
2424
language: [ 'go' ]
2525

2626
steps:
27-
- name: Checkout repository
28-
uses: actions/checkout@v4
29-
- uses: actions/setup-go@v5
30-
with:
31-
go-version: '1.21'
32-
33-
# Initializes the CodeQL tools for scanning.
34-
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@v3
36-
with:
37-
languages: ${{ matrix.language }}
38-
39-
- name: Autobuild
40-
uses: github/codeql-action/autobuild@v3
41-
42-
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@v3
44-
with:
45-
category: "/language:${{matrix.language}}"
27+
- name: Checkout repository
28+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
29+
30+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
31+
with:
32+
go-version-file: 'go.mod'
33+
cache: true
34+
35+
# Initializes the CodeQL tools for scanning.
36+
- name: Initialize CodeQL
37+
uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
38+
with:
39+
languages: ${{ matrix.language }}
40+
41+
- name: Autobuild
42+
uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
43+
44+
- name: Perform CodeQL Analysis
45+
uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
46+
with:
47+
category: "/language:${{matrix.language}}"

‎.github/workflows/dotcom-acceptance-tests-all.yml‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2020
with:
2121
ref: ${{ github.event.pull_request.head.ref }}
2222
fetch-depth: 2
23-
- uses: actions/setup-go@v5
23+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2424
with:
25-
go-version: '1.21'
25+
go-version-file: 'go.mod'
26+
cache: true
2627
- name: Acceptance Tests (Anonymous)
27-
uses: terraformtesting/[email protected]
28+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
2829
with:
2930
TF_LOG: INFO
3031
RUN_ALL: true
@@ -33,17 +34,18 @@ jobs:
3334
runs-on: ubuntu-latest
3435
steps:
3536
- name: Checkout
36-
uses: actions/checkout@v4
37+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3738
with:
3839
ref: ${{ github.event.pull_request.head.ref }}
3940
fetch-depth: 2
40-
- uses: actions/setup-go@v5
41+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
4142
with:
42-
go-version: '1.21'
43+
go-version-file: 'go.mod'
44+
cache: true
4345

4446
- name: Acceptance Tests (Individual)
4547
id: acceptance-tests-individual
46-
uses: terraformtesting/[email protected]
48+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
4749
with:
4850
TF_LOG: INFO
4951
RUN_ALL: true
@@ -53,7 +55,7 @@ jobs:
5355

5456
- name: Failed Acceptance Tests (Individual)
5557
if: ${{ failure() }}
56-
uses: terraformtesting/[email protected]
58+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
5759
with:
5860
TF_LOG: DEBUG
5961
RUN_ALLOWED: ${{ steps.acceptance-tests-individual.outputs.failed }}
@@ -65,17 +67,18 @@ jobs:
6567
runs-on: ubuntu-latest
6668
steps:
6769
- name: Checkout
68-
uses: actions/checkout@v4
70+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6971
with:
7072
ref: ${{ github.event.pull_request.head.ref }}
7173
fetch-depth: 2
72-
- uses: actions/setup-go@v5
74+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
7375
with:
74-
go-version: '1.21'
76+
go-version-file: 'go.mod'
77+
cache: true
7578

7679
- name: Acceptance Tests (Organization)
7780
id: acceptance-tests-organization
78-
uses: terraformtesting/[email protected]
81+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
7982
with:
8083
TF_LOG: INFO
8184
RUN_ALL: true
@@ -84,7 +87,7 @@ jobs:
8487
GITHUB_TEST_OWNER: github-terraform-test-user
8588

8689
- name: Failed Acceptance Tests (Organization)
87-
uses: terraformtesting/[email protected]
90+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
8891
if: ${{ failure() }}
8992
with:
9093
TF_LOG: DEBUG

‎.github/workflows/dotcom-acceptance-tests-manual.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@ jobs:
1717
jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2
1818
)"
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2121
with:
2222
ref: ${{ github.event.pull_request.head.sha }}
23-
- uses: actions/setup-go@v5
23+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2424
with:
25-
go-version: '1.21'
25+
go-version-file: 'go.mod'
26+
cache: true
2627
- name: Acceptance Tests (Anonymous)
2728
id: acceptance-tests-anonymous
28-
uses: terraformtesting/[email protected]
29+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
2930
with:
3031
TF_LOG: INFO
3132
RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }}
3233
- name: Failed Acceptance Tests (Anonymous)
3334
if: ${{ failure() }}
34-
uses: terraformtesting/[email protected]
35+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
3536
with:
3637
TF_LOG: DEBUG
3738
RUN_ALLOWED: ${{ steps.acceptance-tests-anonymous.outputs.run_allowed }}
@@ -48,15 +49,16 @@ jobs:
4849
jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2
4950
)"
5051
- name: Checkout
51-
uses: actions/checkout@v4
52+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5253
with:
5354
ref: ${{ github.event.pull_request.head.sha }}
54-
- uses: actions/setup-go@v5
55+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
5556
with:
56-
go-version: '1.21'
57+
go-version-file: 'go.mod'
58+
cache: true
5759
- name: Acceptance Tests (Individual)
5860
id: acceptance-tests-individual
59-
uses: terraformtesting/[email protected]
61+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
6062
with:
6163
TF_LOG: INFO
6264
RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }}
@@ -65,7 +67,7 @@ jobs:
6567
GITHUB_TEST_ORGANIZATION: terraformtesting
6668
- name: Failed Acceptance Tests (Individual)
6769
if: ${{ failure() }}
68-
uses: terraformtesting/[email protected]
70+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
6971
with:
7072
TF_LOG: DEBUG
7173
RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }}
@@ -84,16 +86,17 @@ jobs:
8486
jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2
8587
)"
8688
- name: Checkout
87-
uses: actions/checkout@v4
89+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8890
with:
8991
ref: ${{ github.event.pull_request.head.sha }}
90-
- uses: actions/setup-go@v5
92+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
9193
with:
92-
go-version: '1.21'
94+
go-version-file: 'go.mod'
95+
cache: true
9396

9497
- name: Acceptance Tests (Organization)
9598
id: acceptance-tests-organization
96-
uses: terraformtesting/[email protected]
99+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
97100
with:
98101
TF_LOG: INFO
99102
RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }}
@@ -102,14 +105,11 @@ jobs:
102105
GITHUB_TEST_OWNER: github-terraform-test-user
103106

104107
- name: Failed Acceptance Tests (Organization)
105-
uses: terraformtesting/[email protected]
108+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
106109
if: ${{ failure() }}
107110
with:
108111
TF_LOG: DEBUG
109112
RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }}
110113
GITHUB_ORGANIZATION: terraformtesting
111114
GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }}
112115
GITHUB_TEST_OWNER: github-terraform-test-user
113-
114-
115-

‎.github/workflows/dotcom-acceptance-tests.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,29 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1515
with:
1616
ref: ${{ github.event.pull_request.head.ref }}
1717
fetch-depth: 2
1818
- name: Acceptance Tests (Anonymous)
19-
uses: terraformtesting/[email protected]
19+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
2020
with:
2121
TF_LOG: INFO
2222

2323
acceptance-tests-individual:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2828
with:
2929
ref: ${{ github.event.pull_request.head.ref }}
3030
fetch-depth: 2
31-
- uses: actions/setup-go@v5
31+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3232
with:
33-
go-version: '1.21'
33+
go-version-file: 'go.mod'
34+
cache: true
3435
- name: Acceptance Tests (Individual)
35-
uses: terraformtesting/[email protected]
36+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
3637
with:
3738
TF_LOG: INFO
3839
GITHUB_OWNER: github-terraform-test-user
@@ -43,15 +44,16 @@ jobs:
4344
runs-on: ubuntu-latest
4445
steps:
4546
- name: Checkout
46-
uses: actions/checkout@v4
47+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4748
with:
4849
ref: ${{ github.event.pull_request.head.ref }}
4950
fetch-depth: 2
50-
- uses: actions/setup-go@v5
51+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
5152
with:
52-
go-version: '1.21'
53+
go-version-file: 'go.mod'
54+
cache: true
5355
- name: Acceptance Tests (Organization)
54-
uses: terraformtesting/[email protected]
56+
uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0
5557
with:
5658
TF_LOG: INFO
5759
GITHUB_ORGANIZATION: terraformtesting

0 commit comments

Comments
 (0)