Merge remote-tracking branch 'origin/dev' into dev

.github/workflows/sonar_multi_account_cli.yml

@@ -71,6 +71,15 @@ jobs:
       with:
         ref: ${{ inputs.branch }}
 
+
+    - name: Set Workspace
+      run: |
+        if [ ${{ inputs.branch }} == 'master' ] ||  [ ${{ inputs.branch }} == 'dev' ]; then
+          echo "TF_WORKSPACE=multi_account_${{ inputs.branch }}" >> $GITHUB_ENV
+        else
+          echo "TF_WORKSPACE="multi_accoun" >> $GITHUB_ENV
+        fi    
+
     - name: Change the modules source to local
       run: |
         find ./examples/ -type f -exec sed -i -f sed.expr {} \;

.github/workflows/sonar_single_account_cli.yml

@@ -43,7 +43,6 @@ env:
   AWS_REGION: ap-southeast-1
   TF_WORKSPACE: sonar_single_account_cli
   DESTROY_DELAY_SECONDS: 1800
-  TF_VAR_additional_tags: ${{ secrets.DEPLOYMENT_TAGS }}
 
 permissions:
   contents: read
@@ -138,8 +137,9 @@ jobs:
         run: |
           cat << EOF > $EXAMPLE_DIR/terraform.tfvars
           ${{ vars.TFVAR_PARAMETERS_SINGLE_ACCOUNT_AUTOMATION_V1 }}
+          ${{ secrets.DEPLOYMENT_TAGS }}
           EOF
-
+          
 
       - name: View The Vars
         run: cat $EXAMPLE_DIR/terraform.tfvars

REQUEST_ACCESS_AWS.md

@@ -12,16 +12,16 @@ Following your request, you are automatically granted access after a period of t
 
 When deploying to multiple AWS accounts, use multiple forms.
 
-**Clarification**: After getting the requested access, you don’t have to “download” the software, just run eDSF Kit.
+**Clarification**: After getting the requested access, you don’t have to “download” the software, just run DSF Kit.
 
-1. [eDSF Kit - Request access to DSF installation software in S3 bucket](https://forms.gle/6DY6vgEgm91XAA7PA) (Google form)
+1. [DSF Kit - Request access to DSF installation software in S3 bucket](https://forms.office.com/r/MDaPUiqEES) (Microsoft form)
    1. **Open only to Imperva employees**
    2. Includes:
       1. DSF Hub and Agentless Gateway (formerly Sonar)
       2. DAM Agent audit source for POC purposes 
    3. Requesting access is for all versions and all regions
 
-2. [eDSF Kit - Request access to DAM AMI](https://aws.amazon.com/marketplace/pp/prodview-3wa5bmj5ol4g4) (In AWS Marketplace)
+2. [DSF Kit - Request access to DAM AMI](https://aws.amazon.com/marketplace/pp/prodview-3wa5bmj5ol4g4) (In AWS Marketplace)
    1. Make sure you are logged in the AWS account 
    2. Open DAM marketplace link 
    3. Click “Continue to subscribe” 
@@ -30,7 +30,7 @@ When deploying to multiple AWS accounts, use multiple forms.
 
       **Note**: If you are already subscribed, you won’t see step (iv). You can manage your subscriptions [here](https://us-east-1.console.aws.amazon.com/marketplace/home#/subscriptions).
 
-3. [eDSF Kit - Request access to DRA AMI](https://forms.gle/4pinYVzGt39bU74d8) (Google form)
+3. [DSF Kit - Request access to DRA AMI](https://forms.office.com/r/s2CUijLRK8) (Microsoft form)
    1. **Open only to Imperva employees**
    2. Requesting access is for a specific version and specific regions
 

REQUEST_ACCESS_AZURE.md

@@ -10,16 +10,16 @@ The following links allow you to request access to the installation software of
 
 Following your request, you are automatically granted access after a period of time specified in each link.
 
-**Clarification**: After the DSF installation files are copied, configure the relevant terraform variables and run eDSF Kit.
+**Clarification**: After the DSF installation files are copied, configure the relevant terraform variables and run DSF Kit.
 
-1. [eDSF Kit - Copy DSF installation to Azure storage account](https://docs.google.com/forms/d/e/1FAIpQLSfCBUGHN04u2gK8IoxuHl4TLooBWUl7cK7ihS9Q5ZHwafNBHA/viewform) (Google form)
+1. [DSF Kit - Copy DSF installation to Azure storage account](https://forms.office.com/r/xVgzA9d5nz) (Microsoft Form)
    1. **Open only to Imperva employees**
    2. Includes:
       1. DSF Hub and Agentless Gateway (formerly Sonar)
       2. DRA Admin and Analytics 
       3. DAM Agent audit source for POC purposes
 
-2. _eDSF Kit - Configure programmatic deployment for DAM image and DAM Agent operating system machine_ (In Azure Marketplace)
+2. _DSF Kit - Configure programmatic deployment for DAM image and DAM Agent operating system machine_ (In Azure Marketplace)
    1. Make sure you are logged in the Azure account and the Azure subscription 
    2. Configure programmatic deployment for the desired version of Imperva DAM by enabling it on the relevant DAM image from the Azure Marketplace:
       1. For DAM image - click [here](https://portal.azure.com/#view/Microsoft_Azure_Marketplace/LegalTermsSkuProgrammaticAccessBlade/legalTermsSkuProgrammaticAccessData~/%7B%22product%22%3A%7B%22publisherId%22%3A%22imperva%22%2C%22offerId%22%3A%22imperva-dam-v14%22%2C%22planId%22%3A%22securesphere-imperva-dam-14%22%2C%22standardContractAmendmentsRevisionId%22%3Anull%2C%22isCspEnabled%22%3Atrue%7D%7D)

examples/aws/installation/dsf_single_account_deployment/variables.tf

@@ -455,7 +455,7 @@ variable "sonar_machine_base_directory" {
 variable "dam_version" {
   type        = string
   description = "The DAM version to install"
-  default     = "14.16.1.10"
+  default     = "14.17.1.10"
   validation {
     condition     = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version))
     error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)"

examples/aws/poc/dsf_deployment/variables.tf

@@ -123,7 +123,7 @@ variable "subnet_ids" {
 variable "dam_version" {
   type        = string
   description = "The DAM version to install"
-  default     = "14.16.1.10"
+  default     = "14.17.1.10"
   validation {
     condition     = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version))
     error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)"

examples/azure/poc/dsf_deployment/variables.tf

@@ -118,7 +118,7 @@ variable "subnet_ids" {
 variable "dam_version" {
   type        = string
   description = "The DAM version to install"
-  default     = "14.16.1.10"
+  default     = "14.17.1.10"
   validation {
     condition     = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version))
     error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)"