Skip to content

Commit 3629355

Browse files
velkovbvelkovb
authored
Merge branch 'terraform-aws-modules:master' into master
2 parents de8a4ff + 82d1929 commit 3629355

86 files changed

Lines changed: 3327 additions & 756 deletions

Some content is hidden

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

‎.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.5.3
17+
- uses: amannn/action-semantic-pull-request@v6.1.1
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
with:

‎.github/workflows/pre-commit.yml‎

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

99
env:
10-
TERRAFORM_DOCS_VERSION: v0.19.0
11-
TFLINT_VERSION: v0.53.0
10+
TERRAFORM_DOCS_VERSION: v0.20.0
11+
TFLINT_VERSION: v0.59.1
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@v4
21+
uses: actions/checkout@v5
2222

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

2727
preCommitMinVersions:
2828
name: Min TF pre-commit
@@ -32,27 +32,49 @@ jobs:
3232
matrix:
3333
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3434
steps:
35+
- name: Install rmz
36+
uses: jaxxstorm/action-install-gh-release@v2.1.0
37+
with:
38+
repo: SUPERCILEX/fuc
39+
asset-name: x86_64-unknown-linux-gnu-rmz
40+
rename-to: rmz
41+
chmod: 0755
42+
extension-matching: disable
43+
3544
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
36-
- name: Delete huge unnecessary tools folder
45+
- name: Delete unnecessary files
3746
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
47+
formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
48+
getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
49+
50+
BEFORE=$(getAvailableSpace)
51+
52+
ln -s /opt/hostedtoolcache/SUPERCILEX/x86_64-unknown-linux-gnu-rmz/latest/linux-x64/rmz /usr/local/bin/rmz
53+
rmz -f /opt/hostedtoolcache/CodeQL &
54+
rmz -f /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk &
55+
rmz -f /opt/hostedtoolcache/PyPy &
56+
rmz -f /opt/hostedtoolcache/Ruby &
57+
rmz -f /opt/hostedtoolcache/go &
58+
59+
wait
60+
61+
AFTER=$(getAvailableSpace)
62+
SAVED=$((AFTER-BEFORE))
63+
echo "=> Saved $(formatByteCount $SAVED)"
4264
4365
- name: Checkout
44-
uses: actions/checkout@v4
66+
uses: actions/checkout@v5
4567

4668
- name: Terraform min/max versions
4769
id: minMax
48-
uses: clowdhaus/terraform-min-max@v1.3.1
70+
uses: clowdhaus/terraform-min-max@v2.1.0
4971
with:
5072
directory: ${{ matrix.directory }}
5173

5274
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5375
# Run only validate pre-commit check on min version supported
5476
if: ${{ matrix.directory != '.' }}
55-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
77+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
5678
with:
5779
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5880
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -61,7 +83,7 @@ jobs:
6183
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
6284
# Run only validate pre-commit check on min version supported
6385
if: ${{ matrix.directory == '.' }}
64-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
86+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
6587
with:
6688
terraform-version: ${{ steps.minMax.outputs.minVersion }}
6789
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -72,26 +94,73 @@ jobs:
7294
runs-on: ubuntu-latest
7395
needs: collectInputs
7496
steps:
97+
- name: Install rmz
98+
uses: jaxxstorm/action-install-gh-release@v2.1.0
99+
with:
100+
repo: SUPERCILEX/fuc
101+
asset-name: x86_64-unknown-linux-gnu-rmz
102+
rename-to: rmz
103+
chmod: 0755
104+
extension-matching: disable
105+
75106
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
76-
- name: Delete huge unnecessary tools folder
107+
- name: Delete unnecessary files
77108
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
109+
formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
110+
getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
111+
112+
BEFORE=$(getAvailableSpace)
113+
114+
ln -s /opt/hostedtoolcache/SUPERCILEX/x86_64-unknown-linux-gnu-rmz/latest/linux-x64/rmz /usr/local/bin/rmz
115+
rmz -f /opt/hostedtoolcache/CodeQL &
116+
rmz -f /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk &
117+
rmz -f /opt/hostedtoolcache/PyPy &
118+
rmz -f /opt/hostedtoolcache/Ruby &
119+
rmz -f /opt/hostedtoolcache/go &
120+
sudo rmz -f /usr/local/lib/android &
121+
122+
if [[ ${{ github.repository }} == terraform-aws-modules/terraform-aws-security-group ]]; then
123+
sudo rmz -f /usr/share/dotnet &
124+
sudo rmz -f /usr/local/.ghcup &
125+
sudo apt-get -qq remove -y 'azure-.*'
126+
sudo apt-get -qq remove -y 'cpp-.*'
127+
sudo apt-get -qq remove -y 'dotnet-runtime-.*'
128+
sudo apt-get -qq remove -y 'google-.*'
129+
sudo apt-get -qq remove -y 'libclang-.*'
130+
sudo apt-get -qq remove -y 'libllvm.*'
131+
sudo apt-get -qq remove -y 'llvm-.*'
132+
sudo apt-get -qq remove -y 'mysql-.*'
133+
sudo apt-get -qq remove -y 'postgresql-.*'
134+
sudo apt-get -qq remove -y 'php.*'
135+
sudo apt-get -qq remove -y 'temurin-.*'
136+
sudo apt-get -qq remove -y kubectl firefox mono-devel
137+
sudo apt-get -qq autoremove -y
138+
sudo apt-get -qq clean
139+
fi
140+
141+
wait
142+
143+
AFTER=$(getAvailableSpace)
144+
SAVED=$((AFTER-BEFORE))
145+
echo "=> Saved $(formatByteCount $SAVED)"
82146
83147
- name: Checkout
84-
uses: actions/checkout@v4
148+
uses: actions/checkout@v5
85149
with:
86150
ref: ${{ github.event.pull_request.head.ref }}
87151
repository: ${{github.event.pull_request.head.repo.full_name}}
88152

89153
- name: Terraform min/max versions
90154
id: minMax
91-
uses: clowdhaus/terraform-min-max@v1.3.1
155+
uses: clowdhaus/terraform-min-max@v2.1.0
156+
157+
- name: Hide template dir
158+
# Special to this repo, we don't want to check this dir
159+
if: ${{ github.repository == 'terraform-aws-modules/terraform-aws-security-group' }}
160+
run: rm -rf modules/_templates
92161

93162
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
94-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
163+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
95164
with:
96165
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
97166
tflint-version: ${{ env.TFLINT_VERSION }}

‎.github/workflows/release.yml‎

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

28+
- name: Set correct Node.js version
29+
uses: actions/setup-node@v6
30+
with:
31+
node-version: 24
32+
33+
- name: Install dependencies
34+
run: |
35+
npm install \
36+
@semantic-release/changelog@6.0.3 \
37+
@semantic-release/git@10.0.1 \
38+
conventional-changelog-conventionalcommits@9.1.0
39+
2840
- name: Release
29-
uses: cycjimmy/semantic-release-action@v4
41+
uses: cycjimmy/semantic-release-action@v5
3042
with:
31-
semantic_version: 23.0.2
32-
extra_plugins: |
33-
@semantic-release/changelog@6.0.3
34-
@semantic-release/git@10.0.1
35-
conventional-changelog-conventionalcommits@7.0.2
43+
semantic_version: 25.0.0
3644
env:
3745
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@v9
10+
- uses: actions/stale@v10
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,13 @@ override.tf.json
2727
# Ignore CLI configuration files
2828
.terraformrc
2929
terraform.rc
30+
31+
# Lambda build artifacts
32+
builds/
33+
__pycache__/
34+
*.zip
35+
.tox
36+
37+
# Local editors/macos files
38+
.DS_Store
39+
.idea

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.96.2
3+
rev: v1.105.0
44
hooks:
55
- id: terraform_fmt
6+
- id: terraform_wrapper_module_for_each
67
- id: terraform_docs
78
args:
89
- '--args=--lockfile=false'
@@ -23,7 +24,7 @@ repos:
2324
- '--args=--only=terraform_workspace_remote'
2425
- id: terraform_validate
2526
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v5.0.0
27+
rev: v6.0.0
2728
hooks:
2829
- id: check-merge-conflict
2930
- id: end-of-file-fixer

‎CHANGELOG.md‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,104 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [6.6.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.5.1...v6.6.0) (2026-01-08)
6+
7+
### Features
8+
9+
* Add provider meta user-agent ([#1272](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1272)) ([1c561a7](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/1c561a729afcfaab05fb2c50091a6f492ceac5b6))
10+
11+
## [6.5.1](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.5.0...v6.5.1) (2025-11-17)
12+
13+
### Bug Fixes
14+
15+
* Correction with IAM role policy associated with modules/flow-log ([#1264](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1264)) ([de13700](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/de1370094ac03db84b45d97e2ee422f07ab8c6f9))
16+
17+
## [6.5.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.4.1...v6.5.0) (2025-10-21)
18+
19+
### Features
20+
21+
* Add support for `bgp_asn_extended` argument to the `customer_gateways` variable ([#1249](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1249)) ([ef564c9](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/ef564c968a076092ea39f96549ac49669a2ea237))
22+
23+
## [6.4.1](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.4.0...v6.4.1) (2025-10-21)
24+
25+
### Bug Fixes
26+
27+
* Update CI workflow versions to latest ([#1250](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1250)) ([22ccfa1](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/22ccfa1730f86711ebf530b765c998a54db304bb))
28+
29+
## [6.4.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.3.0...v6.4.0) (2025-09-29)
30+
31+
32+
### Features
33+
34+
* Add wrappers ([#1243](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1243)) ([112bb7f](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/112bb7f163fff12ff7c8400bc5ffdd8674b304a5))
35+
36+
## [6.3.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.2.0...v6.3.0) (2025-09-26)
37+
38+
39+
### Features
40+
41+
* Add new sub-module for AWS flow log ([#1241](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1241)) ([33aabec](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/33aabec82036e00240b0fcfb04f1e29297a48b1b))
42+
43+
## [6.2.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.1.0...v6.2.0) (2025-09-22)
44+
45+
46+
### Features
47+
48+
* Add support for IAM role path to VPC flow log IAM role ([#1232](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1232)) ([6594a41](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/6594a41db42e26db84882ba10c3be30fcb291cc4))
49+
50+
## [6.1.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.0.1...v6.1.0) (2025-09-22)
51+
52+
53+
### Features
54+
55+
* Add enhanced region support ([#1225](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1225)) ([fd357b9](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/fd357b932ec2d7719779e4fcd586f4538a62d495))
56+
57+
## [6.0.1](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v6.0.0...v6.0.1) (2025-06-20)
58+
59+
60+
### Bug Fixes
61+
62+
* Bump AWS provider requirement to v6 everywhere ([#1208](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1208)) ([26c99a5](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/26c99a53326e7455a7f9f1162839822104809c46))
63+
64+
## [6.0.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.21.1...v6.0.0) (2025-06-19)
65+
66+
67+
### ⚠ BREAKING CHANGES
68+
69+
* Bump AWS provider requirement to v6 (#1205)
70+
71+
### Features
72+
73+
* Bump AWS provider requirement to v6 ([#1205](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1205)) ([4483701](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/4483701c77f661b4ed3b468e5229e030e540d6f3))
74+
75+
## [5.21.1](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.21.0...v5.21.1) (2025-06-19)
76+
77+
78+
### Bug Fixes
79+
80+
* Fixed deprecation attribute warning with AWS provider v6 ([#1200](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1200)) ([bf04a75](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/bf04a755dc0b46d49dadf589c84832c0dd556a6d))
81+
82+
## [5.21.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.20.0...v5.21.0) (2025-04-21)
83+
84+
85+
### Features
86+
87+
* Add support for `subnet_configuration` on VPC endpoints ([#1164](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1164)) ([507193e](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/507193ee659f6f0ecdd4a75107e59e2a6c1ac3cc))
88+
89+
## [5.20.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.19.0...v5.20.0) (2025-04-21)
90+
91+
92+
### Features
93+
94+
* Allow setting custom tags on `aws_vpc_block_public_access_exclusion` resource ([#1170](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1170)) ([0d11295](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/0d11295d8b45f1319c46bfd044030035e9e02445))
95+
96+
## [5.19.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.18.1...v5.19.0) (2025-02-12)
97+
98+
99+
### Features
100+
101+
* Enhancing VPC Security with Amazon VPC Block Public Access ([#1159](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1159)) ([387f5ee](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/387f5eeef45134eccf18b24eba62c883a57fadd8))
102+
5103
## [5.18.1](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.18.0...v5.18.1) (2025-01-28)
6104

7105

0 commit comments

Comments
 (0)