diff --git a/.github/workflows/sonar_multi_account_cli.yml b/.github/workflows/sonar_multi_account_cli.yml
index b700c64e..5e67f4c0 100644
--- a/.github/workflows/sonar_multi_account_cli.yml
+++ b/.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 {} \;
diff --git a/.github/workflows/sonar_single_account_cli.yml b/.github/workflows/sonar_single_account_cli.yml
index 31c5ba2e..3e21936e 100644
--- a/.github/workflows/sonar_single_account_cli.yml
+++ b/.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
diff --git a/README.md b/README.md
index f394deea..cde249ec 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,23 @@
# Data Security Fabric (DSF) Kit Deployment and Upgrade Guide
[![GitHub tag](https://img.shields.io/github/v/tag/imperva/dsfkit.svg)](https://github.com/imperva/dsfkit/tags)
-# eDSF Kit
+# DSF Kit
-Imperva eDSF Kit is a Terraform toolkit designed to automate the deployment and upgrade of Imperva's Data Security Fabric.
+Imperva DSF Kit is a Terraform toolkit designed to automate the deployment and upgrade of Imperva's Data Security Fabric.
-## eDSF Kit Deployment
+## DSF Kit Deployment
-eDSF Kit enables you to deploy the full suite of the DSF sub-products - DSF Hub & Agentless Gateway (formerly Sonar),
+DSF Kit enables you to deploy the full suite of the DSF sub-products - DSF Hub & Agentless Gateway (formerly Sonar),
DAM (Data Activity Monitoring) MX and Agent Gateway and DRA (Data Risk Analytics) Admin and Analytics.
-Currently, eDSF Kit supports deployments on AWS and Azure cloud providers. In the near future, it will support other major public clouds,
+Currently, DSF Kit supports deployments on AWS and Azure cloud providers. In the near future, it will support other major public clouds,
on-premises (vSphere) and hybrid environments.
-## eDSF Kit Upgrade
+## DSF Kit Upgrade
-eDSF Kit enables you to upgrade DSF Hubs and Agentless Gateways (formerly Sonar) which are deployed on AWS.
+DSF Kit enables you to upgrade DSF Hubs and Agentless Gateways (formerly Sonar) which are deployed on AWS.
-In the future, eDSF Kit will enable you to upgrade the full suite of the DSF sub-products, including DAM and DRA, and
+In the future, DSF Kit will enable you to upgrade the full suite of the DSF sub-products, including DAM and DRA, and
will support other major clouds, on-premises (vSphere) and hybrid environments.
# About This Guide
@@ -33,7 +33,7 @@ It is also intended for Imperva Professional Services (PS) and customers for act
This guide covers the following main topics. Additional guides are referenced throughout, as listed in the Quick Links section below.
* How to deploy Imperva’s Data Security Fabric (DSF) with step-by-step instructions.
-* How to verify that the deployment was successful using the eDSF Kit output.
+* How to verify that the deployment was successful using the DSF Kit output.
* How to undeploy DSF with step-by-step instructions.
* How to upgrade Imperva’s Data Security Fabric (DSF) Hub and Agentless Gateway, with step-by-step instructions.
@@ -112,7 +112,7 @@ This guide references the following information and links, some of which are ava
- DAM | 14.16.1.10 | 14.11.1.10 and up
+ | DAM | 14.17.1.10 | 14.11.1.10 and up
14.7.x.y (LTS)
@@ -770,7 +779,7 @@ Make sure that the version you are using is supported by all the modules which a
To see which versions are supported by each module, refer to the specific module.
(For example, [DSF Hub module](https://registry.terraform.io/modules/imperva/dsf-hub/aws/latest))
-# Deployment
+# Deployment
After you have [chosen the deployment mode](#choosing-the-deployment-mode), follow the step-by-step instructions below to ensure a successful deployment. If you have any questions or issues during the deployment process, please contact [Imperva Technical Support](https://support.imperva.com/s/).
@@ -779,7 +788,7 @@ After you have [chosen the deployment mode](#choosing-the-deployment-mode), foll
This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac.
This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments.
-1. 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 eDSF Kit GitHub Repository, e.g., if you choose the "dsf_deployment" example, you should download dsf_deployment.zip.
+1. 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 DSF Kit GitHub Repository, e.g., if you choose the "dsf_deployment" example, you should download dsf_deployment.zip.
2. Unzip the zip file in CLI or using your operating system's UI.
For example, in CLI:
@@ -858,7 +867,7 @@ This mode makes use of the Terraform Command Line Interface (CLI) to deploy and
## Installer Machine Deployment Mode
This mode is similar to the CLI mode except that the Terraform is run on an EC2 machine that the user launches, instead of on their computer.
-This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cannot be run on the available Linux/Unix machine, e.g., since it does not have permission or network access to the deployment environment, or if the user doesn't want to install additional software on their computer.
+This mode can be used if a Linux/Unix machine is not available, or DSF Kit cannot be run on the available Linux/Unix machine, e.g., since it does not have permission or network access to the deployment environment, or if the user doesn't want to install additional software on their computer.
**NOTE:** The steps provided below are specific to deployment in an AWS environment. For deployment in an Azure environment, it is necessary to [create an Azure virtual machine instance based on Linux/Unix](https://learn.microsoft.com/en-us/azure/virtual-machines/linux/quick-create-portal?tabs=ubuntu).
@@ -896,7 +905,7 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann
For example: `chmode 400 a_key_pair.pem`
-9. 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 eDSF Kit GitHub Repository, e.g., if you choose the "dsf_deployment" example, you should download dsf_deployment.zip.
+9. 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 DSF Kit GitHub Repository, e.g., if you choose the "dsf_deployment" example, you should download dsf_deployment.zip.
Run:
```bash
wget https://github.com/imperva/dsfkit/raw/1.7.20/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_20.zip
@@ -970,10 +979,10 @@ If you want to use Imperva's Terraform Cloud account, contact Imperva's Technica
* To avoid automatic Terraform configuration changes when the GitHub repo updates, set the following values under “Run triggers”: ![Run Triggers](https://user-images.githubusercontent.com/52969528/212982564-e12f9b4a-ca3e-480b-9714-76ef69291ee4.png)
As displayed in the above screenshot, the Custom Regular Expression field value should be “23b82265”.
- * Click “Create workspace” to finish and save the new eDSF Kit workspace. ![Create workspace](https://user-images.githubusercontent.com/52969528/212977895-ad9cdc4c-bf44-4a83-b67e-57e7f7e6e6f7.png)
+ * Click “Create workspace” to finish and save the new DSF Kit workspace. ![Create workspace](https://user-images.githubusercontent.com/52969528/212977895-ad9cdc4c-bf44-4a83-b67e-57e7f7e6e6f7.png)
3. **Add the AWS variables:** The next few steps will configure the required AWS variables.
- * Once the eDSF Kit workspace is created, click the "Go to workspace overview" button. ![Go to Workspace Overview](https://user-images.githubusercontent.com/52969528/212978246-42ce66c1-ffbc-4932-8c0a-4d13188065eb.png)
+ * Once the DSF Kit workspace is created, click the "Go to workspace overview" button. ![Go to Workspace Overview](https://user-images.githubusercontent.com/52969528/212978246-42ce66c1-ffbc-4932-8c0a-4d13188065eb.png)
* Click on the "Configure Variables" button. ![Configure Variables](https://user-images.githubusercontent.com/52969528/212978735-afcbfee8-d524-4b08-8e4f-42a12530f490.png)
@@ -1031,7 +1040,7 @@ If you want to use Imperva's Terraform Cloud account, contact Imperva's Technica
**NOTE:** The workspace variables mentioned above are tailored for deployment in an AWS environment. For deployment in an Azure environment, it is necessary to include distinct workspace variables, and these will be addressed in a future release.
-4. **Run the Terraform:** The following steps complete setting up the eDSF Kit workspace and running the example's Terraform code.
+4. **Run the Terraform:** The following steps complete setting up the DSF Kit workspace and running the example's Terraform code.
* Click on the **Actions** dropdown button from the top navigation bar, and select the "Start new run" option from the list.![Start New Run](https://user-images.githubusercontent.com/52969528/212980571-9071c3e5-400a-42e7-a7d9-5848b8b9fad7.png)
* Enter a unique, alphanumeric name for the run, and click on the "Start run" button. ![Start Run](https://user-images.githubusercontent.com/52969528/212982996-2010be16-79f7-497d-a9c9-13ebc29fa052.png)
@@ -1060,11 +1069,11 @@ If you want to use Imperva's Terraform Cloud account, contact Imperva's Technica
# IAM Permissions
-## IAM Permissions for Running eDSF Kit
+## IAM Permissions for Running DSF Kit
-### IAM Permissions for AWS
+### IAM Permissions for AWS
-To be able to create AWS resources inside any AWS Account, you need to provide an AWS User or Role with the required permissions in order to run eDSF Kit Terraform.
+To be able to create AWS resources inside any AWS Account, you need to provide an AWS User or Role with the required permissions in order to run DSF Kit Terraform.
The permissions are separated to different policies. Use the relevant policies according to your needs:
1. For general required permissions such as create an EC2, security group, etc., use the permissions specified here - [general required permissions](/permissions_samples/aws/GeneralRequiredPermissions.txt).
@@ -1076,7 +1085,7 @@ The permissions are separated to different policies. Use the relevant policies a
**NOTE:** The permissions specified in option 2 are irrelevant for customers who prefer to use their own network objects, such as VPC, NAT Gateway, Internet Gateway, etc.
### IAM Permissions for Azure
-To be able to create Azure resources inside any Azure Account, you need to provide an Azure user or application registration service principal with the required permissions in order to run eDSF Kit Terraform.
+To be able to create Azure resources inside any Azure Account, you need to provide an Azure user or application registration service principal with the required permissions in order to run DSF Kit Terraform.
Use the relevant permissions according to your needs:
1. For general required permissions such as create a virtual machine, security group, etc., use the permissions specified here - [general required permissions](/permissions_samples/azure/GeneralRequiredPermissions.txt).
@@ -1164,12 +1173,12 @@ In case of failure, the Terraform may have deployed some resources before failin
## Choosing the Upgrade Mode
-eDSF Kit offers several upgrade modes:
+DSF Kit offers several upgrade modes:
* **CLI Upgrade Mode:** This mode offers a straightforward upgrade option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac.
For more details, refer to [CLI Upgrade Mode](#cli-upgrade-mode).
-* **Installer Machine Deployment Mode:** This mode is similar to the CLI mode except that the Terraform is run on an EC2 machine that the user launches, instead of on their computer. This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cannot be run on the available Linux/Unix machine, e.g., since it does not have permission or network access to the deployment environment, or if the user doesn't want to install additional software on their computer.
+* **Installer Machine Deployment Mode:** This mode is similar to the CLI mode except that the Terraform is run on an EC2 machine that the user launches, instead of on their computer. This mode can be used if a Linux/Unix machine is not available, or DSF Kit cannot be run on the available Linux/Unix machine, e.g., since it does not have permission or network access to the deployment environment, or if the user doesn't want to install additional software on their computer.
For more details, refer to [Installer Machine Upgrade Mode](#installer-machine-upgrade-mode).
@@ -1178,7 +1187,7 @@ If you need more information to decide on your preferred mode, refer to the deta
## Upgrade Prerequisites
-Before using eDSF Kit to upgrade DSF Hubs and Agentless Gateways, it is necessary to satisfy a set of prerequisites.
+Before using DSF Kit to upgrade DSF Hubs and Agentless Gateways, it is necessary to satisfy a set of prerequisites.
1. The upgrade requires access to the DSF installation software. [Click here to request access](https://github.com/imperva/dsfkit/blob/1.7.20/REQUEST_ACCESS_AWS.md).
2. Only if you chose the [CLI Upgrade Mode](#cli-upgrade-mode), install [Git](https://git-scm.com).
@@ -1189,7 +1198,7 @@ Before using eDSF Kit to upgrade DSF Hubs and Agentless Gateways, it is necessar
### Additional Prerequisites
-If the DSF deployment has not been deployed using the eDSF Kit, it is also necessary to satisfy the following prerequisites:
+If the DSF deployment has not been deployed using the DSF Kit, it is also necessary to satisfy the following prerequisites:
1. Grant the DSF Hubs and Agentless Gateways IAM roles access to the S3 bucket containing the DSF installation software, use the permissions specified here - [IAM Permissions for Granting Access to DSF Installation](/permissions_samples/aws/DSFIntallationAccessPermissions.txt).
@@ -1198,7 +1207,7 @@ If the DSF deployment has not been deployed using the eDSF Kit, it is also neces
## Upgrade Software Location and Versioning
-When using eDSF Kit, there is no need to manually download the DSF installation software, eDSF Kit will do that automatically based on the Sonar target version specified in the Terraform example.
+When using DSF Kit, there is no need to manually download the DSF installation software, DSF Kit will do that automatically based on the Sonar target version specified in the Terraform example.
In order to be able to download the upgrade software during upgrade, you must request access beforehand. See [Upgrade Prerequisites](#upgrade-prerequisites).
Sonar version constrains can be found in the Sonar Upgrader module.
@@ -1225,14 +1234,14 @@ This mode makes use of the Terraform Command Line Interface (CLI) to deploy and
```bash
unzip sonar_upgrade_.zip
- >>>> Replace the x_y_z with the eDSF Kit version in the zip file name
+ >>>> Replace the x_y_z with the DSF Kit version in the zip file name
```
3. In CLI, navigate to the directory which contains the Terraform files.
```bash
cd sonar_upgrade_
- >>>> Replace the x_y_z with the eDSF Kit version in the zip file name
+ >>>> Replace the x_y_z with the DSF Kit version in the zip file name
```
4. Enter the details of DSF Hubs and Agentless Gateways which you want to upgrade, and the desired configuraiton options, in the main.tf file.
@@ -1266,7 +1275,7 @@ This mode makes use of the Terraform Command Line Interface (CLI) to deploy and
## Installer Machine Upgrade Mode
This mode is similar to the CLI mode except that the Terraform is run on an EC2 machine that the user launches, instead of on their computer.
-This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cannot be run on the available Linux/Unix machine, e.g., since it does not have permission or network access to the deployment environment, or if the user doesn't want to install additional software on their computer.
+This mode can be used if a Linux/Unix machine is not available, or DSF Kit cannot be run on the available Linux/Unix machine, e.g., since it does not have permission or network access to the deployment environment, or if the user doesn't want to install additional software on their computer.
1. In AWS, choose a region for the installer machine while keeping in mind that the machine should have access to the DSF environment that you want to upgrade, and preferably be in proximity to it.
diff --git a/REQUEST_ACCESS_AWS.md b/REQUEST_ACCESS_AWS.md
index 677425a3..d03363d8 100644
--- a/REQUEST_ACCESS_AWS.md
+++ b/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
diff --git a/REQUEST_ACCESS_AZURE.md b/REQUEST_ACCESS_AZURE.md
index 38095bd9..e95cb492 100644
--- a/REQUEST_ACCESS_AZURE.md
+++ b/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)
diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf
index 47192731..1bb78978 100644
--- a/examples/aws/installation/dsf_single_account_deployment/variables.tf
+++ b/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)"
diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf
index 43130cbd..d78a59af 100644
--- a/examples/aws/poc/dsf_deployment/variables.tf
+++ b/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)"
diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf
index 91bcd4cd..9c94a573 100644
--- a/examples/azure/poc/dsf_deployment/variables.tf
+++ b/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)"
|