Skip to content

Commit 243808a

Browse files
bryantbiggsbryantbiggs
authored
fix: Update CI workflow versions to remove deprecated runtime warnings (#84)
1 parent 6f55029 commit 243808a

File tree

8 files changed

+73
-50
lines changed

8 files changed

+73
-50
lines changed

‎.github/workflows/lock.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
lock:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: dessant/lock-threads@v4
11+
- uses: dessant/lock-threads@v5
1212
with:
1313
github-token: ${{ secrets.GITHUB_TOKEN }}
1414
issue-comment: >

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

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

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
env:
1010
TERRAFORM_DOCS_VERSION: v0.16.0
11+
TFLINT_VERSION: v0.50.3
1112

1213
jobs:
1314
collectInputs:
@@ -17,11 +18,11 @@ jobs:
1718
directories: ${{ steps.dirs.outputs.directories }}
1819
steps:
1920
- name: Checkout
20-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2122

2223
- name: Get root directories
2324
id: dirs
24-
uses: clowdhaus/terraform-composite-actions/directories@v1.8.2
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
2526

2627
preCommitMinVersions:
2728
name: Min TF pre-commit
@@ -31,49 +32,68 @@ jobs:
3132
matrix:
3233
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3334
steps:
35+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
36+
- name: Delete huge unnecessary tools folder
37+
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
42+
3443
- name: Checkout
35-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
3645

3746
- name: Terraform min/max versions
3847
id: minMax
39-
uses: clowdhaus/terraform-min-max@v1.2.4
48+
uses: clowdhaus/terraform-min-max@v1.3.0
4049
with:
4150
directory: ${{ matrix.directory }}
4251

4352
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4453
# Run only validate pre-commit check on min version supported
4554
if: ${{ matrix.directory != '.' }}
46-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.2
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
4756
with:
4857
terraform-version: ${{ steps.minMax.outputs.minVersion }}
58+
tflint-version: ${{ env.TFLINT_VERSION }}
4959
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
5060

5161
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5262
# Run only validate pre-commit check on min version supported
5363
if: ${{ matrix.directory == '.' }}
54-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.2
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
5565
with:
5666
terraform-version: ${{ steps.minMax.outputs.minVersion }}
67+
tflint-version: ${{ env.TFLINT_VERSION }}
5768
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
5869

5970
preCommitMaxVersion:
6071
name: Max TF pre-commit
6172
runs-on: ubuntu-latest
6273
needs: collectInputs
6374
steps:
75+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
76+
- name: Delete huge unnecessary tools folder
77+
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
82+
6483
- name: Checkout
65-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
6685
with:
6786
ref: ${{ github.event.pull_request.head.ref }}
6887
repository: ${{github.event.pull_request.head.repo.full_name}}
6988

7089
- name: Terraform min/max versions
7190
id: minMax
72-
uses: clowdhaus/terraform-min-max@v1.2.4
91+
uses: clowdhaus/terraform-min-max@v1.3.0
7392

7493
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
75-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.2
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
7695
with:
7796
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
97+
tflint-version: ${{ env.TFLINT_VERSION }}
7898
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
7999
install-hcledit: true

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7+
- main
78
- master
89
paths:
910
- '**/*.tpl'
@@ -19,18 +20,18 @@ jobs:
1920
if: github.repository_owner == 'terraform-aws-modules'
2021
steps:
2122
- name: Checkout
22-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2324
with:
2425
persist-credentials: false
2526
fetch-depth: 0
2627

2728
- name: Release
28-
uses: cycjimmy/semantic-release-action@v3
29+
uses: cycjimmy/semantic-release-action@v4
2930
with:
30-
semantic_version: 18.0.0
31+
semantic_version: 23.0.2
3132
extra_plugins: |
32-
@semantic-release/[email protected].0
33-
@semantic-release/[email protected].0
34-
conventional-changelog-conventionalcommits@4.6.3
33+
@semantic-release/[email protected].3
34+
@semantic-release/[email protected].1
35+
conventional-changelog-conventionalcommits@7.0.2
3536
env:
3637
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@v6
10+
- uses: actions/stale@v9
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.76.0
3+
rev: v1.88.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each
7-
- id: terraform_validate
87
- id: terraform_docs
98
args:
109
- '--args=--lockfile=false'
@@ -23,8 +22,11 @@ repos:
2322
- '--args=--only=terraform_required_providers'
2423
- '--args=--only=terraform_standard_module_structure'
2524
- '--args=--only=terraform_workspace_remote'
25+
- '--args=--only=terraform_unused_required_providers'
26+
- id: terraform_validate
2627
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v4.3.0
28+
rev: v4.5.0
2829
hooks:
2930
- id: check-merge-conflict
3031
- id: end-of-file-fixer
32+
- id: trailing-whitespace

‎wrappers/main.tf‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@ module "wrapper" {
33

44
for_each = var.items
55

6-
create_table = try(each.value.create_table, var.defaults.create_table, true)
7-
name = try(each.value.name, var.defaults.name, null)
8-
attributes = try(each.value.attributes, var.defaults.attributes, [])
9-
hash_key = try(each.value.hash_key, var.defaults.hash_key, null)
10-
range_key = try(each.value.range_key, var.defaults.range_key, null)
11-
billing_mode = try(each.value.billing_mode, var.defaults.billing_mode, "PAY_PER_REQUEST")
12-
write_capacity = try(each.value.write_capacity, var.defaults.write_capacity, null)
13-
read_capacity = try(each.value.read_capacity, var.defaults.read_capacity, null)
14-
point_in_time_recovery_enabled = try(each.value.point_in_time_recovery_enabled, var.defaults.point_in_time_recovery_enabled, false)
15-
ttl_enabled = try(each.value.ttl_enabled, var.defaults.ttl_enabled, false)
16-
ttl_attribute_name = try(each.value.ttl_attribute_name, var.defaults.ttl_attribute_name, "")
17-
global_secondary_indexes = try(each.value.global_secondary_indexes, var.defaults.global_secondary_indexes, [])
18-
local_secondary_indexes = try(each.value.local_secondary_indexes, var.defaults.local_secondary_indexes, [])
19-
replica_regions = try(each.value.replica_regions, var.defaults.replica_regions, [])
20-
stream_enabled = try(each.value.stream_enabled, var.defaults.stream_enabled, false)
21-
stream_view_type = try(each.value.stream_view_type, var.defaults.stream_view_type, null)
22-
server_side_encryption_enabled = try(each.value.server_side_encryption_enabled, var.defaults.server_side_encryption_enabled, false)
23-
server_side_encryption_kms_key_arn = try(each.value.server_side_encryption_kms_key_arn, var.defaults.server_side_encryption_kms_key_arn, null)
24-
tags = try(each.value.tags, var.defaults.tags, {})
25-
timeouts = try(each.value.timeouts, var.defaults.timeouts, {
26-
create = "10m"
27-
update = "60m"
28-
delete = "10m"
29-
})
30-
autoscaling_enabled = try(each.value.autoscaling_enabled, var.defaults.autoscaling_enabled, false)
6+
attributes = try(each.value.attributes, var.defaults.attributes, [])
317
autoscaling_defaults = try(each.value.autoscaling_defaults, var.defaults.autoscaling_defaults, {
328
scale_in_cooldown = 0
339
scale_out_cooldown = 0
3410
target_value = 70
3511
})
12+
autoscaling_enabled = try(each.value.autoscaling_enabled, var.defaults.autoscaling_enabled, false)
13+
autoscaling_indexes = try(each.value.autoscaling_indexes, var.defaults.autoscaling_indexes, {})
3614
autoscaling_read = try(each.value.autoscaling_read, var.defaults.autoscaling_read, {})
3715
autoscaling_write = try(each.value.autoscaling_write, var.defaults.autoscaling_write, {})
38-
autoscaling_indexes = try(each.value.autoscaling_indexes, var.defaults.autoscaling_indexes, {})
39-
table_class = try(each.value.table_class, var.defaults.table_class, null)
16+
billing_mode = try(each.value.billing_mode, var.defaults.billing_mode, "PAY_PER_REQUEST")
17+
create_table = try(each.value.create_table, var.defaults.create_table, true)
4018
deletion_protection_enabled = try(each.value.deletion_protection_enabled, var.defaults.deletion_protection_enabled, null)
41-
import_table = try(each.value.import_table, var.defaults.import_table, {})
19+
global_secondary_indexes = try(each.value.global_secondary_indexes, var.defaults.global_secondary_indexes, [])
20+
hash_key = try(each.value.hash_key, var.defaults.hash_key, null)
4221
ignore_changes_global_secondary_index = try(each.value.ignore_changes_global_secondary_index, var.defaults.ignore_changes_global_secondary_index, false)
22+
import_table = try(each.value.import_table, var.defaults.import_table, {})
23+
local_secondary_indexes = try(each.value.local_secondary_indexes, var.defaults.local_secondary_indexes, [])
24+
name = try(each.value.name, var.defaults.name, null)
25+
point_in_time_recovery_enabled = try(each.value.point_in_time_recovery_enabled, var.defaults.point_in_time_recovery_enabled, false)
26+
range_key = try(each.value.range_key, var.defaults.range_key, null)
27+
read_capacity = try(each.value.read_capacity, var.defaults.read_capacity, null)
28+
replica_regions = try(each.value.replica_regions, var.defaults.replica_regions, [])
29+
server_side_encryption_enabled = try(each.value.server_side_encryption_enabled, var.defaults.server_side_encryption_enabled, false)
30+
server_side_encryption_kms_key_arn = try(each.value.server_side_encryption_kms_key_arn, var.defaults.server_side_encryption_kms_key_arn, null)
31+
stream_enabled = try(each.value.stream_enabled, var.defaults.stream_enabled, false)
32+
stream_view_type = try(each.value.stream_view_type, var.defaults.stream_view_type, null)
33+
table_class = try(each.value.table_class, var.defaults.table_class, null)
34+
tags = try(each.value.tags, var.defaults.tags, {})
35+
timeouts = try(each.value.timeouts, var.defaults.timeouts, {
36+
create = "10m"
37+
update = "60m"
38+
delete = "10m"
39+
})
40+
ttl_attribute_name = try(each.value.ttl_attribute_name, var.defaults.ttl_attribute_name, "")
41+
ttl_enabled = try(each.value.ttl_enabled, var.defaults.ttl_enabled, false)
42+
write_capacity = try(each.value.write_capacity, var.defaults.write_capacity, null)
4343
}

‎wrappers/outputs.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
output "wrapper" {
22
description = "Map of outputs of a wrapper."
33
value = module.wrapper
4-
# sensitive = false # No sensitive module output found
4+
# sensitive = false # No sensitive module output found
55
}

0 commit comments

Comments
 (0)