Skip to content

Commit

Permalink
bump to support tflint 0.54 and pin version (#5895)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanschmidt authored Nov 11, 2024
1 parent fbebf82 commit a8b7a91
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 15 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/tflint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ jobs:
- uses: actions/checkout@v3
name: Checkout source code

- uses: terraform-linters/setup-tflint@v2
- uses: terraform-linters/setup-tflint@v4
name: Setup TFLint
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
tflint_version: v0.54.0

- name: Install Terraform
uses: hashicorp/setup-terraform@v2
Expand All @@ -40,7 +41,7 @@ jobs:
run: terraform init
- name: "Run TFLint download-lambda"
working-directory: terraform-aws-github-runner/modules/download-lambda
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate download-lambda"
working-directory: terraform-aws-github-runner/modules/download-lambda
run: terraform validate
Expand All @@ -53,7 +54,7 @@ jobs:
run: terraform init
- name: "Run TFLint runner-binaries-syncer"
working-directory: terraform-aws-github-runner/modules/runner-binaries-syncer
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate runner-binaries-syncer"
working-directory: terraform-aws-github-runner/modules/runner-binaries-syncer
run: terraform validate
Expand All @@ -66,7 +67,7 @@ jobs:
run: terraform init
- name: "Run TFLint runners-instances"
working-directory: terraform-aws-github-runner/modules/runners-instances
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate runners-instances"
working-directory: terraform-aws-github-runner/modules/runners-instances
run: terraform validate
Expand All @@ -79,7 +80,7 @@ jobs:
run: terraform init
- name: "Run TFLint runners"
working-directory: terraform-aws-github-runner/modules/runners
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate runners"
working-directory: terraform-aws-github-runner/modules/runners
run: terraform validate
Expand All @@ -92,7 +93,7 @@ jobs:
run: terraform init
- name: "Run TFLint setup-iam-permissions"
working-directory: terraform-aws-github-runner/modules/setup-iam-permissions
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate setup-iam-permissions"
working-directory: terraform-aws-github-runner/modules/setup-iam-permissions
run: terraform validate
Expand All @@ -105,7 +106,7 @@ jobs:
run: terraform init
- name: "Run TFLint webhook"
working-directory: terraform-aws-github-runner/modules/webhook
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate webhook"
working-directory: terraform-aws-github-runner/modules/webhook
run: terraform validate
Expand All @@ -118,7 +119,7 @@ jobs:
run: terraform init
- name: "Run TFLint main"
working-directory: terraform-aws-github-runner
run: tflint --module
run: tflint --call-module-type=all
- name: "Run terraform validate terraform-aws-github-runner"
working-directory: terraform-aws-github-runner
run: terraform validate
Expand Down
2 changes: 1 addition & 1 deletion terraform-aws-github-runner/.tflint.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugin "aws" {
}

config {
module = true
call_module_type = "all"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugin "aws" {
}

config {
module = true
call_module_type = "all"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugin "aws" {
}

config {
module = true
call_module_type = "all"
}
2 changes: 1 addition & 1 deletion terraform-aws-github-runner/modules/runners/.tflint.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugin "aws" {
}

config {
module = true
call_module_type = "all"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugin "aws" {
}

config {
module = true
call_module_type = "all"
}
2 changes: 1 addition & 1 deletion terraform-aws-github-runner/modules/webhook/.tflint.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugin "aws" {
}

config {
module = true
call_module_type = "all"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function move_state() {
function validate_module() {
cd "${1}"
terraform init
tflint --module
tflint --call-module-type=all
terraform validate
cd -
}
Expand Down

0 comments on commit a8b7a91

Please sign in to comment.