From 139b69b5d96c764d75fa4444b95b6ff96b013fb9 Mon Sep 17 00:00:00 2001 From: Toru Makabe <993850+torumakabe@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:36:56 +0900 Subject: [PATCH] bump --- .github/workflows/ci-terraform-blue.yaml | 4 ++-- .github/workflows/ci-terraform-green.yaml | 4 ++-- .github/workflows/ci-terraform-shared.yaml | 4 ++-- README.md | 7 ++++--- terraform/blue/main.tf | 2 +- terraform/green/main.tf | 2 +- terraform/shared/main.tf | 2 +- test/e2e/go.mod | 2 +- test/integration/Makefile | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml index e2343ad..c922f77 100644 --- a/.github/workflows/ci-terraform-blue.yaml +++ b/.github/workflows/ci-terraform-blue.yaml @@ -4,7 +4,7 @@ on: branches: - main paths: - - 'terraform/blue/**' + - "terraform/blue/**" workflow_dispatch: defaults: run: @@ -83,7 +83,7 @@ jobs: - name: "Setup TFLint" uses: terraform-linters/setup-tflint@v4 with: - tflint_version: v0.53.0 + tflint_version: v0.54.0 - name: "Run TFLint" id: tflint diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml index ea442bb..9c6a89c 100644 --- a/.github/workflows/ci-terraform-green.yaml +++ b/.github/workflows/ci-terraform-green.yaml @@ -4,7 +4,7 @@ on: branches: - main paths: - - 'terraform/green/**' + - "terraform/green/**" workflow_dispatch: defaults: run: @@ -83,7 +83,7 @@ jobs: - name: "Setup TFLint" uses: terraform-linters/setup-tflint@v4 with: - tflint_version: v0.53.0 + tflint_version: v0.54.0 - name: "Run TFLint" id: tflint diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml index 94af23e..966dc92 100644 --- a/.github/workflows/ci-terraform-shared.yaml +++ b/.github/workflows/ci-terraform-shared.yaml @@ -4,7 +4,7 @@ on: branches: - main paths: - - 'terraform/shared/**' + - "terraform/shared/**" workflow_dispatch: defaults: run: @@ -47,7 +47,7 @@ jobs: - name: "Setup TFLint" uses: terraform-linters/setup-tflint@v4 with: - tflint_version: v0.53.0 + tflint_version: v0.54.0 - name: "Run TFLint" id: tflint diff --git a/README.md b/README.md index 41470a1..51f6d15 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,9 @@ DRY is a great concept, and you should be aware that it will come true in the fu Prerequisites & tested - [Terraform](https://www.terraform.io/docs/index.html): 1.9.8 - - hashicorp/azurerm: 4.7.0 + - hashicorp/azurerm: 4.10.0 - State store: Local -- [TFLint](https://github.com/terraform-linters/tflint): 0.53.0 +- [TFLint](https://github.com/terraform-linters/tflint): 0.54.0 - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.27.0 - [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.4 - Ubuntu: 22.04.5 LTS @@ -124,7 +124,7 @@ E2E test should also be automated and always ready to run to see the impact of i - Cleanup the resources after test automatically Set variables on e2e.tfvars in shared/blue/green [fixtures](./test/fixtures) before test, or set environment variables. - + ### CI Pull Requests trigger the following GitHub Actions as CI. These actions post the result as comments to the PR. @@ -134,6 +134,7 @@ Pull Requests trigger the following GitHub Actions as CI. These actions post the - diff between Blue/Green Terrarform files: [Github Actions workflow](./.github/workflows/ci-terraform-blue.yaml) - PR for files /terraform/blue|green directory - format(check)/validate/lint/plan Terraform files: [Github Actions workflow](./.github/workflows/ci-terraform-shared.yaml) + - PR for files /terraform/shared|blue|green directory Set variables on integration.tfvars in shared/blue/green [fixtures](./test/fixtures) before test, or set environment variables. diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf index 90522af..9d0bb57 100644 --- a/terraform/blue/main.tf +++ b/terraform/blue/main.tf @@ -6,7 +6,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.7.0" + version = "~> 4.10.0" } } } diff --git a/terraform/green/main.tf b/terraform/green/main.tf index 90522af..9d0bb57 100644 --- a/terraform/green/main.tf +++ b/terraform/green/main.tf @@ -6,7 +6,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.7.0" + version = "~> 4.10.0" } } } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index 759cda3..09c9ecb 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -6,7 +6,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.7.0" + version = "~> 4.10.0" } random = { diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 5d5b8e2..8ca2a61 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -2,7 +2,7 @@ module github.com/torumakabe/aks-anti-dry-iac/test/e2e go 1.23 -toolchain go1.23.2 +toolchain go1.23.3 require ( github.com/hashicorp/go-retryablehttp v0.7.7 diff --git a/test/integration/Makefile b/test/integration/Makefile index 2bd43c5..9d3bf4a 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -103,7 +103,7 @@ validate-green: define LINT tflint --init \ && pushd ../fixtures/${1} \ - && tflint --config ../../integration/.tflint.hcl --module --var-file=integration.tfvars --no-color -f compact \ + && tflint --config ../../integration/.tflint.hcl --call-module-type=all --var-file=integration.tfvars --no-color -f compact \ && popd endef