Skip to content

Commit

Permalink
EDSF-532 Support Terraform version 1.7.0 (#364)
Browse files Browse the repository at this point in the history
  • Loading branch information
Linda Nasredin authored Jan 24, 2024
1 parent a646e74 commit a4c5c77
Show file tree
Hide file tree
Showing 53 changed files with 56 additions and 56 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 @@ -155,7 +155,7 @@ jobs:
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false
terraform_version: ~1.6.0
terraform_version: ~1.7.0

- name: Setup jq
uses: sergeysova/jq-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dsf_poc_cli_azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false
terraform_version: ~1.6.0
terraform_version: ~1.7.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 @@ -178,7 +178,7 @@ jobs:
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false
terraform_version: ~1.6.0
terraform_version: ~1.7.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.6.0
terraform_version: ~1.7.0

- name: Setup jq
uses: sergeysova/jq-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plan_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
with:
terraform_version: ~1.6.0
terraform_version: ~1.7.0

- name: Create License File
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false
terraform_version: ~1.6.0
terraform_version: ~1.7.0

- name: Format version for zip file name
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.6.0
terraform_version: ~1.7.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 @@ -127,7 +127,7 @@ jobs:
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false
terraform_version: ~1.6.0
terraform_version: ~1.7.0

- name: Setup jq
uses: sergeysova/jq-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar_upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
uses: hashicorp/setup-terraform@v2
with:
terraform_wrapper: false
terraform_version: ~1.6.0
terraform_version: ~1.7.0

- name: Setup jq
uses: sergeysova/jq-action@v2
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ This guide references the following information and links, some of which are ava
<td><a href="https://www.terraform.io/downloads">Download Terraform</a>
</td>
<td>
Latest Supported Terraform Version: 1.5.x. Using a higher version may result in unexpected behavior or errors.
Latest Supported Terraform Version: 1.7.x. Using a higher version may result in unexpected behavior or errors.
</td>
</tr>
<tr>
Expand Down Expand Up @@ -458,7 +458,7 @@ Before using eDSF Kit to deploy DSF, it is necessary to satisfy a set of prerequ
1. Only if you chose the [CLI Deployment Mode](#cli-deployment-mode), install [Git](https://git-scm.com).
2. Only if you chose the [CLI Deployment Mode](#cli-deployment-mode), install [Terraform](https://www.terraform.io). It is recommended on MacOS systems to use the "Package Manager" option during installation.
3. Latest Supported Terraform Version: 1.6.x. Using a higher version may result in unexpected behavior or errors.
3. Latest Supported Terraform Version: 1.7.x. Using a higher version may result in unexpected behavior or errors.
4. [jq](https://jqlang.github.io/jq/) - Command-line JSON processor.
5. [curl](https://curl.se/) - Command-line tool for transferring data.
Expand Down Expand Up @@ -1071,7 +1071,7 @@ Before using eDSF Kit to upgrade DSF Hubs and Agentless Gateways, it is necessar
2. Only if you chose the [CLI Upgrade Mode](#cli-upgrade-mode), install [Git](https://git-scm.com).
3. Only if you chose the [CLI Upgrade Mode](#cli-upgrade-mode), install [Terraform](https://www.terraform.io). It is recommended on MacOS systems to use the "Package Manager" option during installation.
4. Only if you chose the [CLI Upgrade Mode](#cli-upgrade-mode), install [Python 3](https://www.python.org).
5. Latest Supported Terraform Version: 1.6.x. Using a higher version may result in unexpected behavior or errors.
5. Latest Supported Terraform Version: 1.7.x. Using a higher version may result in unexpected behavior or errors.
6. The upgrade requires permission and network access (SSH) from your computer or the installer machine (depending on your choice of upgrade mode) to the deployed environment on AWS.
### Additional Prerequisites
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.1, < 1.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"
}
2 changes: 1 addition & 1 deletion examples/azure/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"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
azurerm = {
Expand Down
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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/rds-mssql-db/versions.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
terraform {
required_version = ">= 0.13"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
source = "hashicorp/aws"
source = "hashicorp/aws"
version = ">= 4.23.0"
configuration_aliases = [aws.poc_scripts_s3_region]
}
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/rds-mysql-db/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/rds-postgres-db/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
azurerm = {
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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

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

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

required_providers {
azurerm = {
Expand Down
2 changes: 1 addition & 1 deletion modules/azurerm/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.7.0"
required_version = ">= 1.3.1, < 1.8.0"

required_providers {
aws = {
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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"
}
2 changes: 1 addition & 1 deletion modules/null/poc-db-onboarder/versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 1.3.1, < 1.7.0"
required_version = ">= 1.3.1, < 1.8.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.7.0"
required_version = ">= 1.3.1, < 1.8.0"
}

0 comments on commit a4c5c77

Please sign in to comment.