Skip to content

Commit 6bebea9

Browse files
Fran-RgFran-Rg
authored
Merge branch 'master' into issue-658
2 parents 2031566 + a7db125 commit 6bebea9

File tree

12 files changed

+204
-47
lines changed

12 files changed

+204
-47
lines changed

‎.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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
# .tfstate files
88
*.tfstate
99
*.tfstate.*
10-
*.tfplan
1110

1211
# Crash log files
1312
crash.log
@@ -29,9 +28,12 @@ override.tf.json
2928
.terraformrc
3029
terraform.rc
3130

32-
# Lambda directories
31+
# Lambda build artifacts
3332
builds/
3433
__pycache__/
35-
36-
# Test directories
34+
*.zip
3735
.tox
36+
37+
# Local editors/macos files
38+
.DS_Store
39+
.idea

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.99.4
3+
rev: v1.103.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each
@@ -24,7 +24,7 @@ repos:
2424
- "--args=--only=terraform_workspace_remote"
2525
- id: terraform_validate
2626
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v5.0.0
27+
rev: v6.0.0
2828
hooks:
2929
- id: check-merge-conflict
3030
- id: end-of-file-fixer

‎CHANGELOG.md‎

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

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

5+
## [8.1.2](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v8.1.1...v8.1.2) (2025-10-22)
6+
7+
### Bug Fixes
8+
9+
* Make quiet_archive_local_exec properly suppress Poetry/pip/npm output ([#709](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/709)) ([bae0385](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/bae03859f4b7a389c20e52dcbd5c83d58f1916a8))
10+
11+
## [8.1.1](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v8.1.0...v8.1.1) (2025-10-21)
12+
13+
### Bug Fixes
14+
15+
* Update CI workflow versions to latest ([#713](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/713)) ([feb4561](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/feb456187b3727b6b94562cc39d3cbce509b3d03))
16+
517
## [8.1.0](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v8.0.1...v8.1.0) (2025-08-22)
618

719

‎examples/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Examples
2+
3+
Please note - the examples provided serve two primary means:
4+
5+
1. Show users working examples of the various ways in which the module can be configured and features supported
6+
2. A means of testing/validating module changes
7+
8+
Please do not mistake the examples provided as "best practices". It is up to users to consult the AWS service documentation for best practices, usage recommendations, etc.

‎examples/build-package/README.md‎

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

33
Configuration in this directory creates deployment packages in a variety of combinations.
44

5+
This example demonstrates various packaging scenarios including:
6+
- Python packages with pip requirements
7+
- Poetry-based Python packages
8+
- Node.js packages with npm
9+
- Docker-based builds
10+
- Quiet packaging - suppressing Poetry/pip/npm output during builds using `quiet_archive_local_exec = true`
11+
512
Look into [Runtimes Examples](https://github.com/terraform-aws-modules/terraform-aws-lambda/tree/master/examples/runtimes) for more ways to build and deploy AWS Lambda Functions using supported runtimes (Rust, Go, Java).
613

714
## Usage
@@ -44,6 +51,7 @@ Note that this example may create resources which cost money. Run `terraform des
4451
| <a name="module_package_dir_pip_dir"></a> [package\_dir\_pip\_dir](#module\_package\_dir\_pip\_dir) | ../../ | n/a |
4552
| <a name="module_package_dir_poetry"></a> [package\_dir\_poetry](#module\_package\_dir\_poetry) | ../../ | n/a |
4653
| <a name="module_package_dir_poetry_no_docker"></a> [package\_dir\_poetry\_no\_docker](#module\_package\_dir\_poetry\_no\_docker) | ../../ | n/a |
54+
| <a name="module_package_dir_poetry_quiet"></a> [package\_dir\_poetry\_quiet](#module\_package\_dir\_poetry\_quiet) | ../../ | n/a |
4755
| <a name="module_package_dir_with_npm_install"></a> [package\_dir\_with\_npm\_install](#module\_package\_dir\_with\_npm\_install) | ../../ | n/a |
4856
| <a name="module_package_dir_with_npm_install_lock_file"></a> [package\_dir\_with\_npm\_install\_lock\_file](#module\_package\_dir\_with\_npm\_install\_lock\_file) | ../../ | n/a |
4957
| <a name="module_package_dir_without_npm_install"></a> [package\_dir\_without\_npm\_install](#module\_package\_dir\_without\_npm\_install) | ../../ | n/a |

‎examples/build-package/main.tf‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ module "package_dir_poetry_no_docker" {
119119
artifacts_dir = "${path.root}/builds/package_dir_poetry/"
120120
}
121121

122+
# Create zip-archive with Poetry dependencies and demonstrate quiet packaging output
123+
module "package_dir_poetry_quiet" {
124+
source = "../../"
125+
126+
create_function = false
127+
128+
runtime = "python3.12"
129+
130+
source_path = [
131+
{
132+
path = "${path.module}/../fixtures/python-app-poetry"
133+
poetry_install = true
134+
}
135+
]
136+
artifacts_dir = "${path.root}/builds/package_dir_poetry_quiet/"
137+
quiet_archive_local_exec = true # Suppress Poetry/pip output during packaging
138+
}
139+
122140
# Create zip-archive of a single directory without running "pip install" (which is default for python runtime)
123141
module "package_dir_without_pip_install" {
124142
source = "../../"

0 commit comments

Comments
 (0)