Merge branch 'dev' into cpapke/use-healthcheck-for-preflight

.github/workflows/deploy_module.yml

@@ -193,11 +193,30 @@ jobs:
           fi
           latest_tag=$(git tag -l | sort -V | tail -n 1)
 
+          version_compare() {
+              local v1=(${1//./ })
+              local v2=(${2//./ })
+              local i
+
+              # Compare each component of the version strings
+              for ((i=0; i<${#v1[@]} && i<${#v2[@]}; i++)); do
+                  if (( ${v1[i]} < ${v2[i]} )); then
+                      return 0   # v1 is less than v2
+                  elif (( ${v1[i]} > ${v2[i]} )); then
+                      return 1   # v1 is greater than v2
+                  fi
+              done
+
+              # v1 is equal to v2
+              return 2
+          }
+
           all_tags=$(git tag)
           removed_tags=()
           # Loop through each tag and filter if less than begin_tag
           for tag in ${all_tags}; do
-              if [[ "$tag" < "${begin_tag}" ]]; then
+              if version_compare "$tag" "$begin_tag"; then
+                  echo "$tag is less than $begin_tag"
                   removed_tags+=("$tag")
               fi
           done

.github/workflows/dsf_poc_cli_azure.yml

@@ -149,7 +149,7 @@ jobs:
           az_resource_group = "dsf-rg"
           az_storage_account = "dsfinstallation"
           az_container = "sonar"
-          az_blob = "jsonar-4.14.0.10.0.tar.gz"
+          az_blob = "jsonar-4.15.0.10.0.tar.gz"
         }
         dam_agent_installation_location = {
           az_resource_group = "dsf-rg"
@@ -161,12 +161,12 @@ jobs:
         dra_admin_vhd_details = {
           storage_account_name = "dsfinstallation"
           container_name       = "dra"
-          path_to_vhd          = "DRA-4.14.0.10.0.12_30442_x86_64-Admin.vhd"
+          path_to_vhd          = "DRA-4.15.0.10.0.7_30555_x86_64-Admin.vhd"
         }
         dra_analytics_vhd_details = {
           storage_account_name = "dsfinstallation"
           container_name       = "dra"
-          path_to_vhd          = "DRA-4.14.0.10.0.12_30442_x86_64-Analytics.vhd"
+          path_to_vhd          = "DRA-4.15.0.10.0.7_30555_x86_64-Analytics.vhd"
         }
         EOF
 

.github/workflows/dsf_single_account_cli.yml

@@ -43,7 +43,7 @@ on:
       - '!modules/aws/rds-postgres-db/*'
       - '!modules/aws/sonar-upgrader/**'
       - 'modules/null/**'
-      - 'examples/aws/poc/dsf_single_account_deployment/*'
+      - 'examples/aws/installation/dsf_single_account_deployment/*'
 
   pull_request:
     types:
@@ -60,7 +60,7 @@ on:
       - '!modules/aws/rds-postgres-db/*'
       - '!modules/aws/sonar-upgrader/*'
       - 'modules/null/**'
-      - 'examples/aws/poc/dsf_single_account_deployment/*'
+      - 'examples/aws/installation/dsf_single_account_deployment/*'
 
 env:
   TF_CLI_ARGS: "-no-color"
@@ -221,7 +221,7 @@ jobs:
           ${{ env.EXAMPLE_DIR }}/ssh_keys
 
     - name: Terraform Destroy
-#       if: always()
+      if: always()
       run: terraform -chdir=$EXAMPLE_DIR destroy -auto-approve
 
     - name: Delete Security Group

.github/workflows/release.yml

@@ -192,7 +192,7 @@ jobs:
       DAM_LICENSE: ${{ secrets.DAM_LICENSE }}
 
   release:
-    needs: deploy_modules
+    needs: test_plan
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/sonar_multi_account_cli.yml

@@ -155,7 +155,7 @@ jobs:
           ${{ env.EXAMPLE_DIR }}/ssh_keys
 
     - name: Terraform Destroy
-#       if: always()
+      if: always()
       run: terraform -chdir=$EXAMPLE_DIR destroy -auto-approve
 
     - name: Delete Security Group

.github/workflows/sonar_upgrade.yml

@@ -56,11 +56,11 @@ jobs:
       DEPLOYMENT_EXAMPLE_DIR: ./examples/aws/poc/dsf_deployment
       UPGRADE_EXAMPLE_DIR: ./examples/aws/sonar_upgrade
       AWS_REGION: eu-west-2
-      SONAR_TARGET_VERSION: 4.13.0.10.0
+      SONAR_TARGET_VERSION: 4.15.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_sonar_version: 4.13.0.10
       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 }}

.github/workflows/sonar_upgrade_flow.yml

@@ -19,6 +19,7 @@ on:
     paths:
       - 'modules/aws/sonar-upgrader/**'
       - 'examples/aws/sonar_upgrade/*'
+      - '.github/sonar_upgrade*.yml'
       - '!**/README.md'
 
   pull_request:
@@ -30,6 +31,7 @@ on:
     paths:
       - 'modules/aws/sonar-upgrader/**'
       - 'examples/aws/sonar_upgrade/*'
+      - '.github/sonar_upgrade*.yml'
       - '!**/README.md'
 
 permissions:

CODEOWNERS

@@ -0,0 +1 @@
+* imperva/data-security-technology-office