From b91b53e209b3c56a15fcc7e42b056c746ab81dbd Mon Sep 17 00:00:00 2001 From: "assaf.cohen" Date: Sun, 12 Nov 2023 14:59:47 +0200 Subject: [PATCH] Update main readme file with Azure content and change Default Sonar version variable at the Azure POC example to 4.13 --- README.md | 17 ++++++++++++++++- examples/azure/poc/dsf_deployment/README.md | 10 ++++++++-- examples/azure/poc/dsf_deployment/variables.tf | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fbc2d8b62..b359d7f88 100644 --- a/README.md +++ b/README.md @@ -355,6 +355,15 @@ The following table lists the _latest_ eDSF Kit releases, their release date and
5. Added the option to provide a different IP for federation via the 'dsf_hub_federation_ip' and 'dsf_gw_federation_ip' variables. + + 14 Nov 2023 + + 1.6.1 + + + 1. Sonar deployment on Azure Beta release. + + @@ -850,6 +859,8 @@ If you want to use Imperva's Terraform Cloud account, contact Imperva's Technica ## IAM Permissions for Running eDSF Kit +### 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. The permissions are separated to different policies. Use the relevant policies according to your needs: @@ -861,7 +872,11 @@ The permissions are separated to different policies. Use the relevant policies a **NOTE:** When running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable.

**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 the DSF Instances +### 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. +**NOTE:** Assign the Owner role to the user or app registration service principal temporarily. More detailed permissions will be specified at a later stage. + +## IAM Permissions for the DSF Instances on AWS If you are running an installation example and want to provide your own instance profiles as variables, you can find samples of the required permissions here - [DSF Instances Permissions](/dsf_instances_permissions_samples). diff --git a/examples/azure/poc/dsf_deployment/README.md b/examples/azure/poc/dsf_deployment/README.md index b63320301..882a94a02 100644 --- a/examples/azure/poc/dsf_deployment/README.md +++ b/examples/azure/poc/dsf_deployment/README.md @@ -20,6 +20,12 @@ Several variables in the `variables.tf` file are important for configuring the d - `hub_hadr`: Enable DSF Hub High Availability Disaster Recovery (HADR) - `agentless_gw_hadr`: Enable Agentless Gateway High Availability Disaster Recovery (HADR) +## Mandatory Variables +Before initiating the Terraform deployment, it is essential to set up the following variables: +- `resource_group_location`: The region of the resource group to which all DSF components will be associated. +- `tarball_location`: Storage account and container location of the DSF installation software. az_blob is the full path to the tarball file within the storage account container. + + ### Networking - `subnet_ids`: IDs of the subnets for the deployment. If not specified, a new vpc is created. @@ -27,5 +33,5 @@ Several variables in the `variables.tf` file are important for configuring the d To perform the default deployment, run the following command: ```bash -terraform apply -auto-approve -``` \ No newline at end of file +terraform apply -var="resource_group_location=${region}" -var='tarball_location={"az_resource_group": "${storage-resource-group}", "az_storage_account":"${storage_account_name}","az_container":"${container_name}","az_blob":"jsonar-4.13.0.10.0.tar.gz"}' -auto-approve +``` diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index 8e3579471..1f3ce8d36 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -87,7 +87,7 @@ variable "subnet_ids" { variable "sonar_version" { type = string - default = "4.12" + default = "4.13" description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch." validation { condition = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")