Skip to content

Commit 7ced602

Browse files
dkumarbaugdkumarbaug
authored
Merge branch 'master' into AWSCORE-3582
2 parents d832739 + a5433c0 commit 7ced602

File tree

128 files changed

+3414
-950
lines changed

Some content is hidden

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

128 files changed

+3414
-950
lines changed

‎.github/workflows/lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
lock:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: dessant/lock-threads@v4
11+
- uses: dessant/lock-threads@v5
1212
with:
1313
github-token: ${{ secrets.GITHUB_TOKEN }}
1414
issue-comment: >

‎.github/workflows/pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
# Please look up the latest version from
1616
# https://github.com/amannn/action-semantic-pull-request/releases
17-
- uses: amannn/action-semantic-pull-request@v5.0.2
17+
- uses: amannn/action-semantic-pull-request@v5.5.3
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
with:

‎.github/workflows/pre-commit.yml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- master
88

99
env:
10-
TERRAFORM_DOCS_VERSION: v0.16.0
11-
TFLINT_VERSION: v0.44.1
10+
TERRAFORM_DOCS_VERSION: v0.19.0
11+
TFLINT_VERSION: v0.53.0
1212

1313
jobs:
1414
collectInputs:
@@ -18,11 +18,11 @@ jobs:
1818
directories: ${{ steps.dirs.outputs.directories }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Get root directories
2424
id: dirs
25-
uses: clowdhaus/terraform-composite-actions/directories@v1.8.3
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
2626

2727
preCommitMinVersions:
2828
name: Min TF pre-commit
@@ -32,19 +32,27 @@ jobs:
3232
matrix:
3333
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3434
steps:
35+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
36+
- name: Delete huge unnecessary tools folder
37+
run: |
38+
rm -rf /opt/hostedtoolcache/CodeQL
39+
rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
40+
rm -rf /opt/hostedtoolcache/Ruby
41+
rm -rf /opt/hostedtoolcache/go
42+
3543
- name: Checkout
36-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
3745

3846
- name: Terraform min/max versions
3947
id: minMax
40-
uses: clowdhaus/terraform-min-max@v1.2.4
48+
uses: clowdhaus/terraform-min-max@v1.3.1
4149
with:
4250
directory: ${{ matrix.directory }}
4351

4452
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4553
# Run only validate pre-commit check on min version supported
4654
if: ${{ matrix.directory != '.' }}
47-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
4856
with:
4957
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5058
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -53,7 +61,7 @@ jobs:
5361
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5462
# Run only validate pre-commit check on min version supported
5563
if: ${{ matrix.directory == '.' }}
56-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
5765
with:
5866
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5967
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -64,18 +72,26 @@ jobs:
6472
runs-on: ubuntu-latest
6573
needs: collectInputs
6674
steps:
75+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
76+
- name: Delete huge unnecessary tools folder
77+
run: |
78+
rm -rf /opt/hostedtoolcache/CodeQL
79+
rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
80+
rm -rf /opt/hostedtoolcache/Ruby
81+
rm -rf /opt/hostedtoolcache/go
82+
6783
- name: Checkout
68-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
6985
with:
7086
ref: ${{ github.event.pull_request.head.ref }}
7187
repository: ${{github.event.pull_request.head.repo.full_name}}
7288

7389
- name: Terraform min/max versions
7490
id: minMax
75-
uses: clowdhaus/terraform-min-max@v1.2.4
91+
uses: clowdhaus/terraform-min-max@v1.3.1
7692

7793
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
78-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
7995
with:
8096
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
8197
tflint-version: ${{ env.TFLINT_VERSION }}

‎.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
if: github.repository_owner == 'terraform-aws-modules'
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
persist-credentials: false
2626
fetch-depth: 0
2727

2828
- name: Release
29-
uses: cycjimmy/semantic-release-action@v3
29+
uses: cycjimmy/semantic-release-action@v4
3030
with:
31-
semantic_version: 18.0.0
31+
semantic_version: 23.0.2
3232
extra_plugins: |
33-
@semantic-release/[email protected].0
34-
@semantic-release/[email protected].0
35-
conventional-changelog-conventionalcommits@4.6.3
33+
@semantic-release/[email protected].3
34+
@semantic-release/[email protected].1
35+
conventional-changelog-conventionalcommits@7.0.2
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

‎.github/workflows/stale-actions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v6
10+
- uses: actions/stale@v9
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

‎.github/workflows/test.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Tests
22

33
env:
4-
PYTEST_VERSION: 7.1.3
4+
PYTEST_VERSION: 7.4.4
5+
RUFF_VERSION: 0.1.13
6+
RUFF_PY_VERSION: 3.12
57

68
on:
79
push:
@@ -16,22 +18,43 @@ jobs:
1618
runs-on: ubuntu-latest
1719
strategy:
1820
matrix:
19-
python_version: ["3.7", "3.8", "3.9", "3.10"]
21+
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
2022
fail-fast: false
2123
steps:
22-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4.1.1
2325

2426
- name: Set up Python ${{ matrix.python_version }}
25-
uses: actions/setup-python@v3
27+
uses: actions/setup-python@v5.0.0
2628
with:
2729
python-version: ${{ matrix.python_version }}
2830

29-
- name: Install poetry and tox
31+
- name: Install poetry
3032
shell: bash
3133
run: |
32-
pip install pytest==${PYTEST_VERSION}
34+
pip install pytest==${{ env.PYTEST_VERSION }}
3335
34-
- name: Run tox
36+
- name: Run pytest
3537
shell: bash
3638
run: |
3739
python -m pytest -vvv tests/
40+
41+
format:
42+
name: Ruff Format check
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/[email protected]
46+
47+
- name: Set up Python
48+
uses: actions/[email protected]
49+
with:
50+
python-version: ${{ env.RUFF_PY_VERSION }}
51+
52+
- name: Install ruff
53+
shell: bash
54+
run: |
55+
pip install ruff==${{ env.RUFF_VERSION }}
56+
57+
- name: Run ruff format check
58+
shell: bash
59+
run: |
60+
ruff format --check .

‎.pre-commit-config.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.83.5
3+
rev: v1.99.4
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each
7-
- id: terraform_validate
87
- id: terraform_docs
98
args:
10-
- '--args=--lockfile=false'
9+
- "--args=--lockfile=false"
1110
- id: terraform_tflint
1211
args:
13-
- '--args=--only=terraform_deprecated_interpolation'
14-
- '--args=--only=terraform_deprecated_index'
15-
- '--args=--only=terraform_unused_declarations'
16-
- '--args=--only=terraform_comment_syntax'
17-
- '--args=--only=terraform_documented_outputs'
18-
- '--args=--only=terraform_documented_variables'
19-
- '--args=--only=terraform_typed_variables'
20-
- '--args=--only=terraform_module_pinned_source'
21-
- '--args=--only=terraform_naming_convention'
22-
- '--args=--only=terraform_required_version'
23-
- '--args=--only=terraform_required_providers'
24-
- '--args=--only=terraform_standard_module_structure'
25-
- '--args=--only=terraform_workspace_remote'
12+
- "--args=--only=terraform_deprecated_interpolation"
13+
- "--args=--only=terraform_deprecated_index"
14+
- "--args=--only=terraform_unused_declarations"
15+
- "--args=--only=terraform_comment_syntax"
16+
- "--args=--only=terraform_documented_outputs"
17+
- "--args=--only=terraform_documented_variables"
18+
- "--args=--only=terraform_typed_variables"
19+
- "--args=--only=terraform_module_pinned_source"
20+
- "--args=--only=terraform_naming_convention"
21+
- "--args=--only=terraform_required_version"
22+
- "--args=--only=terraform_required_providers"
23+
- "--args=--only=terraform_standard_module_structure"
24+
- "--args=--only=terraform_workspace_remote"
25+
- id: terraform_validate
2626
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v4.5.0
27+
rev: v5.0.0
2828
hooks:
2929
- id: check-merge-conflict
3030
- id: end-of-file-fixer
31+
- id: trailing-whitespace
32+
- id: mixed-line-ending
33+
args: [--fix=lf]

0 commit comments

Comments
 (0)