Skip to content

Commit

Permalink
bump
Browse files Browse the repository at this point in the history
  • Loading branch information
torumakabe committed Nov 15, 2024
1 parent a5bf4ec commit 139b69b
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-terraform-blue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- main
paths:
- 'terraform/blue/**'
- "terraform/blue/**"
workflow_dispatch:
defaults:
run:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-terraform-green.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- main
paths:
- 'terraform/green/**'
- "terraform/green/**"
workflow_dispatch:
defaults:
run:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-terraform-shared.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- main
paths:
- 'terraform/shared/**'
- "terraform/shared/**"
workflow_dispatch:
defaults:
run:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion terraform/blue/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.7.0"
version = "~> 4.10.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/green/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.7.0"
version = "~> 4.10.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/shared/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.7.0"
version = "~> 4.10.0"
}

random = {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/integration/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 139b69b

Please sign in to comment.