Skip to content

Commit

Permalink
fix: Update CI workflow versions to remove deprecated runtime warnings (
Browse files Browse the repository at this point in the history
  • Loading branch information
bryantbiggs committed Mar 6, 2024
1 parent e3af3f6 commit 1e2e703
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
36 changes: 26 additions & 10 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
TERRAFORM_DOCS_VERSION: v0.16.0
TFLINT_VERSION: v0.44.1
TFLINT_VERSION: v0.50.3

jobs:
collectInputs:
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,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 }}
2 changes: 1 addition & 1 deletion .github/workflows/stale-actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
50 changes: 25 additions & 25 deletions wrappers/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,44 @@ module "wrapper" {

for_each = var.items

create = try(each.value.create, var.defaults.create, true)
content_based_deduplication = try(each.value.content_based_deduplication, var.defaults.content_based_deduplication, null)
create = try(each.value.create, var.defaults.create, true)
create_dlq = try(each.value.create_dlq, var.defaults.create_dlq, false)
create_dlq_queue_policy = try(each.value.create_dlq_queue_policy, var.defaults.create_dlq_queue_policy, false)
create_dlq_redrive_allow_policy = try(each.value.create_dlq_redrive_allow_policy, var.defaults.create_dlq_redrive_allow_policy, true)
create_queue_policy = try(each.value.create_queue_policy, var.defaults.create_queue_policy, false)
deduplication_scope = try(each.value.deduplication_scope, var.defaults.deduplication_scope, null)
delay_seconds = try(each.value.delay_seconds, var.defaults.delay_seconds, null)
fifo_queue = try(each.value.fifo_queue, var.defaults.fifo_queue, false)
fifo_throughput_limit = try(each.value.fifo_throughput_limit, var.defaults.fifo_throughput_limit, null)
kms_data_key_reuse_period_seconds = try(each.value.kms_data_key_reuse_period_seconds, var.defaults.kms_data_key_reuse_period_seconds, null)
kms_master_key_id = try(each.value.kms_master_key_id, var.defaults.kms_master_key_id, null)
max_message_size = try(each.value.max_message_size, var.defaults.max_message_size, null)
message_retention_seconds = try(each.value.message_retention_seconds, var.defaults.message_retention_seconds, null)
name = try(each.value.name, var.defaults.name, null)
use_name_prefix = try(each.value.use_name_prefix, var.defaults.use_name_prefix, false)
receive_wait_time_seconds = try(each.value.receive_wait_time_seconds, var.defaults.receive_wait_time_seconds, null)
redrive_allow_policy = try(each.value.redrive_allow_policy, var.defaults.redrive_allow_policy, {})
redrive_policy = try(each.value.redrive_policy, var.defaults.redrive_policy, {})
sqs_managed_sse_enabled = try(each.value.sqs_managed_sse_enabled, var.defaults.sqs_managed_sse_enabled, true)
visibility_timeout_seconds = try(each.value.visibility_timeout_seconds, var.defaults.visibility_timeout_seconds, null)
tags = try(each.value.tags, var.defaults.tags, {})
create_queue_policy = try(each.value.create_queue_policy, var.defaults.create_queue_policy, false)
source_queue_policy_documents = try(each.value.source_queue_policy_documents, var.defaults.source_queue_policy_documents, [])
override_queue_policy_documents = try(each.value.override_queue_policy_documents, var.defaults.override_queue_policy_documents, [])
queue_policy_statements = try(each.value.queue_policy_statements, var.defaults.queue_policy_statements, {})
create_dlq = try(each.value.create_dlq, var.defaults.create_dlq, false)
dlq_content_based_deduplication = try(each.value.dlq_content_based_deduplication, var.defaults.dlq_content_based_deduplication, null)
dlq_deduplication_scope = try(each.value.dlq_deduplication_scope, var.defaults.dlq_deduplication_scope, null)
dlq_delay_seconds = try(each.value.dlq_delay_seconds, var.defaults.dlq_delay_seconds, null)
dlq_kms_data_key_reuse_period_seconds = try(each.value.dlq_kms_data_key_reuse_period_seconds, var.defaults.dlq_kms_data_key_reuse_period_seconds, null)
dlq_kms_master_key_id = try(each.value.dlq_kms_master_key_id, var.defaults.dlq_kms_master_key_id, null)
dlq_message_retention_seconds = try(each.value.dlq_message_retention_seconds, var.defaults.dlq_message_retention_seconds, null)
dlq_name = try(each.value.dlq_name, var.defaults.dlq_name, null)
dlq_queue_policy_statements = try(each.value.dlq_queue_policy_statements, var.defaults.dlq_queue_policy_statements, {})
dlq_receive_wait_time_seconds = try(each.value.dlq_receive_wait_time_seconds, var.defaults.dlq_receive_wait_time_seconds, null)
create_dlq_redrive_allow_policy = try(each.value.create_dlq_redrive_allow_policy, var.defaults.create_dlq_redrive_allow_policy, true)
dlq_redrive_allow_policy = try(each.value.dlq_redrive_allow_policy, var.defaults.dlq_redrive_allow_policy, {})
dlq_sqs_managed_sse_enabled = try(each.value.dlq_sqs_managed_sse_enabled, var.defaults.dlq_sqs_managed_sse_enabled, true)
dlq_visibility_timeout_seconds = try(each.value.dlq_visibility_timeout_seconds, var.defaults.dlq_visibility_timeout_seconds, null)
dlq_tags = try(each.value.dlq_tags, var.defaults.dlq_tags, {})
create_dlq_queue_policy = try(each.value.create_dlq_queue_policy, var.defaults.create_dlq_queue_policy, false)
source_dlq_queue_policy_documents = try(each.value.source_dlq_queue_policy_documents, var.defaults.source_dlq_queue_policy_documents, [])
dlq_visibility_timeout_seconds = try(each.value.dlq_visibility_timeout_seconds, var.defaults.dlq_visibility_timeout_seconds, null)
fifo_queue = try(each.value.fifo_queue, var.defaults.fifo_queue, false)
fifo_throughput_limit = try(each.value.fifo_throughput_limit, var.defaults.fifo_throughput_limit, null)
kms_data_key_reuse_period_seconds = try(each.value.kms_data_key_reuse_period_seconds, var.defaults.kms_data_key_reuse_period_seconds, null)
kms_master_key_id = try(each.value.kms_master_key_id, var.defaults.kms_master_key_id, null)
max_message_size = try(each.value.max_message_size, var.defaults.max_message_size, null)
message_retention_seconds = try(each.value.message_retention_seconds, var.defaults.message_retention_seconds, null)
name = try(each.value.name, var.defaults.name, null)
override_dlq_queue_policy_documents = try(each.value.override_dlq_queue_policy_documents, var.defaults.override_dlq_queue_policy_documents, [])
dlq_queue_policy_statements = try(each.value.dlq_queue_policy_statements, var.defaults.dlq_queue_policy_statements, {})
override_queue_policy_documents = try(each.value.override_queue_policy_documents, var.defaults.override_queue_policy_documents, [])
queue_policy_statements = try(each.value.queue_policy_statements, var.defaults.queue_policy_statements, {})
receive_wait_time_seconds = try(each.value.receive_wait_time_seconds, var.defaults.receive_wait_time_seconds, null)
redrive_allow_policy = try(each.value.redrive_allow_policy, var.defaults.redrive_allow_policy, {})
redrive_policy = try(each.value.redrive_policy, var.defaults.redrive_policy, {})
source_dlq_queue_policy_documents = try(each.value.source_dlq_queue_policy_documents, var.defaults.source_dlq_queue_policy_documents, [])
source_queue_policy_documents = try(each.value.source_queue_policy_documents, var.defaults.source_queue_policy_documents, [])
sqs_managed_sse_enabled = try(each.value.sqs_managed_sse_enabled, var.defaults.sqs_managed_sse_enabled, true)
tags = try(each.value.tags, var.defaults.tags, {})
use_name_prefix = try(each.value.use_name_prefix, var.defaults.use_name_prefix, false)
visibility_timeout_seconds = try(each.value.visibility_timeout_seconds, var.defaults.visibility_timeout_seconds, null)
}
2 changes: 1 addition & 1 deletion wrappers/outputs.tf
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 1e2e703

Please sign in to comment.