From 859fb3c606855913d5bb7379bbdbdbedbd2970d9 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Wed, 6 Mar 2024 13:19:58 -0500 Subject: [PATCH 1/2] fix: Update CI workflow versions to remove deprecated runtime warnings (#151) --- .github/workflows/lock.yml | 2 +- .github/workflows/pr-title.yml | 2 +- .github/workflows/pre-commit.yml | 36 ++++++++++++++++++++-------- .github/workflows/release.yml | 13 +++++----- .github/workflows/stale-actions.yaml | 2 +- .pre-commit-config.yaml | 8 ++++--- README.md | 2 +- wrappers/main.tf | 24 +++++++++---------- wrappers/outputs.tf | 2 +- 9 files changed, 55 insertions(+), 36 deletions(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 6b6c9ce..bd5f2df 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -8,7 +8,7 @@ jobs: lock: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v4 + - uses: dessant/lock-threads@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} issue-comment: > diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml index cb32a0f..3973df4 100644 --- a/.github/workflows/pr-title.yml +++ b/.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.0.2 + - uses: amannn/action-semantic-pull-request@v5.4.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index cb82671..c2632d1 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -8,7 +8,7 @@ on: env: TERRAFORM_DOCS_VERSION: v0.16.0 - TFLINT_VERSION: v0.44.1 + TFLINT_VERSION: v0.50.3 jobs: collectInputs: @@ -18,11 +18,11 @@ jobs: directories: ${{ steps.dirs.outputs.directories }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get root directories id: dirs - uses: clowdhaus/terraform-composite-actions/directories@v1.8.3 + uses: clowdhaus/terraform-composite-actions/directories@v1.9.0 preCommitMinVersions: name: Min TF pre-commit @@ -32,19 +32,27 @@ jobs: matrix: directory: ${{ fromJson(needs.collectInputs.outputs.directories) }} steps: + # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449 + - name: Delete huge unnecessary tools folder + run: | + rm -rf /opt/hostedtoolcache/CodeQL + rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk + rm -rf /opt/hostedtoolcache/Ruby + rm -rf /opt/hostedtoolcache/go + - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Terraform min/max versions id: minMax - uses: clowdhaus/terraform-min-max@v1.2.4 + uses: clowdhaus/terraform-min-max@v1.3.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.8.3 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0 with: terraform-version: ${{ steps.minMax.outputs.minVersion }} tflint-version: ${{ env.TFLINT_VERSION }} @@ -53,7 +61,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.8.3 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0 with: terraform-version: ${{ steps.minMax.outputs.minVersion }} tflint-version: ${{ env.TFLINT_VERSION }} @@ -64,18 +72,26 @@ jobs: runs-on: ubuntu-latest needs: collectInputs steps: + # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449 + - name: Delete huge unnecessary tools folder + run: | + rm -rf /opt/hostedtoolcache/CodeQL + rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk + rm -rf /opt/hostedtoolcache/Ruby + rm -rf /opt/hostedtoolcache/go + - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 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.2.4 + uses: clowdhaus/terraform-min-max@v1.3.0 - name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }} - uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0 with: terraform-version: ${{ steps.minMax.outputs.maxVersion }} tflint-version: ${{ env.TFLINT_VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68c0179..4a94226 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ on: workflow_dispatch: push: branches: + - main - master paths: - '**/*.tpl' @@ -19,18 +20,18 @@ jobs: if: github.repository_owner == 'terraform-aws-modules' steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false fetch-depth: 0 - name: Release - uses: cycjimmy/semantic-release-action@v3 + uses: cycjimmy/semantic-release-action@v4 with: - semantic_version: 18.0.0 + semantic_version: 23.0.2 extra_plugins: | - @semantic-release/changelog@6.0.0 - @semantic-release/git@10.0.0 - conventional-changelog-conventionalcommits@4.6.3 + @semantic-release/changelog@6.0.3 + @semantic-release/git@10.0.1 + conventional-changelog-conventionalcommits@7.0.2 env: GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }} diff --git a/.github/workflows/stale-actions.yaml b/.github/workflows/stale-actions.yaml index 5037995..6ccd0ed 100644 --- a/.github/workflows/stale-actions.yaml +++ b/.github/workflows/stale-actions.yaml @@ -7,7 +7,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v6 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # Staling issues and PR's diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 75deea3..7c0a310 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,10 +1,9 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.77.0 + rev: v1.88.0 hooks: - id: terraform_fmt - id: terraform_wrapper_module_for_each - - id: terraform_validate - id: terraform_docs args: - '--args=--lockfile=false' @@ -23,8 +22,11 @@ repos: - '--args=--only=terraform_required_providers' - '--args=--only=terraform_standard_module_structure' - '--args=--only=terraform_workspace_remote' + - '--args=--only=terraform_unused_required_providers' + - id: terraform_validate - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-merge-conflict - id: end-of-file-fixer + - id: trailing-whitespace diff --git a/README.md b/README.md index d80f7de..83764a2 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ module "acm" { domain_name = "my-domain.com" zone_id = "Z2ES7B9AZ6SHAE" - + validation_method = "DNS" subject_alternative_names = [ diff --git a/wrappers/main.tf b/wrappers/main.tf index cf46698..108f4e1 100644 --- a/wrappers/main.tf +++ b/wrappers/main.tf @@ -3,24 +3,24 @@ module "wrapper" { for_each = var.items + acm_certificate_domain_validation_options = try(each.value.acm_certificate_domain_validation_options, var.defaults.acm_certificate_domain_validation_options, {}) + certificate_transparency_logging_preference = try(each.value.certificate_transparency_logging_preference, var.defaults.certificate_transparency_logging_preference, true) create_certificate = try(each.value.create_certificate, var.defaults.create_certificate, true) + create_route53_records = try(each.value.create_route53_records, var.defaults.create_route53_records, true) create_route53_records_only = try(each.value.create_route53_records_only, var.defaults.create_route53_records_only, false) - validate_certificate = try(each.value.validate_certificate, var.defaults.validate_certificate, true) - validation_allow_overwrite_records = try(each.value.validation_allow_overwrite_records, var.defaults.validation_allow_overwrite_records, true) - wait_for_validation = try(each.value.wait_for_validation, var.defaults.wait_for_validation, true) - validation_timeout = try(each.value.validation_timeout, var.defaults.validation_timeout, null) - certificate_transparency_logging_preference = try(each.value.certificate_transparency_logging_preference, var.defaults.certificate_transparency_logging_preference, true) + distinct_domain_names = try(each.value.distinct_domain_names, var.defaults.distinct_domain_names, []) + dns_ttl = try(each.value.dns_ttl, var.defaults.dns_ttl, 60) domain_name = try(each.value.domain_name, var.defaults.domain_name, "") + key_algorithm = try(each.value.key_algorithm, var.defaults.key_algorithm, null) + putin_khuylo = try(each.value.putin_khuylo, var.defaults.putin_khuylo, true) subject_alternative_names = try(each.value.subject_alternative_names, var.defaults.subject_alternative_names, []) + tags = try(each.value.tags, var.defaults.tags, {}) + validate_certificate = try(each.value.validate_certificate, var.defaults.validate_certificate, true) + validation_allow_overwrite_records = try(each.value.validation_allow_overwrite_records, var.defaults.validation_allow_overwrite_records, true) validation_method = try(each.value.validation_method, var.defaults.validation_method, null) validation_option = try(each.value.validation_option, var.defaults.validation_option, {}) - create_route53_records = try(each.value.create_route53_records, var.defaults.create_route53_records, true) validation_record_fqdns = try(each.value.validation_record_fqdns, var.defaults.validation_record_fqdns, []) + validation_timeout = try(each.value.validation_timeout, var.defaults.validation_timeout, null) + wait_for_validation = try(each.value.wait_for_validation, var.defaults.wait_for_validation, true) zone_id = try(each.value.zone_id, var.defaults.zone_id, "") - tags = try(each.value.tags, var.defaults.tags, {}) - dns_ttl = try(each.value.dns_ttl, var.defaults.dns_ttl, 60) - acm_certificate_domain_validation_options = try(each.value.acm_certificate_domain_validation_options, var.defaults.acm_certificate_domain_validation_options, {}) - distinct_domain_names = try(each.value.distinct_domain_names, var.defaults.distinct_domain_names, []) - key_algorithm = try(each.value.key_algorithm, var.defaults.key_algorithm, null) - putin_khuylo = try(each.value.putin_khuylo, var.defaults.putin_khuylo, true) } diff --git a/wrappers/outputs.tf b/wrappers/outputs.tf index 5da7c09..ec6da5f 100644 --- a/wrappers/outputs.tf +++ b/wrappers/outputs.tf @@ -1,5 +1,5 @@ output "wrapper" { description = "Map of outputs of a wrapper." value = module.wrapper - # sensitive = false # No sensitive module output found + # sensitive = false # No sensitive module output found } From f421377c87fe5207898adc0def87540fa07c2af4 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 6 Mar 2024 18:20:29 +0000 Subject: [PATCH 2/2] chore(release): version 5.0.1 [skip ci] ## [5.0.1](https://github.com/terraform-aws-modules/terraform-aws-acm/compare/v5.0.0...v5.0.1) (2024-03-06) ### Bug Fixes * Update CI workflow versions to remove deprecated runtime warnings ([#151](https://github.com/terraform-aws-modules/terraform-aws-acm/issues/151)) ([859fb3c](https://github.com/terraform-aws-modules/terraform-aws-acm/commit/859fb3c606855913d5bb7379bbdbdbedbd2970d9)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52f6f8f..c9a4d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## [5.0.1](https://github.com/terraform-aws-modules/terraform-aws-acm/compare/v5.0.0...v5.0.1) (2024-03-06) + + +### Bug Fixes + +* Update CI workflow versions to remove deprecated runtime warnings ([#151](https://github.com/terraform-aws-modules/terraform-aws-acm/issues/151)) ([859fb3c](https://github.com/terraform-aws-modules/terraform-aws-acm/commit/859fb3c606855913d5bb7379bbdbdbedbd2970d9)) + ## [5.0.0](https://github.com/terraform-aws-modules/terraform-aws-acm/compare/v4.5.0...v5.0.0) (2023-10-05)