Skip to content

Commit 179eccb

Browse files
bryantbiggsbryantbiggs
authored
fix: Update CI workflow versions to remove deprecated runtime warnings (#23)
1 parent 18673e2 commit 179eccb

File tree

14 files changed

+74
-49
lines changed

14 files changed

+74
-49
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.3
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.3
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.3
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.3
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,9 +1,8 @@
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
6-
- id: terraform_validate
76
- id: terraform_docs
87
args:
98
- '--args=--lockfile=false'
@@ -22,8 +21,11 @@ repos:
2221
- '--args=--only=terraform_required_providers'
2322
- '--args=--only=terraform_standard_module_structure'
2423
- '--args=--only=terraform_workspace_remote'
24+
- '--args=--only=terraform_unused_required_providers'
25+
- id: terraform_validate
2526
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v4.3.0
27+
rev: v4.5.0
2728
hooks:
2829
- id: check-merge-conflict
2930
- id: end-of-file-fixer
31+
- id: trailing-whitespace

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ provider "aws" {
5454
5555
module "pricing" {
5656
source = "terraform-aws-modules/pricing/aws//modules/pricing"
57-
57+
5858
# content can be Terraform state or plan as JSON fetched from any source (see examples)
5959
content = jsondecode("{\"version\": 4, \"terraform_version\": \"0.14.4\", ...")
6060
}
@@ -73,7 +73,7 @@ data "local_file" "local_plan" {
7373
7474
module "pricing" {
7575
source = "terraform-aws-modules/pricing/aws//modules/pricing"
76-
76+
7777
content = jsondecode(data.local_file.local_plan.content)
7878
}
7979
```
@@ -87,7 +87,7 @@ provider "aws" {
8787
8888
module "pricing" {
8989
source = "terraform-aws-modules/pricing/aws//modules/pricing"
90-
90+
9191
resources = {
9292
"aws_instance.this#5" = { # Note: This means 5 instances (`count = 5`)
9393
instanceType = "c5.xlarge"
@@ -126,7 +126,7 @@ end
126126
127127
Set AWS provider's region to `us-east-1` or `sa-east-1` when using [modules/pricing](https://github.com/terraform-aws-modules/terraform-aws-pricing/tree/master/modules/pricing) because AWS Pricing service is only available in these regions.
128128
129-
You can also pass provider explicitly as described in the [official documentation](https://www.terraform.io/docs/modules/providers.html#passing-providers-explicitly).
129+
You can also pass provider explicitly as described in the [official documentation](https://www.terraform.io/docs/modules/providers.html#passing-providers-explicitly).
130130
131131
132132
#### Debug & development tips

‎dev/aws_pricing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ aws pricing get-attribute-values --region us-east-1 --service-code AmazonRDS --a
229229
```
230230

231231

232-
aws pricing get-attribute-values --region us-east-1 --service-code AmazonRDS --attribute-name volumeType
232+
aws pricing get-attribute-values --region us-east-1 --service-code AmazonRDS --attribute-name volumeType
233233
```
234234
{
235235
"AttributeValues": [

‎examples/fixtures/all-resources/data.tf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
##################################################################
22
# Data sources to get VPC, subnet, security group and AMI details
33
##################################################################
4+
45
data "aws_vpc" "default" {
56
default = true
67
}
78

8-
data "aws_subnet_ids" "all" {
9-
vpc_id = data.aws_vpc.default.id
9+
data "aws_subnets" "all" {
10+
filter {
11+
name = "vpc-id"
12+
values = [data.aws_vpc.default.id]
13+
}
1014
}
1115

1216
data "aws_ami" "amazon_linux" {

‎examples/fixtures/all-resources/main.tf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,35 +144,35 @@ resource "aws_elb" "elb" {
144144
lb_protocol = "HTTP"
145145
}
146146

147-
subnets = data.aws_subnet_ids.all.ids
147+
subnets = data.aws_subnets.all.ids
148148
}
149149

150150
resource "aws_lb" "alb1" {
151151
load_balancer_type = "application"
152-
subnets = data.aws_subnet_ids.all.ids
152+
subnets = data.aws_subnets.all.ids
153153
}
154154

155155
resource "aws_alb" "alb2" {
156156
load_balancer_type = "application"
157-
subnets = data.aws_subnet_ids.all.ids
157+
subnets = data.aws_subnets.all.ids
158158
}
159159

160160
resource "aws_lb" "nlb" {
161161
load_balancer_type = "network"
162-
subnets = data.aws_subnet_ids.all.ids
162+
subnets = data.aws_subnets.all.ids
163163
}
164164

165165
resource "aws_lb" "undefined_type" {
166-
subnets = data.aws_subnet_ids.all.ids
166+
subnets = data.aws_subnets.all.ids
167167
}
168168

169169
resource "aws_eip" "nat" {
170-
vpc = true
170+
domain = "vpc"
171171
}
172172

173173
resource "aws_nat_gateway" "nat" {
174174
allocation_id = aws_eip.nat.id
175-
subnet_id = tolist(data.aws_subnet_ids.all.ids)[0]
175+
subnet_id = tolist(data.aws_subnets.all.ids)[0]
176176
}
177177

178178
#######################################################

0 commit comments

Comments
 (0)