Merge pull request #111 from torumakabe:bump

bump
torumakabe · May 31, 2024 · c6dd1bb · c6dd1bb
2 parents 97f125d + e97b97b
commit c6dd1bb
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 29 deletions.
diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml
@@ -67,7 +67,7 @@ jobs:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.8.3
+          terraform_version: 1.8.4
           terraform_wrapper: false
 
       - name: "Terraform Format"
@@ -83,7 +83,7 @@ jobs:
       - name: "Setup TFLint"
         uses: terraform-linters/setup-tflint@v4
         with:
-          tflint_version: v0.46.0
+          tflint_version: v0.51.1
 
       - name: "Run TFLint"
         id: tflint

diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml
@@ -67,7 +67,7 @@ jobs:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.8.3
+          terraform_version: 1.8.4
           terraform_wrapper: false
 
       - name: "Terraform Format"
@@ -83,7 +83,7 @@ jobs:
       - name: "Setup TFLint"
         uses: terraform-linters/setup-tflint@v4
         with:
-          tflint_version: v0.46.0
+          tflint_version: v0.51.1
 
       - name: "Run TFLint"
         id: tflint

diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.8.3
+          terraform_version: 1.8.4
           terraform_wrapper: false
 
       - name: "Terraform Format"
@@ -47,7 +47,7 @@ jobs:
       - name: "Setup TFLint"
         uses: terraform-linters/setup-tflint@v4
         with:
-          tflint_version: v0.46.0
+          tflint_version: v0.51.1
 
       - name: "Run TFLint"
         id: tflint

diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ 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.8.3
-  - hashicorp/azurerm: 3.103.1
+- [Terraform](https://www.terraform.io/docs/index.html): 1.8.4
+  - hashicorp/azurerm: 3.106.0
   - State store: Local
 - [TFLint](https://github.com/terraform-linters/tflint): 0.51.1
   - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.26.0

diff --git a/terraform/blue/aks/main.tf b/terraform/blue/aks/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 
   required_providers {
     azurerm = {
@@ -215,6 +215,7 @@ resource "azurerm_kubernetes_cluster" "default" {
     secret_rotation_enabled = true
   }
   image_cleaner_enabled = true
+  cost_analysis_enabled = true
 
   lifecycle {
     ignore_changes = [

diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 
   required_providers {
     azurerm = {

diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.103.1"
+      version = "~> 3.106.0"
     }
   }
 }

diff --git a/terraform/green/aks/main.tf b/terraform/green/aks/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 
   required_providers {
     azurerm = {
@@ -215,6 +215,7 @@ resource "azurerm_kubernetes_cluster" "default" {
     secret_rotation_enabled = true
   }
   image_cleaner_enabled = true
+  cost_analysis_enabled = true
 
   lifecycle {
     ignore_changes = [

diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 
   required_providers {
     azurerm = {

diff --git a/terraform/green/main.tf b/terraform/green/main.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.103.1"
+      version = "~> 3.106.0"
     }
   }
 }

diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf
@@ -1,17 +1,17 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.103.1"
+      version = "~> 3.106.0"
     }
 
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.5"
+      version = "~> 3.6"
     }
   }
 }

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-TF_VERSION := 1.8.3
+TF_VERSION := 1.8.4
 
 # Before running this test, you must:
 # export GITHUB_TOKEN=your-token

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -46,7 +46,7 @@ type endpointTestConfig struct {
 
 var (
 	scope              = flag.String("scope", "all", "specify test scope [blue/green/all]")
-	tfVer              = flag.String("tf-version", "1.8.3", "specify Terraform version")
+	tfVer              = flag.String("tf-version", "1.8.4", "specify Terraform version")
 	chaosTestManifests = flag.String("chaostest-manifest", "../chaos/manifests/*.yaml", "specify chaos test manifest file path")
 )
 

diff --git a/test/e2e/go.mod b/test/e2e/go.mod
@@ -5,18 +5,18 @@ go 1.22
 toolchain go1.22.3
 
 require (
-	github.com/hashicorp/go-retryablehttp v0.7.6
-	github.com/hashicorp/go-version v1.6.0
-	github.com/hashicorp/hc-install v0.6.4
-	github.com/hashicorp/terraform-exec v0.20.0
+	github.com/hashicorp/go-retryablehttp v0.7.7
+	github.com/hashicorp/go-version v1.7.0
+	github.com/hashicorp/hc-install v0.7.0
+	github.com/hashicorp/terraform-exec v0.21.0
 )
 
 require (
 	github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/terraform-json v0.21.0 // indirect
+	github.com/hashicorp/terraform-json v0.22.1 // indirect
 	github.com/zclconf/go-cty v1.14.4 // indirect
 	golang.org/x/crypto v0.23.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect

diff --git a/test/e2e/go.sum b/test/e2e/go.sum
@@ -32,14 +32,24 @@ github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB1
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-retryablehttp v0.7.6 h1:TwRYfx2z2C4cLbXmT8I5PgP/xmuqASDyiVuGYfs9GZM=
 github.com/hashicorp/go-retryablehttp v0.7.6/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
+github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/hc-install v0.6.4 h1:QLqlM56/+SIIGvGcfFiwMY3z5WGXT066suo/v9Km8e0=
 github.com/hashicorp/hc-install v0.6.4/go.mod h1:05LWLy8TD842OtgcfBbOT0WMoInBMUSHjmDx10zuBIA=
+github.com/hashicorp/hc-install v0.7.0 h1:Uu9edVqjKQxxuD28mR5TikkKDd/p55S8vzPC1659aBk=
+github.com/hashicorp/hc-install v0.7.0/go.mod h1:ELmmzZlGnEcqoUMKUuykHaPCIR1sYLYX+KSggWSKZuA=
 github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8JyYF3vpnuEo=
 github.com/hashicorp/terraform-exec v0.20.0/go.mod h1:ckKGkJWbsNqFKV1itgMnE0hY9IYf1HoiekpuN0eWoDw=
+github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ=
+github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg=
 github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U=
 github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
+github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec=
+github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -64,6 +74,7 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
 golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=

diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 }
 
 module "blue" {

diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 }
 
 module "green" {

diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8.3"
+  required_version = "~> 1.8.4"
 }
 
 module "shared" {