Upgrade Alpha release: Updated the formatted version in the examples'…

… zip file name and removed old version-less zip files [skip actions]

.github/workflows/release.yml

@@ -73,14 +73,23 @@ jobs:
           terraform_wrapper: false
           terraform_version: ~1.6.0
 
+      - name: Format version for zip file name
+        run: |
+          version="${{ github.event.inputs.future_release }}"
+          formatted_version=${version//./_}
+          echo "FORMATTED_VERSION=$formatted_version" >> $GITHUB_OUTPUT
+        id: format-version
+
       - name: Update modules' versions in examples
         run: |
           find ./examples/ -type f -exec sed -i 's;.*latest release tag.*;version="'${{ github.event.inputs.future_release }}'" # latest release tag;' {} \; 
 
       - name: Update READMEs
         run: |
+          echo "Formatted version: ${{ steps.format-version.outputs.FORMATTED_VERSION }}"
           find . -type f -name 'README.md' -exec sed -E -i 's;github.com/imperva/dsfkit/tree/([0-9]*\.){2}[0-9]*;github.com/imperva/dsfkit/tree/'${{ github.event.inputs.future_release }}';g' {} \;
           find . -type f -name 'README.md' -exec sed -E -i 's;github.com/imperva/dsfkit/raw/([0-9]*\.){2}[0-9]*;github.com/imperva/dsfkit/raw/'${{ github.event.inputs.future_release }}';g' {} \;
+          find . -type f -name 'README.md' -exec sed -E -i '/\/examples\// s;([0-9]+_){2}[0-9]+\.zip;${{ steps.format-version.outputs.FORMATTED_VERSION }}\.zip;g' {} \;
 
       - name: Update installer machine link
         run: |
@@ -90,16 +99,8 @@ jobs:
         run: |
           terraform fmt -recursive
 
-      - name: Format version for zip file name
-        run: |
-          version="${{ github.event.inputs.future_release }}"
-          formatted_version=${version//./_}
-          echo "FORMATTED_VERSION=$formatted_version" >> $GITHUB_OUTPUT
-        id: format-version
-
       - name: Zip per examples
         run: |
-          echo "Formatted version: ${{ steps.format-version.outputs.FORMATTED_VERSION }}"
           for d in $(find ./examples -type d -links 2); do _d=$(dirname ${d}); _b=$(basename ${d}); pushd $_d; zip -FSr ${_b}/${_b}_${{ steps.format-version.outputs.FORMATTED_VERSION }}.zip ${_b} -x "*.zip"; popd; done
 
       - name: Zip Sonar python upgrader

README.md

@@ -470,7 +470,7 @@ For more details about each example, click on the example name.
       </td>
       <td>A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. 
       </td>
-      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_basic_deployment.zip</a>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_5.zip">sonar_basic_deployment_1_5_5.zip</a>
       </td>
    </tr>
    <tr>
@@ -480,7 +480,7 @@ For more details about each example, click on the example name.
       </td>
       <td>A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. 
       </td>
-      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip">sonar_hadr_deployment.zip</a>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_5.zip">sonar_hadr_deployment_1_5_5.zip</a>
       </td>
    </tr>
    <tr>
@@ -490,7 +490,7 @@ For more details about each example, click on the example name.
       </td>
       <td>A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on.  
       </td>
-      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip">sonar_single_account_deployment.zip</a>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_5_5.zip">sonar_single_account_deployment_1_5_5.zip</a>
       </td>
    </tr>
    <tr>
@@ -500,7 +500,7 @@ For more details about each example, click on the example name.
       </td>
       <td>A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. 
       </td>
-      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip">sonar_multi_account_deployment.zip</a>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_5.zip">sonar_multi_account_deployment_1_5_5.zip</a>
       </td>
    </tr>
    <tr>
@@ -510,7 +510,7 @@ For more details about each example, click on the example name.
       </td>
       <td>A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources.
       </td>
-      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/dsf_deployment/dsf_deployment.zip">dsf_deployment.zip</a>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/dsf_deployment/dsf_deployment_1_5_5.zip">dsf_deployment_1_5_5.zip</a>
       </td>
    </tr>
    <tr>
@@ -520,7 +520,17 @@ For more details about each example, click on the example name.
       </td>
       <td>A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics).
       </td>
-      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip">dsf_single_account_deployment.zip</a>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_5.zip">dsf_single_account_deployment_1_5_5.zip</a>
+      </td>
+   </tr>
+   <tr>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/sonar_upgrade/README.md">Sonar Upgrade (Alpha)</a>
+      </td>
+      <td>All
+      </td>
+      <td>Upgrade of DSF Hub and Agentless Gateway (formerly Sonar).
+      </td>
+      <td><a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/sonar_upgrade/sonar_upgrade_1_5_5.zip">sonar_upgrade_1_5_5.zip</a>
       </td>
    </tr>
 </table>
@@ -708,27 +718,27 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2
 11. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the <a href="https://github.com/imperva/dsfkit/tree/1.5.6">eDSF Kit GitHub Repository</a>, e.g., if you choose the "sonar_basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_basic_deployment.zip</a>.
     Run:
     ```bash
-    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip
+    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_5.zip
     
     or
     
-    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip
+    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_5.zip
     
     or
  
-    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip
+    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_5_5.zip
     
     or
  
-    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip
+    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_5.zip
     
     or
 
-    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment.zip
+    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment_1_5_5.zip
     
     or
  
-    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip
+    wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_5.zip
     ```
 
 12. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2.

examples/sonar_upgrade/README.md

@@ -1,7 +1,7 @@
 # DSF Hub and Agentless Gateway Upgrade POC example
 [![GitHub tag](https://img.shields.io/github/v/tag/imperva/dsfkit.svg)](https://github.com/imperva/dsfkit/tags)
 
-A DSF Hub and Agentless Gateway (formerly Sonar) upgrade POC procedure.
+A DSF Hub and Agentless Gateway (formerly Sonar) upgrade procedure.
 
 This procedure consists of: