From 0f5c2c83a7103509a51278cedfcf1b09b4862f6e Mon Sep 17 00:00:00 2001 From: Toru Makabe <993850+torumakabe@users.noreply.github.com> Date: Fri, 4 Aug 2023 16:10:39 +0900 Subject: [PATCH] bump --- .github/workflows/ci-terraform-blue.yaml | 2 +- .github/workflows/ci-terraform-green.yaml | 2 +- .github/workflows/ci-terraform-shared.yaml | 2 +- README.md | 4 ++-- terraform/blue/aks/locals.tf | 2 +- terraform/blue/aks/main.tf | 2 +- terraform/blue/apps/main.tf | 2 +- terraform/blue/main.tf | 4 ++-- terraform/green/aks/locals.tf | 2 +- 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 | 12 +++++------ test/e2e/go.sum | 24 +++++++++++----------- test/fixtures/blue/main.tf | 2 +- test/fixtures/green/main.tf | 2 +- test/fixtures/shared/main.tf | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml index a9b5fb7..4006725 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@v2 with: - terraform_version: 1.5.3 + terraform_version: 1.5.4 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml index c767565..34da73e 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@v2 with: - terraform_version: 1.5.3 + terraform_version: 1.5.4 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml index 8f70a68..18b4b13 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@v2 with: - terraform_version: 1.5.3 + terraform_version: 1.5.4 terraform_wrapper: false - name: "Terraform Format" diff --git a/README.md b/README.md index 5fcfe7c..1ef829f 100644 --- 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.5.3 - - hashicorp/azurerm: 3.65.0 +- [Terraform](https://www.terraform.io/docs/index.html): 1.5.4 + - hashicorp/azurerm: 3.68.0 - State store: Local - [TFLint](https://github.com/terraform-linters/tflint): 0.47.0 - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.24.0 diff --git a/terraform/blue/aks/locals.tf b/terraform/blue/aks/locals.tf index 57b5b53..e0753ca 100644 --- a/terraform/blue/aks/locals.tf +++ b/terraform/blue/aks/locals.tf @@ -15,7 +15,7 @@ locals { cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}" default = { - orchestrator_version = "1.27.1" + orchestrator_version = "1.27.3" vm_size = "Standard_D2ds_v5" os_disk_size_gb = 75 os_disk_type = "Ephemeral" diff --git a/terraform/blue/aks/main.tf b/terraform/blue/aks/main.tf index f6429f2..c212459 100644 --- a/terraform/blue/aks/main.tf +++ b/terraform/blue/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" required_providers { azurerm = { diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf index 89e9f52..44918b6 100644 --- a/terraform/blue/apps/main.tf +++ b/terraform/blue/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" required_providers { azurerm = { diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf index bcdb1c4..a0e1dd4 100644 --- a/terraform/blue/main.tf +++ b/terraform/blue/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.65.0" + version = "~> 3.68.0" } } } diff --git a/terraform/green/aks/locals.tf b/terraform/green/aks/locals.tf index 57b5b53..e0753ca 100644 --- a/terraform/green/aks/locals.tf +++ b/terraform/green/aks/locals.tf @@ -15,7 +15,7 @@ locals { cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}" default = { - orchestrator_version = "1.27.1" + orchestrator_version = "1.27.3" vm_size = "Standard_D2ds_v5" os_disk_size_gb = 75 os_disk_type = "Ephemeral" diff --git a/terraform/green/aks/main.tf b/terraform/green/aks/main.tf index f6429f2..c212459 100644 --- a/terraform/green/aks/main.tf +++ b/terraform/green/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" required_providers { azurerm = { diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf index 89e9f52..44918b6 100644 --- a/terraform/green/apps/main.tf +++ b/terraform/green/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" required_providers { azurerm = { diff --git a/terraform/green/main.tf b/terraform/green/main.tf index bcdb1c4..a0e1dd4 100644 --- a/terraform/green/main.tf +++ b/terraform/green/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.65.0" + version = "~> 3.68.0" } } } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index 8c98491..9ddd5f9 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -1,17 +1,17 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.65.0" + version = "~> 3.68.0" } azapi = { source = "Azure/azapi" - version = "~> 1.7" + version = "~> 1.8" } random = { diff --git a/test/e2e/Makefile b/test/e2e/Makefile index a1db3be..ab7b799 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -TF_VERSION := 1.5.3 +TF_VERSION := 1.5.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 index 2b1c78d..be0c651 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.5.3", "specify Terraform version") + tfVer = flag.String("tf-version", "1.5.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 index 6b89a04..5a430c1 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -10,14 +10,14 @@ require ( ) require ( - github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/terraform-json v0.17.0 // indirect + github.com/hashicorp/terraform-json v0.17.1 // indirect github.com/zclconf/go-cty v1.13.2 // indirect - golang.org/x/crypto v0.10.0 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/text v0.10.0 // indirect + golang.org/x/crypto v0.11.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect ) diff --git a/test/e2e/go.sum b/test/e2e/go.sum index 377282b..9fc185c 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -1,6 +1,6 @@ github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= -github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec h1:vV3RryLxt42+ZIVOFbYJCH1jsZNTNmj2NYru5zfx+4E= -github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs= +github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= @@ -26,8 +26,8 @@ github.com/hashicorp/hc-install v0.5.2 h1:SfwMFnEXVVirpwkDuSF5kymUOhrUxrTq3udEse github.com/hashicorp/hc-install v0.5.2/go.mod h1:9QISwe6newMWIfEiXpzuu1k9HAGtQYgnSH8H9T8wmoI= github.com/hashicorp/terraform-exec v0.18.1 h1:LAbfDvNQU1l0NOQlTuudjczVhHj061fNX5H8XZxHlH4= github.com/hashicorp/terraform-exec v0.18.1/go.mod h1:58wg4IeuAJ6LVsLUeD2DWZZoc/bYi6dzhLHzxM41980= -github.com/hashicorp/terraform-json v0.17.0 h1:EiA1Wp07nknYQAiv+jIt4dX4Cq5crgP+TsTE45MjMmM= -github.com/hashicorp/terraform-json v0.17.0/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o= +github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA= +github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= @@ -44,12 +44,12 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -69,8 +69,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -82,8 +82,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf index d2efbc1..6a3b0fc 100644 --- a/test/fixtures/blue/main.tf +++ b/test/fixtures/blue/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" } module "blue" { diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf index 52ffca5..c73ec5b 100644 --- a/test/fixtures/green/main.tf +++ b/test/fixtures/green/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" } module "green" { diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf index 7103b8e..e988fa2 100644 --- a/test/fixtures/shared/main.tf +++ b/test/fixtures/shared/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.5.3" + required_version = "~> 1.5.4" } module "shared" {