diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index 3bdbbb9da..22f94c6a3 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -196,7 +196,7 @@ jobs: fi if [ "${{ github.event.inputs.deployment_type }}" == "sonar" ] && [ "${{ github.event.inputs.product_full_version }}" != "latest" ] && [ -n "${{ github.event.inputs.product_full_version }}" ]; then - AZ_BLOB_SONAR="jsonar-${{ github.event.inputs.product_full_version }}.tar.gaz" + AZ_BLOB_SONAR="jsonar-${{ github.event.inputs.product_full_version }}.tar.gz" else AZ_BLOB_SONAR="jsonar-4.17.0.10.0.tar.gz" fi diff --git a/README.md b/README.md index ce09d14fa..b954075c5 100644 --- a/README.md +++ b/README.md @@ -616,6 +616,14 @@ The following table lists the _latest_ DSF Kit releases, their release date and
3. Added internal support for DRA version 15.1. Set the variable ‘dra_version’ to 15.1 to use it.
4. Improvements and bug fixes. + + TBD + + 1.7.33 + + + Added internal support for Sonar version 15.0. Set the variable ‘sonar_version’ to 15.0 to use it. + @@ -649,7 +657,7 @@ Before using DSF Kit to deploy DSF, it is necessary to satisfy a set of prerequi 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.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. +5. [curl](https://curl.se/) - Command-line tool for transferring data (version 8.12.1 or later). ### AWS Prerequisites @@ -807,7 +815,7 @@ This includes the following version of the DSF sub-products: - Sonar4.17.0.104.9 - 4.19.0.10 + Sonar4.17.0.104.9 - 15.0.0.10 Restrictions on modules may apply diff --git a/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf index eadbfdfc2..5e7f4ad74 100644 --- a/modules/aws/core/globals/main.tf +++ b/modules/aws/core/globals/main.tf @@ -1,7 +1,11 @@ locals { sonar_tarball_s3_key_map = { - "4.19" = "jsonar-4.19.0.10.0.tar.gz" + "15.0" = "jsonar-15.0.0.10.0.tar.gz" + "15.0.0.10" = "jsonar-15.0.0.10.0.tar.gz" + + "4.19" = "jsonar-4.19.0.20.0.tar.gz" "4.19.0.10" = "jsonar-4.19.0.10.0.tar.gz" + "4.19.0.20" = "jsonar-4.19.0.20.0.tar.gz" "4.17" = "jsonar-4.17.0.10.0.tar.gz" "4.17.0.10" = "jsonar-4.17.0.10.0.tar.gz"