From 34406d73a79aa0c26b2fc82842a463b32aee6c8a Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Wed, 11 Oct 2023 16:32:16 +0300 Subject: [PATCH 1/2] EDSF-430 Support Terraform version 1.6.x --- .github/workflows/dsf_poc_cli.yml | 2 +- .github/workflows/dsf_single_account_cli.yml | 2 +- .github/workflows/nightly_sonar_poc_basic_cli.yml | 2 +- .github/workflows/plan_sonar_cli.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sonar_multi_account_cli.yml | 2 +- .github/workflows/sonar_poc_cli.yml | 2 +- README.md | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dsf_poc_cli.yml b/.github/workflows/dsf_poc_cli.yml index 4a7cf3513..4abbe6690 100644 --- a/.github/workflows/dsf_poc_cli.yml +++ b/.github/workflows/dsf_poc_cli.yml @@ -130,7 +130,7 @@ jobs: uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Setup jq uses: sergeysova/jq-action@v2 diff --git a/.github/workflows/dsf_single_account_cli.yml b/.github/workflows/dsf_single_account_cli.yml index e38adf3f4..f092fa40c 100644 --- a/.github/workflows/dsf_single_account_cli.yml +++ b/.github/workflows/dsf_single_account_cli.yml @@ -147,7 +147,7 @@ jobs: uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Setup jq uses: sergeysova/jq-action@v2 diff --git a/.github/workflows/nightly_sonar_poc_basic_cli.yml b/.github/workflows/nightly_sonar_poc_basic_cli.yml index 57e0cb55d..67a1bb7ae 100644 --- a/.github/workflows/nightly_sonar_poc_basic_cli.yml +++ b/.github/workflows/nightly_sonar_poc_basic_cli.yml @@ -89,7 +89,7 @@ jobs: uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Setup jq uses: sergeysova/jq-action@v2 diff --git a/.github/workflows/plan_sonar_cli.yml b/.github/workflows/plan_sonar_cli.yml index 2b51a3a8c..229c3ade8 100644 --- a/.github/workflows/plan_sonar_cli.yml +++ b/.github/workflows/plan_sonar_cli.yml @@ -89,7 +89,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v2 with: - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Configure AWS credentials - innodev if: contains(matrix.name, 'single account') || contains(matrix.name, 'multi account') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 182543f65..93ca8e566 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,7 +71,7 @@ jobs: uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Update modules' versions in examples run: | diff --git a/.github/workflows/sonar_multi_account_cli.yml b/.github/workflows/sonar_multi_account_cli.yml index a5cf3c124..3126b8d10 100644 --- a/.github/workflows/sonar_multi_account_cli.yml +++ b/.github/workflows/sonar_multi_account_cli.yml @@ -121,7 +121,7 @@ jobs: uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Setup jq uses: sergeysova/jq-action@v2 diff --git a/.github/workflows/sonar_poc_cli.yml b/.github/workflows/sonar_poc_cli.yml index 44ad2a2a6..110a5de2c 100644 --- a/.github/workflows/sonar_poc_cli.yml +++ b/.github/workflows/sonar_poc_cli.yml @@ -144,7 +144,7 @@ jobs: uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - terraform_version: ~1.5.0 + terraform_version: ~1.6.0 - name: Setup jq uses: sergeysova/jq-action@v2 diff --git a/README.md b/README.md index fd4335e34..c439bc050 100644 --- a/README.md +++ b/README.md @@ -401,6 +401,7 @@ The following table lists the released eDSF Kit versions, their release date and 1. Sonar upgrade Alpha release. It can be used with caution. +
2. Added support for Terraform version 1.6.x. From 49f95c3cc266877a64d0ec887e9186a5809a31eb Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Wed, 11 Oct 2023 19:42:46 +0300 Subject: [PATCH 2/2] EDSF-430 Support Terraform version 1.6.x --- examples/installation/dsf_single_account_deployment/versions.tf | 2 +- .../installation/sonar_multi_account_deployment/versions.tf | 2 +- .../installation/sonar_single_account_deployment/versions.tf | 2 +- examples/poc/dsf_deployment/versions.tf | 2 +- examples/poc/sonar_basic_deployment/versions.tf | 2 +- examples/poc/sonar_hadr_deployment/versions.tf | 2 +- examples/sonar_upgrade/versions.tf | 2 +- modules/aws/agent-gw/versions.tf | 2 +- modules/aws/agentless-gw/versions.tf | 2 +- modules/aws/core/globals/versions.tf | 2 +- modules/aws/core/key_pair/versions.tf | 2 +- modules/aws/dam-base-instance/versions.tf | 2 +- modules/aws/db-with-agent/versions.tf | 2 +- modules/aws/dra-admin/versions.tf | 2 +- modules/aws/dra-analytics/versions.tf | 2 +- modules/aws/hub/versions.tf | 2 +- modules/aws/mx/versions.tf | 2 +- modules/aws/poc-db-onboarder/versions.tf | 2 +- modules/aws/sonar-base-instance/versions.tf | 2 +- modules/aws/sonar-upgrader/versions.tf | 2 +- modules/aws/statistics/versions.tf | 2 +- modules/azurerm/agentless-gw/versions.tf | 2 +- modules/azurerm/core/globals/versions.tf | 2 +- modules/azurerm/hub/versions.tf | 2 +- modules/azurerm/sonar-base-instance/versions.tf | 2 +- modules/azurerm/statistics/versions.tf | 2 +- modules/null/agent-gw-cluster-setup/versions.tf | 2 +- modules/null/federation/versions.tf | 2 +- modules/null/hadr/versions.tf | 2 +- modules/null/statistics/versions.tf | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/installation/dsf_single_account_deployment/versions.tf b/examples/installation/dsf_single_account_deployment/versions.tf index e1538584d..23724e137 100644 --- a/examples/installation/dsf_single_account_deployment/versions.tf +++ b/examples/installation/dsf_single_account_deployment/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/examples/installation/sonar_multi_account_deployment/versions.tf b/examples/installation/sonar_multi_account_deployment/versions.tf index 555963eac..87c868ff4 100644 --- a/examples/installation/sonar_multi_account_deployment/versions.tf +++ b/examples/installation/sonar_multi_account_deployment/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/examples/installation/sonar_single_account_deployment/versions.tf b/examples/installation/sonar_single_account_deployment/versions.tf index 555963eac..87c868ff4 100644 --- a/examples/installation/sonar_single_account_deployment/versions.tf +++ b/examples/installation/sonar_single_account_deployment/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/examples/poc/dsf_deployment/versions.tf b/examples/poc/dsf_deployment/versions.tf index e1538584d..23724e137 100644 --- a/examples/poc/dsf_deployment/versions.tf +++ b/examples/poc/dsf_deployment/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/examples/poc/sonar_basic_deployment/versions.tf b/examples/poc/sonar_basic_deployment/versions.tf index 555963eac..87c868ff4 100644 --- a/examples/poc/sonar_basic_deployment/versions.tf +++ b/examples/poc/sonar_basic_deployment/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/examples/poc/sonar_hadr_deployment/versions.tf b/examples/poc/sonar_hadr_deployment/versions.tf index 555963eac..87c868ff4 100644 --- a/examples/poc/sonar_hadr_deployment/versions.tf +++ b/examples/poc/sonar_hadr_deployment/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/examples/sonar_upgrade/versions.tf b/examples/sonar_upgrade/versions.tf index de83c713b..3ec2b2811 100644 --- a/examples/sonar_upgrade/versions.tf +++ b/examples/sonar_upgrade/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" } diff --git a/modules/aws/agent-gw/versions.tf b/modules/aws/agent-gw/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/agent-gw/versions.tf +++ b/modules/aws/agent-gw/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/agentless-gw/versions.tf b/modules/aws/agentless-gw/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/agentless-gw/versions.tf +++ b/modules/aws/agentless-gw/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/core/globals/versions.tf b/modules/aws/core/globals/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/core/globals/versions.tf +++ b/modules/aws/core/globals/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/core/key_pair/versions.tf b/modules/aws/core/key_pair/versions.tf index e1538584d..23724e137 100644 --- a/modules/aws/core/key_pair/versions.tf +++ b/modules/aws/core/key_pair/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/dam-base-instance/versions.tf b/modules/aws/dam-base-instance/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/dam-base-instance/versions.tf +++ b/modules/aws/dam-base-instance/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/db-with-agent/versions.tf b/modules/aws/db-with-agent/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/db-with-agent/versions.tf +++ b/modules/aws/db-with-agent/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/dra-admin/versions.tf b/modules/aws/dra-admin/versions.tf index 805878e30..66fd2a10c 100644 --- a/modules/aws/dra-admin/versions.tf +++ b/modules/aws/dra-admin/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/dra-analytics/versions.tf b/modules/aws/dra-analytics/versions.tf index 805878e30..66fd2a10c 100644 --- a/modules/aws/dra-analytics/versions.tf +++ b/modules/aws/dra-analytics/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/hub/versions.tf b/modules/aws/hub/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/hub/versions.tf +++ b/modules/aws/hub/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/mx/versions.tf b/modules/aws/mx/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/mx/versions.tf +++ b/modules/aws/mx/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/poc-db-onboarder/versions.tf b/modules/aws/poc-db-onboarder/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/poc-db-onboarder/versions.tf +++ b/modules/aws/poc-db-onboarder/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/sonar-base-instance/versions.tf b/modules/aws/sonar-base-instance/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/sonar-base-instance/versions.tf +++ b/modules/aws/sonar-base-instance/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/aws/sonar-upgrader/versions.tf b/modules/aws/sonar-upgrader/versions.tf index de83c713b..3ec2b2811 100644 --- a/modules/aws/sonar-upgrader/versions.tf +++ b/modules/aws/sonar-upgrader/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" } diff --git a/modules/aws/statistics/versions.tf b/modules/aws/statistics/versions.tf index 0479d8bad..f205f46c6 100644 --- a/modules/aws/statistics/versions.tf +++ b/modules/aws/statistics/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { aws = { diff --git a/modules/azurerm/agentless-gw/versions.tf b/modules/azurerm/agentless-gw/versions.tf index 452b1f596..2236d91ec 100644 --- a/modules/azurerm/agentless-gw/versions.tf +++ b/modules/azurerm/agentless-gw/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { azurerm = { diff --git a/modules/azurerm/core/globals/versions.tf b/modules/azurerm/core/globals/versions.tf index 452b1f596..2236d91ec 100644 --- a/modules/azurerm/core/globals/versions.tf +++ b/modules/azurerm/core/globals/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { azurerm = { diff --git a/modules/azurerm/hub/versions.tf b/modules/azurerm/hub/versions.tf index 452b1f596..2236d91ec 100644 --- a/modules/azurerm/hub/versions.tf +++ b/modules/azurerm/hub/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { azurerm = { diff --git a/modules/azurerm/sonar-base-instance/versions.tf b/modules/azurerm/sonar-base-instance/versions.tf index 452b1f596..2236d91ec 100644 --- a/modules/azurerm/sonar-base-instance/versions.tf +++ b/modules/azurerm/sonar-base-instance/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { azurerm = { diff --git a/modules/azurerm/statistics/versions.tf b/modules/azurerm/statistics/versions.tf index 452b1f596..2236d91ec 100644 --- a/modules/azurerm/statistics/versions.tf +++ b/modules/azurerm/statistics/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" required_providers { azurerm = { diff --git a/modules/null/agent-gw-cluster-setup/versions.tf b/modules/null/agent-gw-cluster-setup/versions.tf index de83c713b..3ec2b2811 100644 --- a/modules/null/agent-gw-cluster-setup/versions.tf +++ b/modules/null/agent-gw-cluster-setup/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" } diff --git a/modules/null/federation/versions.tf b/modules/null/federation/versions.tf index de83c713b..3ec2b2811 100644 --- a/modules/null/federation/versions.tf +++ b/modules/null/federation/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" } diff --git a/modules/null/hadr/versions.tf b/modules/null/hadr/versions.tf index de83c713b..3ec2b2811 100644 --- a/modules/null/hadr/versions.tf +++ b/modules/null/hadr/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" } diff --git a/modules/null/statistics/versions.tf b/modules/null/statistics/versions.tf index de83c713b..3ec2b2811 100644 --- a/modules/null/statistics/versions.tf +++ b/modules/null/statistics/versions.tf @@ -1,3 +1,3 @@ terraform { - required_version = ">= 1.3.1, < 1.6.0" + required_version = ">= 1.3.1, < 1.7.0" }