Merge remote-tracking branch 'upstream/master'

Author: devops-rivery

.github/workflows/pr-title.yml

@@ -14,7 +14,7 @@ jobs:
  steps:
  # Please look up the latest version from
  # https://github.com/amannn/action-semantic-pull-request/releases
- - uses: amannn/action-semantic-pull-request@v5.5.3
+ - uses: amannn/action-semantic-pull-request@v6.1.1
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:

.github/workflows/pre-commit.yml

@@ -7,8 +7,8 @@ on:
  - master
 
 env:
- TERRAFORM_DOCS_VERSION: v0.19.0
- TFLINT_VERSION: v0.53.0
+ TERRAFORM_DOCS_VERSION: v0.20.0
+ TFLINT_VERSION: v0.59.1
 
 jobs:
  collectInputs:
@@ -18,11 +18,11 @@ jobs:
  directories: ${{ steps.dirs.outputs.directories }}
  steps:
  - name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
 
  - name: Get root directories
  id: dirs
- uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
+ uses: clowdhaus/terraform-composite-actions/directories@v1.14.0
 
  preCommitMinVersions:
  name: Min TF pre-commit
@@ -32,27 +32,49 @@ jobs:
  matrix:
  directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
  steps:
+ - name: Install rmz
+ uses: jaxxstorm/action-install-gh-release@v2.1.0
+ with:
+ repo: SUPERCILEX/fuc
+ asset-name: x86_64-unknown-linux-gnu-rmz
+ rename-to: rmz
+ chmod: 0755
+ extension-matching: disable
+
  # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
- - name: Delete huge unnecessary tools folder
+ - name: Delete unnecessary files
  run: |
- rm -rf /opt/hostedtoolcache/CodeQL
- rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
- rm -rf /opt/hostedtoolcache/Ruby
- rm -rf /opt/hostedtoolcache/go
+ formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
+ getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+
+ BEFORE=$(getAvailableSpace)
+
+ ln -s /opt/hostedtoolcache/SUPERCILEX/x86_64-unknown-linux-gnu-rmz/latest/linux-x64/rmz /usr/local/bin/rmz
+ rmz -f /opt/hostedtoolcache/CodeQL &
+ rmz -f /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk &
+ rmz -f /opt/hostedtoolcache/PyPy &
+ rmz -f /opt/hostedtoolcache/Ruby &
+ rmz -f /opt/hostedtoolcache/go &
+
+ wait
+
+ AFTER=$(getAvailableSpace)
+ SAVED=$((AFTER-BEFORE))
+ echo "=> Saved $(formatByteCount $SAVED)"
 
  - name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
 
  - name: Terraform min/max versions
  id: minMax
- uses: clowdhaus/terraform-min-max@v1.3.1
+ uses: clowdhaus/terraform-min-max@v2.1.0
  with:
  directory: ${{ matrix.directory }}
 
  - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
  # Run only validate pre-commit check on min version supported
  if: ${{ matrix.directory != '.' }}
- uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
+ uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
  with:
  terraform-version: ${{ steps.minMax.outputs.minVersion }}
  tflint-version: ${{ env.TFLINT_VERSION }}
@@ -61,7 +83,7 @@ jobs:
  - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
  # Run only validate pre-commit check on min version supported
  if: ${{ matrix.directory == '.' }}
- uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
+ uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
  with:
  terraform-version: ${{ steps.minMax.outputs.minVersion }}
  tflint-version: ${{ env.TFLINT_VERSION }}
@@ -72,26 +94,73 @@ jobs:
  runs-on: ubuntu-latest
  needs: collectInputs
  steps:
+ - name: Install rmz
+ uses: jaxxstorm/action-install-gh-release@v2.1.0
+ with:
+ repo: SUPERCILEX/fuc
+ asset-name: x86_64-unknown-linux-gnu-rmz
+ rename-to: rmz
+ chmod: 0755
+ extension-matching: disable
+
  # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
- - name: Delete huge unnecessary tools folder
+ - name: Delete unnecessary files
  run: |
- rm -rf /opt/hostedtoolcache/CodeQL
- rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
- rm -rf /opt/hostedtoolcache/Ruby
- rm -rf /opt/hostedtoolcache/go
+ formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
+ getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+
+ BEFORE=$(getAvailableSpace)
+
+ ln -s /opt/hostedtoolcache/SUPERCILEX/x86_64-unknown-linux-gnu-rmz/latest/linux-x64/rmz /usr/local/bin/rmz
+ rmz -f /opt/hostedtoolcache/CodeQL &
+ rmz -f /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk &
+ rmz -f /opt/hostedtoolcache/PyPy &
+ rmz -f /opt/hostedtoolcache/Ruby &
+ rmz -f /opt/hostedtoolcache/go &
+ sudo rmz -f /usr/local/lib/android &
+
+ if [[ ${{ github.repository }} == terraform-aws-modules/terraform-aws-security-group ]]; then
+ sudo rmz -f /usr/share/dotnet &
+ sudo rmz -f /usr/local/.ghcup &
+ sudo apt-get -qq remove -y 'azure-.*'
+ sudo apt-get -qq remove -y 'cpp-.*'
+ sudo apt-get -qq remove -y 'dotnet-runtime-.*'
+ sudo apt-get -qq remove -y 'google-.*'
+ sudo apt-get -qq remove -y 'libclang-.*'
+ sudo apt-get -qq remove -y 'libllvm.*'
+ sudo apt-get -qq remove -y 'llvm-.*'
+ sudo apt-get -qq remove -y 'mysql-.*'
+ sudo apt-get -qq remove -y 'postgresql-.*'
+ sudo apt-get -qq remove -y 'php.*'
+ sudo apt-get -qq remove -y 'temurin-.*'
+ sudo apt-get -qq remove -y kubectl firefox mono-devel
+ sudo apt-get -qq autoremove -y
+ sudo apt-get -qq clean
+ fi
+
+ wait
+
+ AFTER=$(getAvailableSpace)
+ SAVED=$((AFTER-BEFORE))
+ echo "=> Saved $(formatByteCount $SAVED)"
 
  - name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  repository: ${{github.event.pull_request.head.repo.full_name}}
 
  - name: Terraform min/max versions
  id: minMax
- uses: clowdhaus/terraform-min-max@v1.3.1
+ uses: clowdhaus/terraform-min-max@v2.1.0
+
+ - name: Hide template dir
+ # Special to this repo, we don't want to check this dir
+ if: ${{ github.repository == 'terraform-aws-modules/terraform-aws-security-group' }}
+ run: rm -rf modules/_templates
 
  - name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
- uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
+ uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
  with:
  terraform-version: ${{ steps.minMax.outputs.maxVersion }}
  tflint-version: ${{ env.TFLINT_VERSION }}

.github/workflows/release.yml

@@ -20,18 +20,26 @@ jobs:
  if: github.repository_owner == 'terraform-aws-modules'
  steps:
  - name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
  with:
  persist-credentials: false
  fetch-depth: 0
 
+ - name: Set correct Node.js version
+ uses: actions/setup-node@v6
+ with:
+ node-version: 24
+
+ - name: Install dependencies
+ run: |
+ npm install \
+ @semantic-release/changelog@6.0.3 \
+ @semantic-release/git@10.0.1 \
+ conventional-changelog-conventionalcommits@9.1.0
+
  - name: Release
- uses: cycjimmy/semantic-release-action@v4
+ uses: cycjimmy/semantic-release-action@v5
  with:
- semantic_version: 23.0.2
- extra_plugins: |
- @semantic-release/changelog@6.0.3
- @semantic-release/git@10.0.1
- conventional-changelog-conventionalcommits@7.0.2
+ semantic_version: 25.0.0
  env:
  GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

.github/workflows/stale-actions.yaml

@@ -7,7 +7,7 @@ jobs:
  stale:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/stale@v9
+ - uses: actions/stale@v10
  with:
  repo-token: ${{ secrets.GITHUB_TOKEN }}
  # Staling issues and PR's

.gitignore

@@ -27,3 +27,13 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
+
+# Lambda build artifacts
+builds/
+__pycache__/
+*.zip
+.tox
+
+# Local editors/macos files
+.DS_Store
+.idea

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/antonbabenko/pre-commit-terraform
- rev: v1.100.0
+ rev: v1.103.0
  hooks:
  - id: terraform_fmt
  - id: terraform_wrapper_module_for_each

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.1.4](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/compare/v6.1.3...v6.1.4) (2025-10-22)
+
+### Bug Fixes
+
+* Allow computed values for `name`, make `timeouts` dynamic/optional ([#461](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/issues/461)) ([baf0ba2](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/commit/baf0ba2a457690526e12d74e98e6c5599aff9774))
+
+## [6.1.3](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/compare/v6.1.2...v6.1.3) (2025-10-21)
+
+### Bug Fixes
+
+* Update CI workflow versions to latest ([#460](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/issues/460)) ([6fd0798](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/commit/6fd0798b625457c565c42109d65a80d09b255676))
+
 ## [6.1.2](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/compare/v6.1.1...v6.1.2) (2025-10-14)
 
 

README.md

@@ -275,7 +275,7 @@ No modules.
 | <a name="input_subnet_id"></a> [subnet\_id](#input\_subnet\_id) | The VPC Subnet ID to launch in | `string` | `null` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | A mapping of tags to assign to the resource | `map(string)` | `{}` | no |
 | <a name="input_tenancy"></a> [tenancy](#input\_tenancy) | The tenancy of the instance (if the instance is running in a VPC). Available values: default, dedicated, host | `string` | `null` | no |
-| <a name="input_timeouts"></a> [timeouts](#input\_timeouts) | Define maximum timeout for creating, updating, and deleting EC2 instance resources | `map(string)` | `{}` | no |
+| <a name="input_timeouts"></a> [timeouts](#input\_timeouts) | Define maximum timeout for creating, updating, and deleting EC2 instance resources | <pre>object({<br/> create = optional(string)<br/> update = optional(string)<br/> delete = optional(string)<br/> })</pre> | `null` | no |
 | <a name="input_user_data"></a> [user\_data](#input\_user\_data) | The user data to provide when launching the instance. Do not pass gzip-compressed data via this argument; see user\_data\_base64 instead | `string` | `null` | no |
 | <a name="input_user_data_base64"></a> [user\_data\_base64](#input\_user\_data\_base64) | Can be used instead of user\_data to pass base64-encoded binary data directly. Use this instead of user\_data whenever the value is not a valid UTF-8 string. For example, gzip-encoded user data must be base64-encoded and passed via this argument to avoid corruption | `string` | `null` | no |
 | <a name="input_user_data_replace_on_change"></a> [user\_data\_replace\_on\_change](#input\_user\_data\_replace\_on\_change) | When used in combination with user\_data or user\_data\_base64 will trigger a destroy and recreate when set to true. Defaults to false if not set | `bool` | `null` | no |

examples/complete/README.md

@@ -21,18 +21,21 @@ Note that this example may create resources which can cost money. Run `terraform
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | >= 3.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_ec2_complete"></a> [ec2\_complete](#module\_ec2\_complete) | ../../ | n/a |
+| <a name="module_ec2_computed_name"></a> [ec2\_computed\_name](#module\_ec2\_computed\_name) | ../../ | n/a |
 | <a name="module_ec2_disabled"></a> [ec2\_disabled](#module\_ec2\_disabled) | ../../ | n/a |
 | <a name="module_ec2_ignore_ami_changes"></a> [ec2\_ignore\_ami\_changes](#module\_ec2\_ignore\_ami\_changes) | ../../ | n/a |
 | <a name="module_ec2_metadata_options"></a> [ec2\_metadata\_options](#module\_ec2\_metadata\_options) | ../../ | n/a |
@@ -55,6 +58,7 @@ Note that this example may create resources which can cost money. Run `terraform
 | [aws_kms_key.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key) | resource |
 | [aws_network_interface.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/network_interface) | resource |
 | [aws_placement_group.web](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/placement_group) | resource |
+| [random_string.suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
 | [aws_ami.amazon_linux](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
 | [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
 

examples/complete/main.tf

@@ -146,6 +146,22 @@ module "ec2_t3_unlimited" {
  tags = local.tags
 }
 
+# https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/issues/456
+module "ec2_computed_name" {
+ source = "../../"
+
+ name = join("-", [local.name, random_string.suffix.result])
+
+ ignore_ami_changes = true
+ ami = data.aws_ami.amazon_linux.id
+
+ instance_type = "t3.micro"
+ availability_zone = element(module.vpc.azs, 0)
+ subnet_id = element(module.vpc.private_subnets, 0)
+
+ tags = local.tags
+}
+
 module "ec2_disabled" {
  source = "../../"
 
@@ -383,3 +399,10 @@ resource "aws_network_interface" "this" {
  subnet_id = element(module.vpc.private_subnets, 0)
  security_groups = [module.security_group.security_group_id]
 }
+
+resource "random_string" "suffix" {
+ length = 2
+ numeric = false
+ upper = false
+ special = false
+}