From 354daf7688b454e0583c297e5a4b0c7a3ec06a17 Mon Sep 17 00:00:00 2001 From: eytannnaim <80354890+eytannnaim@users.noreply.github.com> Date: Mon, 23 Oct 2023 12:50:55 +0300 Subject: [PATCH 1/5] Cover all examples wutg our plan action (#289) --- .github/workflows/plan_sonar_cli.yml | 73 +++++++++++++++++++++------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/.github/workflows/plan_sonar_cli.yml b/.github/workflows/plan_sonar_cli.yml index 229c3ade8..be0e92a83 100644 --- a/.github/workflows/plan_sonar_cli.yml +++ b/.github/workflows/plan_sonar_cli.yml @@ -49,14 +49,30 @@ jobs: fail-fast: false matrix: include: - - name: Sonar Basic + - name: Azure - POC - DSF + example: ./examples/azure/dsf_deployment + terraformvars: | + resource_group_location = "East US" + tarball_location = { + az_resource_group = "dummy-resource-group" + az_storage_account = "dummy-torage-account" + az_container = "dummy-container" + az_blob = "dummy-blob" + } + - name: AWS - POC - DSF + example: ./examples/poc/dsf_deployment + terraformvars: | + dam_license="license.mprv" + - name: AWS - POC - Sonar Basic example: ./examples/poc/sonar_basic_deployment - - name: Sonar HADR + - name: AWS - POC - Sonar HADR example: ./examples/poc/sonar_hadr_deployment - - name: Sonar Single Account + - name: AWS - Installation - Sonar Single Account example: ./examples/installation/sonar_single_account_deployment - - name: Sonar Multi Account + - name: AWS - Installation - Sonar Multi Account example: ./examples/installation/sonar_multi_account_deployment + - name: AWS - Installation - DSF Single Account + example: ./examples/installation/dsf_single_account_deployment name: '${{ matrix.name }}' env: @@ -65,7 +81,11 @@ jobs: AWS_REGION: us-west-2 AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - + ARM_SUBSCRIPTION_ID: ${{ vars.ARM_SUBSCRIPTION_ID }} + ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }} + ARM_TENANT_ID: ${{ vars.ARM_TENANT_ID }} + ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} + steps: - name: Pick ref run: | @@ -83,7 +103,7 @@ jobs: - name: Change the modules source to local if: ${{ inputs.use_modules_from_terraform_registry == false }} run: | - find ./examples/ -type f -exec sed -i -f sed.expr {} \; + find ${{ matrix.example }} -type f -exec sed -i -f sed.expr {} \; # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token - name: Setup Terraform @@ -91,6 +111,12 @@ jobs: with: terraform_version: ~1.6.0 + - name: Create License File + env: + MY_SECRET: ${{ secrets.DAM_LICENSE }} + run: | + echo "${{ secrets.DAM_LICENSE }}" | base64 -d > ${{ matrix.example }}/license.mprv + - name: Configure AWS credentials - innodev if: contains(matrix.name, 'single account') || contains(matrix.name, 'multi account') run: | @@ -108,23 +134,34 @@ jobs: run: | aws sts get-caller-identity - - name: Create tfvars File - if: contains(matrix.name, 'Single Account') || contains(matrix.name, 'Multi Account') + - name: Create tfvars file (1) + if: matrix.terraformvars + run: | + echo '${{ matrix.terraformvars }}' >> "${{ matrix.example }}/terraform.tfvars" + + - name: Create tfvars File (2) + if: matrix.name == 'AWS - Installation - Sonar Single Account' run: | - if [ "${{ matrix.name }}" == "Sonar Single Account" ]; then - cat << EOF > "${{ matrix.example }}/terraform.tfvars" - ${{ vars.TFVAR_PARAMETERS_SINGLE_ACCOUNT_AUTOMATION_V1 }} + cat << EOF > "${{ matrix.example }}/terraform.tfvars" + ${{ vars.TFVAR_PARAMETERS_SINGLE_ACCOUNT_AUTOMATION_V1 }} EOF - elif [ "${{ matrix.name }}" == "Sonar Multi Account" ]; then - cat << EOF > "${{ matrix.example }}/terraform.tfvars" - ${{ vars.TFVAR_PARAMETERS_MULTI_ACCOUNT_AUTOMATION_V1 }} + + - name: Create tfvars File (3) + if: matrix.name == 'AWS - Installation - Sonar Multi Account' + run: | + cat << EOF > "${{ matrix.example }}/terraform.tfvars" + ${{ vars.TFVAR_PARAMETERS_MULTI_ACCOUNT_AUTOMATION_V1 }} EOF - fi - + - name: Create tfvars File (4) + if: matrix.name == 'AWS - Installation - DSF Single Account' + run: | + cat << EOF > "${{ matrix.example }}/terraform.tfvars" + ${{ vars.TFVAR_PARAMETERS_DSF_SINGLE_ACCOUNT_AUTOMATION_PRIVATE_SUBNETS_V1 }} + EOF + - name: View The Vars - if: contains(matrix.name, 'single account') || contains(matrix.name, 'multi account') - run: cat ${{ matrix.example }}/terraform.tfvars + run: cat ${{ matrix.example }}/terraform.tfvars || true # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. - name: Terraform Init From 2ebf1ccb604d14f890a0de63be5304d15aa8633e Mon Sep 17 00:00:00 2001 From: Eytan Naim Date: Mon, 23 Oct 2023 14:12:50 +0300 Subject: [PATCH 2/5] Github Actions | Renamed file [skip actions] --- .github/workflows/{plan_sonar_cli.yml => plan_cli.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{plan_sonar_cli.yml => plan_cli.yml} (100%) diff --git a/.github/workflows/plan_sonar_cli.yml b/.github/workflows/plan_cli.yml similarity index 100% rename from .github/workflows/plan_sonar_cli.yml rename to .github/workflows/plan_cli.yml From 89138e76e53cf25f96ecc10f94852033a59ca1db Mon Sep 17 00:00:00 2001 From: Linda Nasredin Date: Mon, 23 Oct 2023 16:16:58 +0300 Subject: [PATCH 3/5] EDSF-439 Sonar upgrade automation support (#290) * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * add default ws for init upgrade * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support * EDSF-439 Sonar upgrade automation support --------- Co-authored-by: elsegev <87799317+elsegev@users.noreply.github.com> --- .github/workflows/sonar_upgrade.yml | 346 ++++++++++++++++++++++++++++ 1 file changed, 346 insertions(+) create mode 100644 .github/workflows/sonar_upgrade.yml diff --git a/.github/workflows/sonar_upgrade.yml b/.github/workflows/sonar_upgrade.yml new file mode 100644 index 000000000..63f85776d --- /dev/null +++ b/.github/workflows/sonar_upgrade.yml @@ -0,0 +1,346 @@ +name: 'Sonar Upgrade' + +on: + workflow_call: + inputs: + use_modules_from_terraform_registry: + required: true + type: boolean + explicit_ref: + required: true + type: string + secrets: + AWS_ACCESS_KEY_ID: + required: true + AWS_SECRET_ACCESS_KEY: + required: true + SLACK_WEBHOOK_URL: + required: true + DAM_LICENSE: + required: true + + workflow_dispatch: + inputs: + use_modules_from_terraform_registry: + type: boolean + required: false + + push: + branches: + - 'master' + - 'dev' + paths: + - 'modules/aws/sonar-upgrader/*' + - 'examples/sonar_upgrade/*' + +env: + TF_CLI_ARGS: "-no-color" + TF_INPUT: 0 + TF_VAR_agentless_gw_count: 1 + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + +permissions: + contents: read + +jobs: + terraform: + strategy: + fail-fast: false + matrix: + include: + - name: Sonar DSF POC Basic Upgrade + workspace: sonar_dsf_basic_upgrade- + enable_sonar: true + enable_dam: false + enable_dra: false + hub_hadr: false + agentless_gw_hadr: false + simulation_db_types_for_agentless: "[]" + + name: '${{ matrix.name }}' + runs-on: ubuntu-latest + env: + DEPLOYMENT_EXAMPLE_DIR: ./examples/poc/dsf_deployment + UPGRADE_EXAMPLE_DIR: ./examples/sonar_upgrade + AWS_REGION: eu-west-2 + SONAR_TARGET_VERSION: 4.13.0.10.0 + TF_VAR_enable_sonar: ${{ matrix.enable_sonar }} + TF_VAR_enable_dam: ${{ matrix.enable_dam }} + TF_VAR_enable_dra: ${{ matrix.enable_dra }} + TF_VAR_sonar_version: 4.11.0.0 + TF_VAR_hub_hadr: ${{ matrix.hub_hadr }} + TF_VAR_agentless_gw_hadr: ${{ matrix.agentless_gw_hadr }} + TF_VAR_simulation_db_types_for_agentless: ${{ matrix.simulation_db_types_for_agentless }} + environment: test + + # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest + defaults: + run: + shell: bash + steps: + + - name: Pick ref + run: | + if [ -z "${{ inputs.explicit_ref }}" ]; then + echo REF=${{ github.ref }} >> $GITHUB_ENV; + else + echo REF=${{ inputs.explicit_ref }} >> $GITHUB_ENV; + fi + + - name: Set Workspace Name + run: | + echo "Event Name: ${{ github.event_name }}" + if [ ${{ github.event_name }} == 'schedule' ]; then + echo TF_WORKSPACE=${{ matrix.workspace }}${{ github.event_name }}-$REF >> $GITHUB_ENV + else + echo TF_WORKSPACE=${{ matrix.workspace }}${{ github.run_number }}-${{ github.run_attempt }}-${{ inputs.explicit_ref }} >> $GITHUB_ENV + echo TMP_WORKSPACE_NAME=${{ matrix.workspace }}${{ github.run_number }}-${{ github.run_attempt }}-${{ inputs.explicit_ref }} >> $GITHUB_ENV + fi + + # Checkout the repository to the GitHub Actions runner + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ env.REF }} + + - name: Change the modules source to local + if: ${{ inputs.use_modules_from_terraform_registry == false }} + run: | + find ./examples/ -type f -exec sed -i -f sed.expr {} \; + + - name: Sets env vars for environment + run: | + echo "TF_VAR_tarball_s3_bucket=0ed58e18-0c0c-11ed-861d-0242ac120003" >> $GITHUB_ENV + if: github.ref != 'refs/heads/"master"' + + - name: Create terraform backend file for the deployment + run: | + cat << EOF > $DEPLOYMENT_EXAMPLE_DIR/backend.tf + terraform { + backend "s3" { + bucket = "terraform-state-bucket-dsfkit-github-tests" + key = "states/terraform_deployment.tfstate" + dynamodb_table = "terraform-state-lock" + region = "us-east-1" + } + } + EOF + + - name: Create terraform backend file for the upgrade + run: | + cat << EOF > $UPGRADE_EXAMPLE_DIR/backend.tf + terraform { + backend "s3" { + bucket = "terraform-state-bucket-dsfkit-github-tests" + key = "states/terraform_upgrade.tfstate" + dynamodb_table = "terraform-state-lock" + region = "us-east-1" + } + } + EOF + + # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token + - name: Setup Terraform + uses: hashicorp/setup-terraform@v2 + with: + terraform_wrapper: false + terraform_version: ~1.6.0 + + - name: Setup jq + uses: sergeysova/jq-action@v2 + + #### Deployment + + - name: Create License File + env: + MY_SECRET: ${{ secrets.DAM_LICENSE }} + run: | + echo "${{ secrets.DAM_LICENSE }}" | base64 -d > $DEPLOYMENT_EXAMPLE_DIR/license.mprv + cat $DEPLOYMENT_EXAMPLE_DIR/license.mprv + + # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. + - name: Terraform Init for deployment + run: terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR init + env: + TF_WORKSPACE: default + + - name: Cleaning environment for deployment + run: | + if [ ${{ github.event_name }} == 'schedule' ]; then + mv $DEPLOYMENT_EXAMPLE_DIR/main.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/outputs.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/dam.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/dra.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/sonar.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/networking.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/agentless_sources.tf{,_} + mv $DEPLOYMENT_EXAMPLE_DIR/agent_sources.tf{,_} + terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR destroy -var dam_license=license.mprv -auto-approve + mv $DEPLOYMENT_EXAMPLE_DIR/main.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/outputs.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/dam.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/dra.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/sonar.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/networking.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/agentless_sources.tf{_,} + mv $DEPLOYMENT_EXAMPLE_DIR/agent_sources.tf{_,} + fi + + - name: Terraform Validate for deployment + run: terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR validate + + # Generates an execution plan for Terraform + - name: Terraform Plan for deployment + run: | + terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR workspace list + terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR plan -var dam_license=license.mprv + + # On push to "main", build or change infrastructure according to Terraform configuration files + # Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks + - name: Terraform Apply for deployment + id: apply_deployment + # if: github.ref == 'refs/heads/"master"' && github.event_name == 'push' || github.event_name == 'workflow_dispatch' + run: terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR apply -var dam_license=license.mprv -auto-approve + + - name: Terraform Output for deployment + if: always() + run: terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR output -json + + - name: Set Environment Variables to pass info from deployment to upgrade + run: | + echo hub_ip=$(terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR output -json | jq -r '.sonar.value.hub_main.public_ip') >> $GITHUB_ENV + echo agentless_gw_0_ip=$(terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR output -json | jq -r '.sonar.value.agentless_gw_main[0].private_ip') >> $GITHUB_ENV + echo dsf_ssh_key_file_name=../../$DEPLOYMENT_EXAMPLE_DIR/$(terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR output -json | jq -r '.dsf_private_ssh_key_file_path.value') >> $GITHUB_ENV + + - name: Collect Artifacts for deployment + if: always() + uses: actions/upload-artifact@v2 + with: + name: collected-keys + path: | + ${{ env.DEPLOYMENT_EXAMPLE_DIR }}/ssh_keys + + #### Upgrade + + - name: Prepare upgrade input + run: | + set -x + cat > $UPGRADE_EXAMPLE_DIR/main.tf << EOF + module "sonar_upgrader" { + source = "../../modules/aws/sonar-upgrader" + + agentless_gws = [ + { + "main" = { + "host" = "${agentless_gw_0_ip}" + "ssh_user" = "ec2-user" + "ssh_private_key_file_path" = "${dsf_ssh_key_file_name}" + "proxy" = { + "host" = "${hub_ip}" + "ssh_user" = "ec2-user" + "ssh_private_key_file_path" = "${dsf_ssh_key_file_name}" + } + } + } + ] + dsf_hubs = [ + { + "main" = { + "host" = "${hub_ip}" + "ssh_user" = "ec2-user" + "ssh_private_key_file_path" = "${dsf_ssh_key_file_name}" + } + } + ] + + target_version = "${SONAR_TARGET_VERSION}" + + test_connection = true + run_preflight_validations = true + run_upgrade = true + run_postflight_validations = true + stop_on_failure = true + + } + EOF + cat ${UPGRADE_EXAMPLE_DIR}/main.tf + + # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. + - name: Terraform Init for upgrade + run: terraform -chdir=$UPGRADE_EXAMPLE_DIR init + env: + TF_WORKSPACE: default + + - name: Cleaning environment for upgrade + run: | + if [ ${{ github.event_name }} == 'schedule' ]; then + mv $UPGRADE_EXAMPLE_DIR/main.tf{,_} + terraform -chdir=$UPGRADE_EXAMPLE_DIR destroy -auto-approve + mv $UPGRADE_EXAMPLE_DIR/main.tf{_,} + fi + + - name: Terraform Validate for upgrade + run: terraform -chdir=$UPGRADE_EXAMPLE_DIR validate + + - name: Terraform Plan for upgrade + run: | + terraform -chdir=$UPGRADE_EXAMPLE_DIR workspace list + terraform -chdir=$UPGRADE_EXAMPLE_DIR plan + + - name: Terraform Apply for upgrade + id: apply_upgrade + run: terraform -chdir=$UPGRADE_EXAMPLE_DIR apply -auto-approve + + - name: Terraform Output for upgrade + if: always() + run: terraform -chdir=$UPGRADE_EXAMPLE_DIR output -json + + #### Cleanup + + - name: Terraform Destroy for deployment + id: destroy_deployment + if: always() + run: | + if [ '${{ steps.apply_deployment.conclusion }}' == 'success' ] || [ ${{ github.event_name }} != 'schedule' ]; then + terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR destroy -var dam_license=license.mprv -auto-approve + fi + + - name: Terraform Destroy for upgrade + id: destroy_upgrade + if: always() + run: | + if [ '${{ steps.apply_upgrade.conclusion }}' == 'success' ] || [ ${{ github.event_name }} != 'schedule' ]; then + terraform -chdir=$UPGRADE_EXAMPLE_DIR destroy -auto-approve + fi + + - name: Terraform Delete Workspace + if: always() + run: | + if [ '${{ steps.destroy_deployment.conclusion }}' == 'success' ] && [ ${{ github.event_name }} != 'schedule' ]; then + terraform -chdir=$DEPLOYMENT_EXAMPLE_DIR workspace delete $TMP_WORKSPACE_NAME + fi + env: + TF_WORKSPACE: default + + - name: Check how was the workflow run + id: check-trigger + if: ${{ failure() }} + run: | + if [ "${{ github.event_name }}" == "schedule" ]; then + echo "run-by=Automation" >> $GITHUB_OUTPUT + else + echo "run-by=${{ github.actor }}" >> $GITHUB_OUTPUT + fi + + # Send job failure to Slack + - name: Send Slack When Failure + run: | + if [ ${{ env.REF }} == 'master' ]; then + curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} Prod ${{ inputs.workspace }} automation Failed*\n\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#dsfkit-prod"}' ${{ secrets.SLACK_WEBHOOK_URL }} + elif [ ${{ env.REF }} == 'dev' ]; then + curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} dev ${{ inputs.workspace }} automation Failed*\n\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#edsf_automation"}' ${{ secrets.SLACK_WEBHOOK_URL }} + else + curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} private branch ${{ inputs.workspace }} automation Failed*\n\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#edsf_automation"}' ${{ secrets.SLACK_WEBHOOK_URL }} + fi + if: ${{ failure() }} From 323decc79439e0897af97e58fb7e67a5228deca6 Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Mon, 23 Oct 2023 16:22:19 +0300 Subject: [PATCH 4/5] Updated Sonar v4.13 README link [skip actions] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ff883807..14119d7bf 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ This guide references the following information and links, some of which are ava - Sonar v4.12 + Sonar v4.13 DAM v14.13 From 5a82f324670882f50038da9121e7a9f613b193ea Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Mon, 23 Oct 2023 16:26:42 +0300 Subject: [PATCH 5/5] DRA version minor fixes --- examples/poc/dsf_deployment/variables.tf | 2 +- modules/aws/core/globals/variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/poc/dsf_deployment/variables.tf b/examples/poc/dsf_deployment/variables.tf index 68fe948af..bb15b3200 100644 --- a/examples/poc/dsf_deployment/variables.tf +++ b/examples/poc/dsf_deployment/variables.tf @@ -295,7 +295,7 @@ variable "database_cidr" { variable "dra_version" { type = string - default = "4.13.0.10" + default = "4.13" description = "The DRA version to install. Supported versions are 4.11.0.10 and up. Both long and short version formats are supported, for example, 4.11.0.10 or 4.11. The short format maps to the latest patch." validation { condition = !startswith(var.dra_version, "4.10.") && !startswith(var.dra_version, "4.9.") && !startswith(var.dra_version, "4.8.") && !startswith(var.dra_version, "4.3.") && !startswith(var.dra_version, "4.2.") && !startswith(var.dra_version, "4.1.") diff --git a/modules/aws/core/globals/variables.tf b/modules/aws/core/globals/variables.tf index fa41c68b6..80a9eead0 100644 --- a/modules/aws/core/globals/variables.tf +++ b/modules/aws/core/globals/variables.tf @@ -24,7 +24,7 @@ variable "tarball_s3_key" { variable "dra_version" { type = string - default = "4.12" + default = "4.13" description = "The DRA version to install. Supported versions are 4.11.0.10 and up. Both long and short version formats are supported, for example, 4.11.0.10 or 4.11. The short format maps to the latest patch." validation { condition = !startswith(var.dra_version, "4.10.") && !startswith(var.dra_version, "4.9.") && !startswith(var.dra_version, "4.8.") && !startswith(var.dra_version, "4.3.") && !startswith(var.dra_version, "4.2.") && !startswith(var.dra_version, "4.1.")