Skip to content

Commit 9eea3d9

Browse files
authored
fix: Update CI configuration files to use latest version (#43)
1 parent 222b6b0 commit 9eea3d9

File tree

10 files changed

+44
-22
lines changed

10 files changed

+44
-22
lines changed

.github/workflows/lock.yml

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

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

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

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

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

.pre-commit-config.yaml

+2-2
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.62.3
3+
rev: v1.76.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_validate
@@ -23,7 +23,7 @@ repos:
2323
- '--args=--only=terraform_standard_module_structure'
2424
- '--args=--only=terraform_workspace_remote'
2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v4.1.0
26+
rev: v4.3.0
2727
hooks:
2828
- id: check-merge-conflict
2929
- id: end-of-file-fixer

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ No modules.
165165
| [aws_iam_role_policy_attachment.additional_many](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
166166
| [aws_iam_role_policy_attachment.additional_one](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
167167
| [aws_sfn_state_machine.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sfn_state_machine) | resource |
168+
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
168169
| [aws_cloudwatch_log_group.sfn](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/cloudwatch_log_group) | data source |
169170
| [aws_iam_policy_document.additional_inline](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
170171
| [aws_iam_policy_document.assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |

examples/complete/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module "step_function" {
6767
}
6868

6969
stepfunction_Sync = {
70-
stepfunction = ["arn:aws:states:eu-west-1:123456789012:stateMachine:test1"]
70+
stepfunction = ["arn:aws:states:eu-west-1:123456789012:stateMachine:test1"]
7171
stepfunction_Wildcard = ["arn:aws:states:eu-west-1:123456789012:stateMachine:test1"]
7272

7373
# Set to true to use the default events (otherwise, set this to a list of ARNs; see the docs linked in locals.tf

main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ locals {
77
enable_xray_tracing = try(var.service_integrations["xray"]["xray"], false) == true
88

99
# Normalize ARN by trimming ":*" because data-source has it, but resource does not have it
10-
log_group_arn = trimsuffix(element(concat(data.aws_cloudwatch_log_group.sfn.*.arn, aws_cloudwatch_log_group.sfn.*.arn, [""]), 0), ":*")
10+
log_group_arn = trimsuffix(try(data.aws_cloudwatch_log_group.sfn[0].arn, aws_cloudwatch_log_group.sfn[0].arn, ""), ":*")
1111

1212
role_name = local.create_role ? coalesce(var.role_name, var.name) : null
1313
}

outputs.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
# Step Function
22
output "state_machine_id" {
33
description = "The ARN of the Step Function"
4-
value = element(concat(aws_sfn_state_machine.this.*.id, [""]), 0)
4+
value = try(aws_sfn_state_machine.this[0].id, "")
55
}
66

77
output "state_machine_arn" {
88
description = "The ARN of the Step Function"
9-
value = element(concat(aws_sfn_state_machine.this.*.arn, [""]), 0)
9+
value = try(aws_sfn_state_machine.this[0].arn, "")
1010
}
1111

1212
output "state_machine_creation_date" {
1313
description = "The date the Step Function was created"
14-
value = element(concat(aws_sfn_state_machine.this.*.creation_date, [""]), 0)
14+
value = try(aws_sfn_state_machine.this[0].creation_date, "")
1515
}
1616

1717
output "state_machine_status" {
1818
description = "The current status of the Step Function"
19-
value = element(concat(aws_sfn_state_machine.this.*.status, [""]), 0)
19+
value = try(aws_sfn_state_machine.this[0].status, "")
2020
}
2121

2222
# IAM Role
2323
output "role_arn" {
2424
description = "The ARN of the IAM role created for the Step Function"
25-
value = element(concat(aws_iam_role.this.*.arn, [""]), 0)
25+
value = try(aws_iam_role.this[0].arn, "")
2626
}
2727

2828
output "role_name" {
2929
description = "The name of the IAM role created for the Step Function"
30-
value = element(concat(aws_iam_role.this.*.name, [""]), 0)
30+
value = try(aws_iam_role.this[0].name, "")
3131
}

0 commit comments

Comments
 (0)