Skip to content

Commit 6cacac5

Browse files
authored
fix: Update CI workflow versions to remove deprecated runtime warnings (#60)
1 parent 68ec75c commit 6cacac5

File tree

9 files changed

+82
-69
lines changed

9 files changed

+82
-69
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

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
if: github.repository_owner == 'terraform-aws-modules'
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
persist-credentials: false
2626
fetch-depth: 0
2727

2828
- name: Release
29-
uses: cycjimmy/semantic-release-action@v3
29+
uses: cycjimmy/semantic-release-action@v4
3030
with:
31-
semantic_version: 18.0.0
31+
semantic_version: 23.0.2
3232
extra_plugins: |
33-
@semantic-release/changelog@6.0.0
34-
@semantic-release/git@10.0.0
35-
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
3636
env:
3737
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.81.2
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
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ $ terraform apply
134134
|------|---------|
135135
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
136136
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.1 |
137-
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
138137

139138
## Providers
140139

versions.tf

-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,5 @@ terraform {
66
source = "hashicorp/aws"
77
version = ">= 5.1"
88
}
9-
random = {
10-
source = "hashicorp/random"
11-
version = ">= 2.0"
12-
}
139
}
1410
}

wrappers/main.tf

+42-42
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,19 @@ module "wrapper" {
33

44
for_each = var.items
55

6-
create_graphql_api = try(each.value.create_graphql_api, var.defaults.create_graphql_api, true)
7-
logging_enabled = try(each.value.logging_enabled, var.defaults.logging_enabled, false)
8-
domain_name_association_enabled = try(each.value.domain_name_association_enabled, var.defaults.domain_name_association_enabled, false)
9-
caching_enabled = try(each.value.caching_enabled, var.defaults.caching_enabled, false)
10-
xray_enabled = try(each.value.xray_enabled, var.defaults.xray_enabled, false)
11-
name = try(each.value.name, var.defaults.name, "")
12-
schema = try(each.value.schema, var.defaults.schema, "")
13-
visibility = try(each.value.visibility, var.defaults.visibility, null)
14-
authentication_type = try(each.value.authentication_type, var.defaults.authentication_type, "API_KEY")
15-
create_logs_role = try(each.value.create_logs_role, var.defaults.create_logs_role, true)
16-
logs_role_name = try(each.value.logs_role_name, var.defaults.logs_role_name, null)
17-
log_cloudwatch_logs_role_arn = try(each.value.log_cloudwatch_logs_role_arn, var.defaults.log_cloudwatch_logs_role_arn, null)
18-
log_field_log_level = try(each.value.log_field_log_level, var.defaults.log_field_log_level, null)
19-
log_exclude_verbose_content = try(each.value.log_exclude_verbose_content, var.defaults.log_exclude_verbose_content, false)
20-
lambda_authorizer_config = try(each.value.lambda_authorizer_config, var.defaults.lambda_authorizer_config, {})
21-
openid_connect_config = try(each.value.openid_connect_config, var.defaults.openid_connect_config, {})
22-
user_pool_config = try(each.value.user_pool_config, var.defaults.user_pool_config, {})
23-
additional_authentication_provider = try(each.value.additional_authentication_provider, var.defaults.additional_authentication_provider, {})
24-
graphql_api_tags = try(each.value.graphql_api_tags, var.defaults.graphql_api_tags, {})
25-
logs_role_tags = try(each.value.logs_role_tags, var.defaults.logs_role_tags, {})
26-
tags = try(each.value.tags, var.defaults.tags, {})
27-
domain_name = try(each.value.domain_name, var.defaults.domain_name, "")
28-
domain_name_description = try(each.value.domain_name_description, var.defaults.domain_name_description, null)
29-
certificate_arn = try(each.value.certificate_arn, var.defaults.certificate_arn, "")
30-
caching_behavior = try(each.value.caching_behavior, var.defaults.caching_behavior, "FULL_REQUEST_CACHING")
31-
cache_type = try(each.value.cache_type, var.defaults.cache_type, "SMALL")
32-
cache_ttl = try(each.value.cache_ttl, var.defaults.cache_ttl, 1)
33-
cache_at_rest_encryption_enabled = try(each.value.cache_at_rest_encryption_enabled, var.defaults.cache_at_rest_encryption_enabled, false)
34-
cache_transit_encryption_enabled = try(each.value.cache_transit_encryption_enabled, var.defaults.cache_transit_encryption_enabled, false)
35-
api_keys = try(each.value.api_keys, var.defaults.api_keys, {})
36-
lambda_allowed_actions = try(each.value.lambda_allowed_actions, var.defaults.lambda_allowed_actions, ["lambda:invokeFunction"])
37-
dynamodb_allowed_actions = try(each.value.dynamodb_allowed_actions, var.defaults.dynamodb_allowed_actions, ["dynamodb:GetItem", "dynamodb:PutItem", "dynamodb:DeleteItem", "dynamodb:UpdateItem", "dynamodb:Query", "dynamodb:Scan", "dynamodb:BatchGetItem", "dynamodb:BatchWriteItem"])
38-
elasticsearch_allowed_actions = try(each.value.elasticsearch_allowed_actions, var.defaults.elasticsearch_allowed_actions, ["es:ESHttpDelete", "es:ESHttpHead", "es:ESHttpGet", "es:ESHttpPost", "es:ESHttpPut"])
39-
opensearchservice_allowed_actions = try(each.value.opensearchservice_allowed_actions, var.defaults.opensearchservice_allowed_actions, ["es:ESHttpDelete", "es:ESHttpHead", "es:ESHttpGet", "es:ESHttpPost", "es:ESHttpPut"])
40-
eventbridge_allowed_actions = try(each.value.eventbridge_allowed_actions, var.defaults.eventbridge_allowed_actions, ["events:PutEvents"])
41-
relational_database_allowed_actions = try(each.value.relational_database_allowed_actions, var.defaults.relational_database_allowed_actions, ["rds-data:BatchExecuteStatement", "rds-data:BeginTransaction", "rds-data:CommitTransaction", "rds-data:ExecuteStatement", "rds-data:RollbackTransaction"])
42-
secrets_manager_allowed_actions = try(each.value.secrets_manager_allowed_actions, var.defaults.secrets_manager_allowed_actions, ["secretsmanager:GetSecretValue"])
43-
iam_permissions_boundary = try(each.value.iam_permissions_boundary, var.defaults.iam_permissions_boundary, null)
6+
additional_authentication_provider = try(each.value.additional_authentication_provider, var.defaults.additional_authentication_provider, {})
7+
api_keys = try(each.value.api_keys, var.defaults.api_keys, {})
8+
authentication_type = try(each.value.authentication_type, var.defaults.authentication_type, "API_KEY")
9+
cache_at_rest_encryption_enabled = try(each.value.cache_at_rest_encryption_enabled, var.defaults.cache_at_rest_encryption_enabled, false)
10+
cache_transit_encryption_enabled = try(each.value.cache_transit_encryption_enabled, var.defaults.cache_transit_encryption_enabled, false)
11+
cache_ttl = try(each.value.cache_ttl, var.defaults.cache_ttl, 1)
12+
cache_type = try(each.value.cache_type, var.defaults.cache_type, "SMALL")
13+
caching_behavior = try(each.value.caching_behavior, var.defaults.caching_behavior, "FULL_REQUEST_CACHING")
14+
caching_enabled = try(each.value.caching_enabled, var.defaults.caching_enabled, false)
15+
certificate_arn = try(each.value.certificate_arn, var.defaults.certificate_arn, "")
16+
create_graphql_api = try(each.value.create_graphql_api, var.defaults.create_graphql_api, true)
17+
create_logs_role = try(each.value.create_logs_role, var.defaults.create_logs_role, true)
18+
datasources = try(each.value.datasources, var.defaults.datasources, {})
4419
direct_lambda_request_template = try(each.value.direct_lambda_request_template, var.defaults.direct_lambda_request_template, <<-EOF
4520
{
4621
"version" : "2017-02-28",
@@ -67,8 +42,33 @@ module "wrapper" {
6742
$util.toJson($ctx.result)
6843
EOF
6944
)
70-
resolver_caching_ttl = try(each.value.resolver_caching_ttl, var.defaults.resolver_caching_ttl, 60)
71-
datasources = try(each.value.datasources, var.defaults.datasources, {})
72-
resolvers = try(each.value.resolvers, var.defaults.resolvers, {})
73-
functions = try(each.value.functions, var.defaults.functions, {})
45+
domain_name = try(each.value.domain_name, var.defaults.domain_name, "")
46+
domain_name_association_enabled = try(each.value.domain_name_association_enabled, var.defaults.domain_name_association_enabled, false)
47+
domain_name_description = try(each.value.domain_name_description, var.defaults.domain_name_description, null)
48+
dynamodb_allowed_actions = try(each.value.dynamodb_allowed_actions, var.defaults.dynamodb_allowed_actions, ["dynamodb:GetItem", "dynamodb:PutItem", "dynamodb:DeleteItem", "dynamodb:UpdateItem", "dynamodb:Query", "dynamodb:Scan", "dynamodb:BatchGetItem", "dynamodb:BatchWriteItem"])
49+
elasticsearch_allowed_actions = try(each.value.elasticsearch_allowed_actions, var.defaults.elasticsearch_allowed_actions, ["es:ESHttpDelete", "es:ESHttpHead", "es:ESHttpGet", "es:ESHttpPost", "es:ESHttpPut"])
50+
eventbridge_allowed_actions = try(each.value.eventbridge_allowed_actions, var.defaults.eventbridge_allowed_actions, ["events:PutEvents"])
51+
functions = try(each.value.functions, var.defaults.functions, {})
52+
graphql_api_tags = try(each.value.graphql_api_tags, var.defaults.graphql_api_tags, {})
53+
iam_permissions_boundary = try(each.value.iam_permissions_boundary, var.defaults.iam_permissions_boundary, null)
54+
lambda_allowed_actions = try(each.value.lambda_allowed_actions, var.defaults.lambda_allowed_actions, ["lambda:invokeFunction"])
55+
lambda_authorizer_config = try(each.value.lambda_authorizer_config, var.defaults.lambda_authorizer_config, {})
56+
log_cloudwatch_logs_role_arn = try(each.value.log_cloudwatch_logs_role_arn, var.defaults.log_cloudwatch_logs_role_arn, null)
57+
log_exclude_verbose_content = try(each.value.log_exclude_verbose_content, var.defaults.log_exclude_verbose_content, false)
58+
log_field_log_level = try(each.value.log_field_log_level, var.defaults.log_field_log_level, null)
59+
logging_enabled = try(each.value.logging_enabled, var.defaults.logging_enabled, false)
60+
logs_role_name = try(each.value.logs_role_name, var.defaults.logs_role_name, null)
61+
logs_role_tags = try(each.value.logs_role_tags, var.defaults.logs_role_tags, {})
62+
name = try(each.value.name, var.defaults.name, "")
63+
openid_connect_config = try(each.value.openid_connect_config, var.defaults.openid_connect_config, {})
64+
opensearchservice_allowed_actions = try(each.value.opensearchservice_allowed_actions, var.defaults.opensearchservice_allowed_actions, ["es:ESHttpDelete", "es:ESHttpHead", "es:ESHttpGet", "es:ESHttpPost", "es:ESHttpPut"])
65+
relational_database_allowed_actions = try(each.value.relational_database_allowed_actions, var.defaults.relational_database_allowed_actions, ["rds-data:BatchExecuteStatement", "rds-data:BeginTransaction", "rds-data:CommitTransaction", "rds-data:ExecuteStatement", "rds-data:RollbackTransaction"])
66+
resolver_caching_ttl = try(each.value.resolver_caching_ttl, var.defaults.resolver_caching_ttl, 60)
67+
resolvers = try(each.value.resolvers, var.defaults.resolvers, {})
68+
schema = try(each.value.schema, var.defaults.schema, "")
69+
secrets_manager_allowed_actions = try(each.value.secrets_manager_allowed_actions, var.defaults.secrets_manager_allowed_actions, ["secretsmanager:GetSecretValue"])
70+
tags = try(each.value.tags, var.defaults.tags, {})
71+
user_pool_config = try(each.value.user_pool_config, var.defaults.user_pool_config, {})
72+
visibility = try(each.value.visibility, var.defaults.visibility, null)
73+
xray_enabled = try(each.value.xray_enabled, var.defaults.xray_enabled, false)
7474
}

0 commit comments

Comments
 (0)