Merge branch 'dev' into segev_dra_4.13

imperva · Oct 25, 2023 · 30fcac8 · 30fcac8
2 parents 59e4301 + 2af958f
commit 30fcac8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 16 deletions.
diff --git a/.github/workflows/nightly_manager.yml b/.github/workflows/nightly_manager.yml
@@ -143,3 +143,25 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  master_sonar_upgrade:
+    uses: imperva/dsfkit/.github/workflows/sonar_upgrade.yml@master
+    with:
+      use_modules_from_terraform_registry: false
+      explicit_ref: master
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      DAM_LICENSE: ${{ secrets.DAM_LICENSE }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  dev_sonar_upgrade:
+    uses: imperva/dsfkit/.github/workflows/sonar_upgrade.yml@dev
+    with:
+      use_modules_from_terraform_registry: false
+      explicit_ref: dev
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      DAM_LICENSE: ${{ secrets.DAM_LICENSE }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/plan_cli.yml b/.github/workflows/plan_cli.yml
@@ -18,6 +18,10 @@ on:
         required: true
       AWS_SECRET_ACCESS_KEY_STAGE:
         required: true
+      ARM_CLIENT_SECRET:
+        required: true
+      DAM_LICENSE:
+        required: true
 
   workflow_dispatch:
     inputs:
@@ -49,20 +53,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
-#          - 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: 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: AWS - POC - Sonar HADR
@@ -71,8 +75,8 @@ jobs:
             example: ./examples/installation/sonar_single_account_deployment
           - 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: AWS - Installation - DSF Single Account
+            example: ./examples/installation/dsf_single_account_deployment
 
     name: '${{ matrix.name }}'
     env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -186,6 +186,8 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID_STAGE: ${{ secrets.AWS_ACCESS_KEY_ID_STAGE }}
       AWS_SECRET_ACCESS_KEY_STAGE: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGE }}
+      ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+      DAM_LICENSE: ${{ secrets.DAM_LICENSE }}
 
   release:
     needs: [test_plan]