Skip to content

Commit

Permalink
EDSF-430 Support Terraform version 1.6.x (#279)
Browse files Browse the repository at this point in the history
* EDSF-430 Support Terraform version 1.6.x

* EDSF-430 Support Terraform version 1.6.x
  • Loading branch information
lindanasredin authored Oct 12, 2023
1 parent df9beac commit 790f1ac
Show file tree
Hide file tree
Showing 38 changed files with 38 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dsf_poc_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dsf_single_account_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_sonar_poc_basic_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plan_sonar_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar_multi_account_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar_poc_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ The following table lists the released eDSF Kit versions, their release date and
</td>
<td>
1. Sonar upgrade Alpha release. It can be used with caution.
<br/>2. Added support for Terraform version 1.6.x.
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/poc/dsf_deployment/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/poc/sonar_basic_deployment/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/poc/sonar_hadr_deployment/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/sonar_upgrade/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"
}
2 changes: 1 addition & 1 deletion modules/aws/agent-gw/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/agentless-gw/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/core/globals/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/core/key_pair/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/dam-base-instance/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/db-with-agent/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/dra-admin/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/dra-analytics/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/hub/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/mx/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/poc-db-onboarder/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/sonar-base-instance/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/sonar-upgrader/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"
}
2 changes: 1 addition & 1 deletion modules/aws/statistics/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/agentless-gw/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/core/globals/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/hub/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/sonar-base-instance/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/statistics/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/null/agent-gw-cluster-setup/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"
}
2 changes: 1 addition & 1 deletion modules/null/federation/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"
}
2 changes: 1 addition & 1 deletion modules/null/hadr/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"
}
2 changes: 1 addition & 1 deletion modules/null/statistics/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.6.0"
required_version = ">= 1.3.1, < 1.7.0"
}

0 comments on commit 790f1ac

Please sign in to comment.