Skip to content

Commit 26ccdea

Browse files
Merge branch 'master' into add-ignore-backup-7.5.1
2 parents afdae34 + 4025104 commit 26ccdea

Some content is hidden

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

57 files changed

+2573
-814
lines changed

.github/workflows/lock.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'Lock Threads'
2+
3+
on:
4+
schedule:
5+
- cron: '50 1 * * *'
6+
7+
jobs:
8+
lock:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: dessant/lock-threads@v5
12+
with:
13+
github-token: ${{ secrets.GITHUB_TOKEN }}
14+
issue-comment: >
15+
I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
16+
If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
17+
issue-inactive-days: '30'
18+
pr-comment: >
19+
I'm going to lock this pull request because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
20+
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
21+
pr-inactive-days: '30'

.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@v3.4.6
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: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
- master
88

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

1213
jobs:
1314
collectInputs:
@@ -17,11 +18,11 @@ jobs:
1718
directories: ${{ steps.dirs.outputs.directories }}
1819
steps:
1920
- name: Checkout
20-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2122

2223
- name: Get root directories
2324
id: dirs
24-
uses: clowdhaus/terraform-composite-actions/directories@v1.3.0
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
2526

2627
preCommitMinVersions:
2728
name: Min TF pre-commit
@@ -31,48 +32,68 @@ jobs:
3132
matrix:
3233
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3334
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+
3443
- name: Checkout
35-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
3645

3746
- name: Terraform min/max versions
3847
id: minMax
39-
uses: clowdhaus/terraform-min-max@v1.0.3
48+
uses: clowdhaus/terraform-min-max@v1.3.1
4049
with:
4150
directory: ${{ matrix.directory }}
4251

4352
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4453
# Run only validate pre-commit check on min version supported
4554
if: ${{ matrix.directory != '.' }}
46-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
4756
with:
4857
terraform-version: ${{ steps.minMax.outputs.minVersion }}
58+
tflint-version: ${{ env.TFLINT_VERSION }}
4959
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
5060

5161
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5262
# Run only validate pre-commit check on min version supported
5363
if: ${{ matrix.directory == '.' }}
54-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
5565
with:
5666
terraform-version: ${{ steps.minMax.outputs.minVersion }}
67+
tflint-version: ${{ env.TFLINT_VERSION }}
5768
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
5869

5970
preCommitMaxVersion:
6071
name: Max TF pre-commit
6172
runs-on: ubuntu-latest
6273
needs: collectInputs
6374
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+
6483
- name: Checkout
65-
uses: actions/checkout@v2
84+
uses: actions/checkout@v4
6685
with:
6786
ref: ${{ github.event.pull_request.head.ref }}
6887
repository: ${{github.event.pull_request.head.repo.full_name}}
6988

7089
- name: Terraform min/max versions
7190
id: minMax
72-
uses: clowdhaus/terraform-min-max@v1.0.3
91+
uses: clowdhaus/terraform-min-max@v1.3.1
7392

7493
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
75-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
7695
with:
7796
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
97+
tflint-version: ${{ env.TFLINT_VERSION }}
7898
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
99+
install-hcledit: true

.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@v2
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@v2
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@v4
10+
- uses: actions/stale@v9
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.75.0
3+
rev: v1.96.1
44
hooks:
55
- id: terraform_fmt
6-
- id: terraform_validate
76
- id: terraform_docs
87
args:
98
- '--args=--lockfile=false'
@@ -22,8 +21,10 @@ repos:
2221
- '--args=--only=terraform_required_providers'
2322
- '--args=--only=terraform_standard_module_structure'
2423
- '--args=--only=terraform_workspace_remote'
24+
- id: terraform_validate
2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v4.3.0
26+
rev: v5.0.0
2727
hooks:
2828
- id: check-merge-conflict
2929
- id: end-of-file-fixer
30+
- id: trailing-whitespace

0 commit comments

Comments
 (0)