Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -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
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,14 @@ The following table lists the _latest_ DSF Kit releases, their release date and
<br/>3. Added internal support for DRA version 15.1. Set the variable ‘dra_version’ to 15.1 to use it.
<br/>4. Improvements and bug fixes.
</tr>
<tr>
<td>TBD
</td>
<td>1.7.33
</td>
<td>
Added internal support for Sonar version 15.0. Set the variable ‘sonar_version’ to 15.0 to use it.
</tr>

</table>

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -807,7 +815,7 @@ This includes the following version of the DSF sub-products:
</td>
</tr>
<tr>
<td>Sonar</td><td>4.17.0.10</td><td>4.9 - 4.19.0.10
<td>Sonar</td><td>4.17.0.10</td><td>4.9 - 15.0.0.10

Restrictions on modules may apply</td>
</tr>
Expand Down
6 changes: 5 additions & 1 deletion modules/aws/core/globals/main.tf
Original file line number Diff line number Diff line change
@@ -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"
Expand Down