From 0f2c70ed1f1d046c2d8c8997f9b1c6f3be666eb1 Mon Sep 17 00:00:00 2001 From: Toru Makabe <993850+torumakabe@users.noreply.github.com> Date: Mon, 8 Jul 2024 18:27:10 +0900 Subject: [PATCH] bump --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci-terraform-blue.yaml | 2 +- .github/workflows/ci-terraform-green.yaml | 2 +- .github/workflows/ci-terraform-shared.yaml | 2 +- README.md | 8 ++++---- terraform/blue/aks/main.tf | 2 +- terraform/blue/apps/main.tf | 2 +- terraform/blue/main.tf | 4 ++-- terraform/green/aks/main.tf | 2 +- terraform/green/apps/main.tf | 2 +- terraform/green/main.tf | 4 ++-- terraform/shared/main.tf | 6 +++--- test/e2e/Makefile | 2 +- test/e2e/e2e_test.go | 2 +- test/e2e/go.mod | 8 ++++---- test/e2e/go.sum | 8 ++++++++ test/fixtures/blue/main.tf | 2 +- test/fixtures/green/main.tf | 2 +- test/fixtures/shared/main.tf | 2 +- 19 files changed, 36 insertions(+), 28 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4e17381..4fcb55f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ "ghcr.io/devcontainers/features/azure-cli:1": {}, "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}, "ghcr.io/devcontainers/features/terraform:1": { - "version": "1.8" + "version": "1.9" }, "ghcr.io/flexwie/devcontainer-features/op:1": {}, "ghcr.io/devcontainers/features/go:1": {} diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml index f932676..7be9fb1 100644 --- 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.5 + terraform_version: 1.9.1 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml index 95479f4..534c461 100644 --- 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.5 + terraform_version: 1.9.1 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml index 389d2fd..e05ab32 100644 --- 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.5 + terraform_version: 1.9.1 terraform_wrapper: false - name: "Terraform Format" diff --git a/README.md b/README.md index b0cd224..f1b144f 100644 --- a/README.md +++ b/README.md @@ -29,12 +29,12 @@ 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.5 - - hashicorp/azurerm: 3.108.0 +- [Terraform](https://www.terraform.io/docs/index.html): 1.9.1 + - hashicorp/azurerm: 3.111.0 - State store: Local -- [TFLint](https://github.com/terraform-linters/tflint): 0.51.1 +- [TFLint](https://github.com/terraform-linters/tflint): 0.52.0 - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.26.0 -- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.3 +- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.4 - Ubuntu: 22.04.4 LTS ### Privileges required for execution diff --git a/terraform/blue/aks/main.tf b/terraform/blue/aks/main.tf index cb89c30..2d0031d 100644 --- a/terraform/blue/aks/main.tf +++ b/terraform/blue/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" required_providers { azurerm = { diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf index 8eb9352..009b5b3 100644 --- a/terraform/blue/apps/main.tf +++ b/terraform/blue/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" required_providers { azurerm = { diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf index 31aafb1..4958fa3 100644 --- a/terraform/blue/main.tf +++ b/terraform/blue/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.108.0" + version = "~> 3.111.0" } } } diff --git a/terraform/green/aks/main.tf b/terraform/green/aks/main.tf index cb89c30..2d0031d 100644 --- a/terraform/green/aks/main.tf +++ b/terraform/green/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" required_providers { azurerm = { diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf index 8eb9352..009b5b3 100644 --- a/terraform/green/apps/main.tf +++ b/terraform/green/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" required_providers { azurerm = { diff --git a/terraform/green/main.tf b/terraform/green/main.tf index 31aafb1..4958fa3 100644 --- a/terraform/green/main.tf +++ b/terraform/green/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.108.0" + version = "~> 3.111.0" } } } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index ca2c18b..02e3387 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.108.0" + version = "~> 3.111.0" } random = { @@ -305,7 +305,7 @@ resource "azurerm_container_group" "demoapp_redis" { container { name = "redis" - image = "bitnami/redis:7.0.5" + image = "bitnami/redis:7.0.15" cpu = "1.0" memory = "1.0" diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 2ddc618..b9e3bcc 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -TF_VERSION := 1.8.5 +TF_VERSION := 1.9.1 # 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 index 98831c2..e18242d 100644 --- 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.5", "specify Terraform version") + tfVer = flag.String("tf-version", "1.9.1", "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 index 5cdd9e1..35433c9 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -12,14 +12,14 @@ require ( ) require ( - github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton // indirect + github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/cloudflare/circl v1.3.9 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/zclconf/go-cty v1.14.4 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/mod v0.19.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect ) diff --git a/test/e2e/go.sum b/test/e2e/go.sum index d65508a..0434715 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -4,6 +4,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton h1:HKz85FwoXx86kVtTvFke7rgHvq/HoloSUvW5semjFWs= github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton h1:0RXAi0EJFs81j+MMsqvHNuAUGWzeVfCO9LnHAfoQ8NA= +github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI= @@ -74,10 +76,14 @@ golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= 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/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.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= @@ -85,6 +91,8 @@ 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/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf index 18cf027..86f42bb 100644 --- a/test/fixtures/blue/main.tf +++ b/test/fixtures/blue/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" } module "blue" { diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf index e2d650e..571da65 100644 --- a/test/fixtures/green/main.tf +++ b/test/fixtures/green/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" } module "green" { diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf index e033b32..6a902a1 100644 --- a/test/fixtures/shared/main.tf +++ b/test/fixtures/shared/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.8.5" + required_version = "~> 1.9.1" } module "shared" {