Skip to content

Commit 2e11175

Browse files
authored
fix: Update CI configuration files to use latest version (#13)
1 parent 8d5c487 commit 2e11175

File tree

7 files changed

+48
-27
lines changed

7 files changed

+48
-27
lines changed

.github/workflows/lock.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'Lock Threads'
2+
3+
on:
4+
schedule:
5+
- cron: '50 1 * * *'
6+
7+
jobs:
8+
lock:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: dessant/lock-threads@v3
12+
with:
13+
github-token: ${{ secrets.GITHUB_TOKEN }}
14+
issue-comment: >
15+
I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
16+
If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
17+
issue-inactive-days: '30'
18+
pr-comment: >
19+
I'm going to lock this pull request because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
20+
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
21+
pr-inactive-days: '30'

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

.github/workflows/pre-commit.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
directories: ${{ steps.dirs.outputs.directories }}
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Get root directories
2323
id: dirs
24-
uses: clowdhaus/terraform-composite-actions/directories@v1.3.0
24+
uses: clowdhaus/terraform-composite-actions/directories@v1.8.0
2525

2626
preCommitMinVersions:
2727
name: Min TF pre-commit
@@ -32,26 +32,26 @@ jobs:
3232
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3636

3737
- name: Terraform min/max versions
3838
id: minMax
39-
uses: clowdhaus/terraform-min-max@v1.0.3
39+
uses: clowdhaus/terraform-min-max@v1.2.0
4040
with:
4141
directory: ${{ matrix.directory }}
4242

4343
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
4444
# Run only validate pre-commit check on min version supported
4545
if: ${{ matrix.directory != '.' }}
46-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
46+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0
4747
with:
4848
terraform-version: ${{ steps.minMax.outputs.minVersion }}
4949
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
5050

5151
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5252
# Run only validate pre-commit check on min version supported
5353
if: ${{ matrix.directory == '.' }}
54-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
54+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0
5555
with:
5656
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5757
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
@@ -62,17 +62,17 @@ jobs:
6262
needs: collectInputs
6363
steps:
6464
- name: Checkout
65-
uses: actions/checkout@v2
65+
uses: actions/checkout@v3
6666
with:
6767
ref: ${{ github.event.pull_request.head.ref }}
6868
repository: ${{github.event.pull_request.head.repo.full_name}}
6969

7070
- name: Terraform min/max versions
7171
id: minMax
72-
uses: clowdhaus/terraform-min-max@v1.0.3
72+
uses: clowdhaus/terraform-min-max@v1.2.0
7373

7474
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
75-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
75+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0
7676
with:
7777
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
7878
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: github.repository_owner == 'terraform-aws-modules'
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2323
with:
2424
persist-credentials: false
2525
fetch-depth: 0

.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@v4
10+
- uses: actions/stale@v6
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.74.1
3+
rev: v1.76.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_validate

outputs.tf

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
# RDS Proxy
22
output "proxy_id" {
33
description = "The ID for the proxy"
4-
value = element(concat(aws_db_proxy.this.*.id, [""]), 0)
4+
value = try(aws_db_proxy.this[0].id, "")
55
}
66

77
output "proxy_arn" {
88
description = "The Amazon Resource Name (ARN) for the proxy"
9-
value = element(concat(aws_db_proxy.this.*.arn, [""]), 0)
9+
value = try(aws_db_proxy.this[0].arn, "")
1010
}
1111

1212
output "proxy_endpoint" {
1313
description = "The endpoint that you can use to connect to the proxy"
14-
value = element(concat(aws_db_proxy.this.*.endpoint, [""]), 0)
14+
value = try(aws_db_proxy.this[0].endpoint, "")
1515
}
1616

1717
# Proxy Default Target Group
1818
output "proxy_default_target_group_id" {
1919
description = "The ID for the default target group"
20-
value = element(concat(aws_db_proxy_default_target_group.this.*.id, [""]), 0)
20+
value = try(aws_db_proxy_default_target_group.this[0].id, "")
2121
}
2222

2323
output "proxy_default_target_group_arn" {
2424
description = "The Amazon Resource Name (ARN) for the default target group"
25-
value = element(concat(aws_db_proxy_default_target_group.this.*.arn, [""]), 0)
25+
value = try(aws_db_proxy_default_target_group.this[0].arn, "")
2626
}
2727

2828
output "proxy_default_target_group_name" {
2929
description = "The name of the default target group"
30-
value = element(concat(aws_db_proxy_default_target_group.this.*.name, [""]), 0)
30+
value = try(aws_db_proxy_default_target_group.this[0].name, "")
3131
}
3232

3333
# Proxy Target
3434
output "proxy_target_endpoint" {
3535
description = "Hostname for the target RDS DB Instance. Only returned for `RDS_INSTANCE` type"
36-
value = element(concat(aws_db_proxy_target.db_instance.*.endpoint, aws_db_proxy_target.db_cluster.*.endpoint, [""]), 0)
36+
value = try(aws_db_proxy_target.db_instance[0].endpoint, aws_db_proxy_target.db_cluster[0].endpoint, "")
3737
}
3838

3939
output "proxy_target_id" {
4040
description = "Identifier of `db_proxy_name`, `target_group_name`, target type (e.g. `RDS_INSTANCE` or `TRACKED_CLUSTER`), and resource identifier separated by forward slashes (/)"
41-
value = element(concat(aws_db_proxy_target.db_instance.*.id, aws_db_proxy_target.db_cluster.*.id, [""]), 0)
41+
value = try(aws_db_proxy_target.db_instance[0].id, aws_db_proxy_target.db_cluster[0].id, "")
4242
}
4343

4444
output "proxy_target_port" {
4545
description = "Port for the target RDS DB Instance or Aurora DB Cluster"
46-
value = element(concat(aws_db_proxy_target.db_instance.*.port, aws_db_proxy_target.db_cluster.*.port, [""]), 0)
46+
value = try(aws_db_proxy_target.db_instance[0].port, aws_db_proxy_target.db_cluster[0].port, "")
4747
}
4848

4949
output "proxy_target_rds_resource_id" {
5050
description = "Identifier representing the DB Instance or DB Cluster target"
51-
value = element(concat(aws_db_proxy_target.db_instance.*.rds_resource_id, aws_db_proxy_target.db_cluster.*.rds_resource_id, [""]), 0)
51+
value = try(aws_db_proxy_target.db_instance[0].rds_resource_id, aws_db_proxy_target.db_cluster[0].rds_resource_id, "")
5252
}
5353

5454
output "proxy_target_target_arn" {
5555
description = "Amazon Resource Name (ARN) for the DB instance or DB cluster. Currently not returned by the RDS API"
56-
value = element(concat(aws_db_proxy_target.db_instance.*.target_arn, aws_db_proxy_target.db_cluster.*.target_arn, [""]), 0)
56+
value = try(aws_db_proxy_target.db_instance[0].target_arn, aws_db_proxy_target.db_cluster[0].target_arn, "")
5757
}
5858

5959
output "proxy_target_tracked_cluster_id" {
6060
description = "DB Cluster identifier for the DB Instance target. Not returned unless manually importing an RDS_INSTANCE target that is part of a DB Cluster"
61-
value = element(concat(aws_db_proxy_target.db_cluster.*.tracked_cluster_id, [""]), 0)
61+
value = try(aws_db_proxy_target.db_cluster[0].tracked_cluster_id, "")
6262
}
6363

6464
output "proxy_target_type" {
6565
description = "Type of target. e.g. `RDS_INSTANCE` or `TRACKED_CLUSTER`"
66-
value = element(concat(aws_db_proxy_target.db_instance.*.type, aws_db_proxy_target.db_cluster.*.type, [""]), 0)
66+
value = try(aws_db_proxy_target.db_instance[0].type, aws_db_proxy_target.db_cluster[0].type, "")
6767
}
6868

6969
# DB proxy endponts
@@ -75,5 +75,5 @@ output "db_proxy_endpoints" {
7575
# CloudWatch logs
7676
output "log_group_arn" {
7777
description = "The Amazon Resource Name (ARN) of the CloudWatch log group"
78-
value = element(concat(aws_cloudwatch_log_group.this.*.arn, [""]), 0)
78+
value = try(aws_cloudwatch_log_group.this[0].arn, "")
7979
}

0 commit comments

Comments
 (0)