Skip to content

Commit 859fb3c

Browse files
bryantbiggsbryantbiggs
authoredMar 6, 2024··
fix: Update CI workflow versions to remove deprecated runtime warnings (#151)
·
v5.1.1v5.0.1
1 parent 8d0b22f commit 859fb3c

File tree

9 files changed

+55
-36
lines changed

9 files changed

+55
-36
lines changed
 

‎.github/workflows/lock.yml

+1-1
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

+1-1
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

+26-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
TERRAFORM_DOCS_VERSION: v0.16.0
11-
TFLINT_VERSION: v0.44.1
11+
TFLINT_VERSION: v0.50.3
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@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Get root directories
2424
id: dirs
25-
uses: clowdhaus/terraform-composite-actions/directories@v1.8.3
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
2626

2727
preCommitMinVersions:
2828
name: Min TF pre-commit
@@ -32,19 +32,27 @@ jobs:
3232
matrix:
3333
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3434
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+
3543
- name: Checkout
36-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
3745

3846
- name: Terraform min/max versions
3947
id: minMax
40-
uses: clowdhaus/terraform-min-max@v1.2.4
48+
uses: clowdhaus/terraform-min-max@v1.3.0
4149
with:
4250
directory: ${{ matrix.directory }}
4351

4452
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4553
# Run only validate pre-commit check on min version supported
4654
if: ${{ matrix.directory != '.' }}
47-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
4856
with:
4957
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5058
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -53,7 +61,7 @@ jobs:
5361
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5462
# Run only validate pre-commit check on min version supported
5563
if: ${{ matrix.directory == '.' }}
56-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
5765
with:
5866
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5967
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -64,18 +72,26 @@ jobs:
6472
runs-on: ubuntu-latest
6573
needs: collectInputs
6674
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+
6783
- name: Checkout
68-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
6985
with:
7086
ref: ${{ github.event.pull_request.head.ref }}
7187
repository: ${{github.event.pull_request.head.repo.full_name}}
7288

7389
- name: Terraform min/max versions
7490
id: minMax
75-
uses: clowdhaus/terraform-min-max@v1.2.4
91+
uses: clowdhaus/terraform-min-max@v1.3.0
7692

7793
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
78-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
7995
with:
8096
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
8197
tflint-version: ${{ env.TFLINT_VERSION }}

‎.github/workflows/release.yml

+7-6
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/changelog@6.0.0
33-
@semantic-release/git@10.0.0
34-
conventional-changelog-conventionalcommits@4.6.3
33+
@semantic-release/changelog@6.0.3
34+
@semantic-release/git@10.0.1
35+
conventional-changelog-conventionalcommits@7.0.2
3536
env:
3637
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

‎.github/workflows/stale-actions.yaml

+1-1
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

+5-3
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.77.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.4.0
28+
rev: v4.5.0
2829
hooks:
2930
- id: check-merge-conflict
3031
- id: end-of-file-fixer
32+
- id: trailing-whitespace

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module "acm" {
1313
1414
domain_name = "my-domain.com"
1515
zone_id = "Z2ES7B9AZ6SHAE"
16-
16+
1717
validation_method = "DNS"
1818
1919
subject_alternative_names = [

‎wrappers/main.tf

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ module "wrapper" {
33

44
for_each = var.items
55

6+
acm_certificate_domain_validation_options = try(each.value.acm_certificate_domain_validation_options, var.defaults.acm_certificate_domain_validation_options, {})
7+
certificate_transparency_logging_preference = try(each.value.certificate_transparency_logging_preference, var.defaults.certificate_transparency_logging_preference, true)
68
create_certificate = try(each.value.create_certificate, var.defaults.create_certificate, true)
9+
create_route53_records = try(each.value.create_route53_records, var.defaults.create_route53_records, true)
710
create_route53_records_only = try(each.value.create_route53_records_only, var.defaults.create_route53_records_only, false)
8-
validate_certificate = try(each.value.validate_certificate, var.defaults.validate_certificate, true)
9-
validation_allow_overwrite_records = try(each.value.validation_allow_overwrite_records, var.defaults.validation_allow_overwrite_records, true)
10-
wait_for_validation = try(each.value.wait_for_validation, var.defaults.wait_for_validation, true)
11-
validation_timeout = try(each.value.validation_timeout, var.defaults.validation_timeout, null)
12-
certificate_transparency_logging_preference = try(each.value.certificate_transparency_logging_preference, var.defaults.certificate_transparency_logging_preference, true)
11+
distinct_domain_names = try(each.value.distinct_domain_names, var.defaults.distinct_domain_names, [])
12+
dns_ttl = try(each.value.dns_ttl, var.defaults.dns_ttl, 60)
1313
domain_name = try(each.value.domain_name, var.defaults.domain_name, "")
14+
key_algorithm = try(each.value.key_algorithm, var.defaults.key_algorithm, null)
15+
putin_khuylo = try(each.value.putin_khuylo, var.defaults.putin_khuylo, true)
1416
subject_alternative_names = try(each.value.subject_alternative_names, var.defaults.subject_alternative_names, [])
17+
tags = try(each.value.tags, var.defaults.tags, {})
18+
validate_certificate = try(each.value.validate_certificate, var.defaults.validate_certificate, true)
19+
validation_allow_overwrite_records = try(each.value.validation_allow_overwrite_records, var.defaults.validation_allow_overwrite_records, true)
1520
validation_method = try(each.value.validation_method, var.defaults.validation_method, null)
1621
validation_option = try(each.value.validation_option, var.defaults.validation_option, {})
17-
create_route53_records = try(each.value.create_route53_records, var.defaults.create_route53_records, true)
1822
validation_record_fqdns = try(each.value.validation_record_fqdns, var.defaults.validation_record_fqdns, [])
23+
validation_timeout = try(each.value.validation_timeout, var.defaults.validation_timeout, null)
24+
wait_for_validation = try(each.value.wait_for_validation, var.defaults.wait_for_validation, true)
1925
zone_id = try(each.value.zone_id, var.defaults.zone_id, "")
20-
tags = try(each.value.tags, var.defaults.tags, {})
21-
dns_ttl = try(each.value.dns_ttl, var.defaults.dns_ttl, 60)
22-
acm_certificate_domain_validation_options = try(each.value.acm_certificate_domain_validation_options, var.defaults.acm_certificate_domain_validation_options, {})
23-
distinct_domain_names = try(each.value.distinct_domain_names, var.defaults.distinct_domain_names, [])
24-
key_algorithm = try(each.value.key_algorithm, var.defaults.key_algorithm, null)
25-
putin_khuylo = try(each.value.putin_khuylo, var.defaults.putin_khuylo, true)
2626
}

‎wrappers/outputs.tf

+1-1
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)
Please sign in to comment.