From e4f3059d5c0475e3eedc20e1e3ddba68c605de44 Mon Sep 17 00:00:00 2001 From: eytannnaim Date: Sun, 5 Feb 2023 09:34:38 +0000 Subject: [PATCH] Automatic commit before release [release=1.3.6] | [skip actions] --- README.md | 26 +++++++-------- .../multi_account_deployment/README.md | 2 +- .../multi_account_deployment/main.tf | 16 +++++----- .../multi_account_deployment.zip | Bin 4423 -> 4430 bytes .../poc/basic_deployment/basic_deployment.zip | Bin 4714 -> 4787 bytes examples/poc/basic_deployment/main.tf | 22 ++++++------- .../poc/hadr_deployment/hadr_deployment.zip | Bin 5034 -> 5106 bytes examples/poc/hadr_deployment/main.tf | 30 +++++++++--------- modules/aws/agentless-gw/README.md | 2 +- modules/aws/agentless-gw/main.tf | 8 ++--- modules/aws/hub/README.md | 2 +- modules/aws/hub/main.tf | 8 ++--- modules/aws/hub/variables.tf | 10 +++--- modules/aws/poc-db-onboarder/variables.tf | 10 +++--- modules/aws/rds-mssql-db/README.md | 2 +- modules/aws/rds-mssql-db/lambdas.tf | 10 +++--- modules/aws/rds-mssql-db/main.tf | 2 +- modules/aws/rds-mssql-db/versions.tf | 4 +-- modules/aws/sonar-base-instance/variables.tf | 10 +++--- modules/null/federation/main.tf | 14 ++++---- modules/null/federation/variables.tf | 20 ++++++------ 21 files changed, 99 insertions(+), 99 deletions(-) diff --git a/README.md b/README.md index cf37c1029..ec5eb5353 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ This guide references the following information and links, some of which are ava - DSFKit GitHub Repository + DSFKit GitHub Repository @@ -132,7 +132,7 @@ This guide references the following information and links, some of which are ava Open Terraform Cloud Account - Request Form Grants access for a specific e-mail address to Imperva's Terraform Cloud account. - Required for Terraform Cloud Deployment Mode + Required for Terraform Cloud Deployment Mode @@ -289,7 +289,7 @@ The first thing to do in this deployment mode is to [download Terraform ](https: **NOTE:** Update the values for the required parameters to complete the installation: example_name, aws_access_key_id, aws_secret_access_key and region -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 DSFKit GitHub Repository, e.g., if you choose the "basic_deployment" example, you should download basic_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 DSFKit GitHub Repository, e.g., if you choose the "basic_deployment" example, you should download basic_deployment.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: @@ -499,7 +499,7 @@ Complete these steps to manually create an installer machine: 6. Replace the following placeholders with their value in the bash code you pasted: (You can also do the replacements in a text editor and copy the result to the AWS console) 1. ${example_name}: E.g., basic_deployment - 2. ${example_type}: poc or installation, according to where your example is located in the [DSFKit GitHub repository](https://github.com/imperva/dsfkit/tree/1.3.5) under the 'examples' directory. + 2. ${example_type}: poc or installation, according to where your example is located in the [DSFKit GitHub repository](https://github.com/imperva/dsfkit/tree/1.3.6) under the 'examples' directory. 3. ${access_key}: AWS access key which provides access to the AWS account where you want to deploy DSF. 4. ${secret_key}: AWS secret key which provides access to the AWS account where you want to deploy DSF. 5. ${region}: AWS region where you want to deploy DSF. @@ -555,7 +555,7 @@ In case you don’t want to manually create the installer machine, you can autom Complete the following instructions to automate the creation of an installer machine which in turn automatically installs DSF. -1. Download the Terraform recipe zip [here](https://github.com/imperva/dsfkit/tree/1.3.5/installer_machine/installer_machine.zip). +1. Download the Terraform recipe zip [here](https://github.com/imperva/dsfkit/tree/1.3.6/installer_machine/installer_machine.zip). 2. Unzip the zip file in CLI or using your operating system's UI. @@ -622,7 +622,7 @@ Complete the following instructions to automate the creation of an installer mac DSFKit provides a number of out-of-the-box examples which are already configured to deploy common DSF environments. -These examples can be found in the DSFKit GitHub Repository under the examples directory. +These examples can be found in the DSFKit GitHub Repository under the examples directory. Some examples are intended for Lab or POC and others for actual DSF deployments by Professional Services and customers. For more details about each example, click on the example name. @@ -639,33 +639,33 @@ For more details about each example, click on the example name. - Basic Deployment + Basic Deployment Lab/POC A DSF deployment with a Hub, a GW, federation, networking and onboarding of a MySQL DB. - basic_deployment.zip + basic_deployment.zip - HADR Deployment + HADR Deployment Lab/POC A DSF deployment with a Hub HADR, a GW, federation, networking and onboarding of a MySQL DB. - hadr_deployment.zip + hadr_deployment.zip - Multi Account Deployment + Multi Account Deployment PS/Customer A DSF deployment with a Hub and a GW in different AWS accounts and federation. - multi_account_deployment.zip + multi_account_deployment.zip @@ -720,7 +720,7 @@ In case of failure, the Terraform may have deployed some resources before failin ```bash ssh -i ${key_pair_file} ec2-user@${installer_machine_public_ip} - >>>> Fill the values of the key_pair_file and installer_machine_public_ip placeholders (See ) + >>>> Fill the values of the key_pair_file and installer_machine_public_ip placeholders (See ) ``` 2. ```bash diff --git a/examples/installation/multi_account_deployment/README.md b/examples/installation/multi_account_deployment/README.md index 03ec038b1..45af1d8d4 100644 --- a/examples/installation/multi_account_deployment/README.md +++ b/examples/installation/multi_account_deployment/README.md @@ -13,4 +13,4 @@ This example is intended for PS/customers who want to bring their own networking It is possible to provide as input to this example, in which subnets to deploy the Hub and the Gateway. They can be in the same or in different subnets, the same or different AWS accounts, etc. -For a full list of this example's customization options which don't require code changes, refer to the [variables.tf](https://github.com/imperva/dsfkit/tree/1.3.5/examples/installation/multi_account_deployment/variables.tf) file. \ No newline at end of file +For a full list of this example's customization options which don't require code changes, refer to the [variables.tf](https://github.com/imperva/dsfkit/tree/1.3.6/examples/installation/multi_account_deployment/variables.tf) file. \ No newline at end of file diff --git a/examples/installation/multi_account_deployment/main.tf b/examples/installation/multi_account_deployment/main.tf index 30cc4d3f0..1226f13e6 100644 --- a/examples/installation/multi_account_deployment/main.tf +++ b/examples/installation/multi_account_deployment/main.tf @@ -17,7 +17,7 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag sonar_version = var.sonar_version } @@ -42,14 +42,14 @@ locals { module "key_pair_hub" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag key_name_prefix = "imperva-dsf-hub" private_key_pem_filename = "ssh_keys/dsf_ssh_key-hub-${terraform.workspace}" } module "key_pair_gw" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag key_name_prefix = "imperva-dsf-gw" private_key_pem_filename = "ssh_keys/dsf_ssh_key-gw-${terraform.workspace}" providers = { @@ -63,7 +63,7 @@ module "key_pair_gw" { module "hub" { source = "imperva/dsf-hub/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "primary"]) subnet_id = var.subnet_hub binaries_location = local.tarball_location @@ -87,7 +87,7 @@ module "hub" { module "agentless_gw_group" { count = var.gw_count source = "imperva/dsf-agentless-gw/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "gw", count.index]) instance_type = var.gw_instance_type ami_name_tag = var.gw_ami_name @@ -119,7 +119,7 @@ module "agentless_gw_group" { module "federation" { for_each = { for idx, val in module.agentless_gw_group : idx => val } source = "imperva/dsf-federation/null" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag gw_info = { gw_ip_address = each.value.private_ip gw_private_ssh_key_path = module.key_pair_gw.key_pair_private_pem.filename @@ -131,9 +131,9 @@ module "federation" { hub_ssh_user = module.hub.ssh_user } gw_proxy_info = { - proxy_address = module.hub.private_ip + proxy_address = module.hub.private_ip proxy_private_ssh_key_path = module.key_pair_hub.key_pair_private_pem.filename - proxy_ssh_user = module.hub.ssh_user + proxy_ssh_user = module.hub.ssh_user } depends_on = [ module.hub, diff --git a/examples/installation/multi_account_deployment/multi_account_deployment.zip b/examples/installation/multi_account_deployment/multi_account_deployment.zip index 56ddc311d93c970507ca9ab2aeb121ae6a88aca6..4278fcb6af0e9612ae324f2f5eed3723a5ca83b5 100644 GIT binary patch delta 1990 zcmZ`)c`zGjAC5DQ2yu7aVM&TO8aGAC64aFA9oucyk(8iC)e$76)vi)!U8Rb; zN@+KaQunIZ1g&7*jiR#ce$n}SGrpO9XMXQH@BE%;et$f_c^(RM7%Jp!&&4eOI6N2! z>l`6170noWz+qjF5d?5>uW$hX+<12P5GT%l`M%@)jDY{eH56@g2(hW|9}Im($=m<{ zl~l;7anvP^aw<6)XdXCsw-Z?qwB^W{?WHr`7IrTcx4Je#aL?%X=ynTr#b2$4K}%7? zBmLK#^Ob@bX*aj0SCbk<;r$`cKdfeNYfW*$vS#%0amr8lweL)nV%A7PI>8hNro~=MJz4~L{dn#9ijUXVY4qf+9;^HX9GeZjI z#Zwsaij}ziX7q=DS_$!gf2@UFF+_AOEo~8(g1SB@;t{r8pJtsL&olP+eDOBP+0|=g z3$LwnD&3jRJhx(IS{%ylH#vmNa@x&W6Jy6%I69H5*|g7<!cuaCUcBb|Y$$<7qV83 zsQKRK6r~Bya*?3H#GL7xX>}&f?Gpl90As#)UyIoFoNXW|@nmk4>72Sm@tF&(gL`YI z^k4;^r1AZpFqIY|aBa2eRM1pYtCB!_3WEdf9wvWPD91Fbb;|;g{Vp&5qx{enyrIg& zd#Mv>SuxZqA>}+{QgFrWMvSIKsAbXhxZHHWu-v!SkG!!f9`-^mD<-;P3aVlOAv7?5 z0Y`+QU&6k@w_VMrF2LLe@NwdYt_u>l{oOax|B@3 z-=t`Q3$0{(GT8l%h|Rezv|l}Se&6mTMZ zhCIUv?&_GJ2UXacI@l%^IL1@2k7vRk7Gepb!NWzcas?%JP|1{N?wLkasO<2WEIXJF>}52`DM@6ntg(<(0p*nT2$nPJesiMxrhK}?QBTJ^g7wi z07Yzxm)t0mBq~1dl}wx*v7r#}nB7MHluUPcO&_|wJr5MSFgRzjf92s@{pkg`9fEQK zSUaDDD>=ebksnF!HM=>2_+LkoSn`=)q0sfNVJ9KU*0! zf1%nHQXS|eOh$)Z+}-v1FKz?PvL`O)cQ2bMz`v%r@SQ$zMRjddUJDrgrAJxfV#l1O z6pklas=-}0%HK45g;%vqVdmwo?&Ym1M$<}Z^CtJsV1Q_asSg;`GKYVb_rts!D~^wM zrkoJ`6?n|ENO+*}|7@uPNai~x3|g(k2LVt!8OA`SsRpI3iPU z3>mTy^ze$sxc$6ePq&0bj`lY9!Z_~F_w&pD$sa)_1K-Ybv&6k=2^5{u@ghTv8y&Y$ z4MM_o8?;Mz8>%*hZlq!Rs-x{+JaZT3jat?*DHiuAnB*MEe(bliZ24w>m8LIdKL(f1 zic2aXV17h92i=jgC6blolC16l>hNj11>z=d)zBMCDGl4NrwIsV}==xQ0hBBZRM z99VdHaUlsCr4A*So!o9q9qr%d&P;a>Skcmp;z}B>?JAs+yry%htOK9?g4{yio6EyE zgX~IZ8{+dtzo8O}3aiSVGCKXSVa4XEz#6fZ3M{f`v3Ir{%!lvM~DA9WND_r=fIO$NtK!CrQ$ z0HoPB0Kmbn(!}dPl8dkm$wWlt7~yci>e&cBc8)@i5zg{`C&cjy^6~(VI0}bDZeRYR eQG%VM3J?I`$738%(zb}^cdQabk#`7uIQ~D9XM0xw delta 1914 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 delta 1878 zcmZ9NXHXO97KS51AR)9+LJ38XszM+rodxMdiWrI@y@cM&q9oLiSSZpBthA*_CyIAz zLICN#2ntJ6T4)P`24q=qE_d$iH*>z3^SpD;oPQ5VbmJcp)wp3syJmDevNC#$>spYGKiM|ipw}=TJDl?+%D}LC zu`q`160T~Fgd_zkA&Ze2+pa?C%X=+hc{0duP-iC0d?-l3i?pD)GW>@9clBh|qu9x1 z?4}~I%hODo9M~Z-w_66yAHPi{m#cesX9S8(B-PNgJh1HHEC+^(r)PSOIXgV`Z+`h; zl}w0`4%wDq165znanu&Kt2-L`I1~8gV5(6!3QC_DSpL3p<53BdU6rAE%S{{d`-p^$u!t z%i_SmV-}{D1&8kD5&_88Ww|9jp57mA>ZJsYo>?zhXh3>VFj`bJ4~0h*$c(o$(1X<- zTOk}x7{(t=k}K5N6Z3~w6_mHzG+8WN9kVShOqj-&1Lb$MR?1Tqxm#WIVkB&Tf0K;^ zN~m5!ty8$y=$)s)7vboJK{ZkXf*Glx5Gq|LMYU!Vb%<)inS7I9V%COKH`b=%)| z8GmO$p$i~i^=T@iv&?bA>2NJ&oHOoD3ZobQLT-X%wAwG+=xVU0J9c?&ylHYqXmnG3 zQb}^+K)QkI;hSKpHwFtf6!Xu`XvRgUiuf+t-N>c%Gs|o^#|f=%+?tYFe9V+CU(5T! z_T;U(|H;N7_erjq3`M^-ZyodD{SV&w11PeqW_je zwusE^T_`R^6mOP&(w^B?NS{%_icn{z)1Tp^N0#iz40L~Epq=-Uf`Iu$PQF!b=f#(Hk3F+ zXudyx+r4{|NU1Nn6KFu`GN4SG1VxBNDawbv@W*2{)(9aAnG;9Kr7xi9!o$w&^d)@= z6MkHG0$)1fLd+Mv;XLL>L)HH+UnU76z$G!rP+fuTf=F^EbGIo`93XqsZiY{oZKJM5 z+OO9w+VnBX#`n1rZ#l(cAl)5^D*nbedKd6$Z|2beNr$0cj66Q-pOC0n91bEOFi(1o zi;%-%jL^fUHgvm%$5GkRj4F(rv|aQkreE=Y`t;B|yD}QQU)JPAy`tsaV=-NC@JFHh z;Wz9t%h1b27VOEQ{Zi`pn|u2kcE=6Sn?@&YwKkT*2^;UwvF%1K2!w~q(M)p*MImp> zFGKu&K;!c^t*dIu8NQ@Ng%S5-sQ^S|s2$5GD!g;XkCj)ftTMYePAo#)dZA7LgA0G= zVQ&+0z}Ew_AaI+yW;4X>)u##?t#Zh%ElF^=6V*-jrYpndRZ!zr%kZmUNniW$5bkOc zN=pTp$+R_KLDz>Gvrijj;KA~t`5=D%2xWyJ9cZ8S(^oQYhsK;gQ6o2}@0kt~V3PrB z0g2WS_{t-V!G+s9SPFXy#*aL4D(kcX)6YI4#FxKgUpdvvp6A&YMTljX`iHtE)s-4s zjD8LAJpoQgk+|Gp(>Y_YuWHV{!f~bnhI6l2I+~&QBG0W&}oD zFj6d-i{>XJLXiK1laL(XPZ-F06L_YZG%y?dXWzs6%SHchGs&~bUPM>^|ALOQE8qa` zvmXGsbXLVNq98!p6ObU?Wx&P2&)w^6e87XV$QI21@5lhk2h@Q8(kdWA7tu4Q5FHQe H`O<#?R@PJa diff --git a/examples/poc/basic_deployment/main.tf b/examples/poc/basic_deployment/main.tf index c79baad24..e2c936302 100644 --- a/examples/poc/basic_deployment/main.tf +++ b/examples/poc/basic_deployment/main.tf @@ -6,18 +6,18 @@ provider "aws" { provider "aws" { region = "us-east-1" - alias = "poc_scripts_s3_region" + alias = "poc_scripts_s3_region" } module "globals" { source = "imperva/dsf-globals/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag sonar_version = var.sonar_version } module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag key_name_prefix = "imperva-dsf-" private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" } @@ -64,7 +64,7 @@ module "vpc" { module "hub" { source = "imperva/dsf-hub/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "primary"]) subnet_id = module.vpc.public_subnets[0] binaries_location = local.tarball_location @@ -88,7 +88,7 @@ module "hub" { module "agentless_gw_group" { count = var.gw_count source = "imperva/dsf-agentless-gw/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "gw", count.index]) subnet_id = module.vpc.private_subnets[0] ebs = var.gw_group_ebs_details @@ -117,7 +117,7 @@ module "agentless_gw_group" { module "federation" { for_each = { for idx, val in module.agentless_gw_group : idx => val } source = "imperva/dsf-federation/null" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag gw_info = { gw_ip_address = each.value.private_ip gw_private_ssh_key_path = module.key_pair.key_pair_private_pem.filename @@ -142,7 +142,7 @@ module "federation" { module "rds_mysql" { count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag rds_subnet_ids = module.vpc.public_subnets security_group_ingress_cidrs = local.workstation_cidr } @@ -150,7 +150,7 @@ module "rds_mysql" { module "db_onboarding_mysql" { for_each = { for idx, val in module.rds_mysql : idx => val } source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag sonar_version = module.globals.tarball_location.version hub_info = { hub_ip_address = module.hub.public_ip @@ -178,7 +178,7 @@ module "db_onboarding_mysql" { module "rds_mssql" { count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag rds_subnet_ids = module.vpc.public_subnets security_group_ingress_cidrs = local.workstation_cidr @@ -191,7 +191,7 @@ module "rds_mssql" { module "db_onboarding_mssql" { for_each = { for idx, val in module.rds_mssql : idx => val } source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag sonar_version = module.globals.tarball_location.version hub_info = { hub_ip_address = module.hub.public_ip @@ -219,6 +219,6 @@ module "db_onboarding_mssql" { module "statistics" { source = "imperva/dsf-statistics/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag } diff --git a/examples/poc/hadr_deployment/hadr_deployment.zip b/examples/poc/hadr_deployment/hadr_deployment.zip index 4067da7471af4f7f8b6e7ab456119e141e2bdd9a..9a78b900fb6a1b2ea93e195efe05987b5bc4253e 100644 GIT binary patch delta 2328 zcma);c{mjM8pmgmvCNobIm!^3lBHvt5$Z@7`!a~Jj)atKS)#FyJz0twdv;02p0z9y zm9d7g49PA_Bps0Sf<|nCo;0EG2L}rV&%qr#(0AN#;%nC*l|MkJahrkX1GA)Av0H%P$ zxHT*5+Y|CU!P^znNgN)`*4RON__1doOlY$!+**)3JXgfZu4F=+`hb7uhuFX65rFSi+azLw%WHdY!4U{NK;)D9eTN%6rNUg^GoO_vys%fPb z7Aqz?QkSq@@XlDV1+RAA7OQ@}c~BYHx4lqpjyYht#h2*Q$;WE>2FD!BZl@!l@EG@2 ze^7TR!!_-WwL`B)(EOhnC}D=#@D5a(=ustRS{!LSZ0Th^u(M*U*Mr2GP)BF;ZnJvh zK~_42V<8+A$*CE(!nV%NRM^(mXA_{WVM6V>`tuExYLTKDAkIiobh_O*bOL?DQ zv-Q`rEAi;|rdhbj$MwF0h4ntSJ&1Rt!{i{{y`}(p>9Q?${7GPT6jf^0(`?6}N@h;k zf{_qSSm{w6kbDvnx%yP=`NH$Uz;1Jzo_%seCh9Vmth$BxSeEVC5tiv97p{+X+8<7W zT53~~mY+lufq(5(CmUNe!zxRO6GOMVpM7TK+2tYG9lLOA0<}0EQdjoveM4TH&X}h* zC%Kk=ar|3Md{z>4kyBWvJK?~mw1#76lpepI}omtSl|A> z(z=We{4Lb=K>UK(rQls+Y2kF05Ud8;_DL8j%XKP3;Y?sg0StH51w7fv_iVplJb@GWa#AGn*D(1o1yJ9|&IUfcsD; z(NDp1ScGV>VdnT!ber?QdIn>6FYJZWJDoMB)`tBwV_cM8XQf2=_cqU*$hnpi)l~rP zQyr5`)`-qChV1@dNlNPz=JjeS*zlZD2|mWxYYf~rQNN8>#lN6DI_Sqn&y(WGHC~&c zFO#~zpN=K9q|~`Y+N%}OX;1`=vn9@$jR-m_(*UNWf ze7-7nu6ILM=~Tb)50Y#Z$x<7BCge8wGdT;+FBfIMhfNJ-2No|C-E^!sxDth}P8?3| zB0F*|A+!tTQg1r)#nj+)Ay?nH(ABtqxYqXR!8=EwNt-hPoc_CuncVzyLvTG_4H-u>YwQ>r6l zU+@n?`Eh7kY7yFfN^Z;7TzNABT;I`*pLN*C$0(fSy5qFPz&GA?c_FxGzRr35k!nbF zj+awd2~LR=>fXu(Z-NfZ?<&B??g|7GBkmb)#B8@dLe~3#Vbowe5_T?+iYw^vdT?{8 z_FUMgjo&j;6g?iyEjoi3e#6SUJfJh@W9v77?h92{Em)M~UW{T7?R!3vM#+tD%!Ik& zC*_i;4IggsvzchxA*+ErSe(pE`?APLST{#$HY#ORW#ZbYMjrQNO=&p_aW1)i}lLO$Pz1f&}4sFYFq;K+7Hrb!HCa16^9SNK)$u9kqRXebwLI1#X z80z0}5S9-92fB00A&+GKKO#5M1A+v>|2fjZsVw>b*Z#XDNOQ^jN^mF_KQNt~#dTWw z7vhcU*{}0~0DzRkzQG4Laa3Rcz{7bQ>O}s*CHyP*RJr+qG_no%8Svpfas>A&<|59c Gn7;u!1R&-B delta 2123 zcmZ9OdpHvc8^FgHjZNm-Ttb~is~P2TB<6l;#KBCHxgRIYt+_;J*hVswwnYdf#3=XB zDI~Ed_lRwBK_z0dRh@&4Y+zrT0wP}w1f!zrK;7_b|G&ITC}gvdG9 zexDziVE_m25?AyuQpF4wg#JLd@O*5jga`mYM6mV%)hPd6@F7Qw0R)8J0|5Y`*dOPX z&k#b!bfy31-z#V>`nGM_g?9vmr zF&T)%K}2)JRAZds)tqO($T(C=TjVoU2`SUKM_w^meGFk+&AqpF+^?cn@$=In_>))) zlx4&I64RL?MdM}Div&3{{cmq?yTPo?H8KhHD?|PsYH|V4N&<>wJq_RLzc~AS;fffn zn!#mQD~A{BHx;;aVEb(YZ0fO16?Mf<`@iNDV>^xR!HwIXC|Ua9I&_%<>b^``Z2B2* z*|2QeN0R)DsO~=D+N-uz!b;ABcNEDtm#!2Z@#ZwOk?G(2*V?w*&7Kzd=9pW4KxOQA zd1m-`C|bp+E6X13M?jd?%iiq#yx|0ku)gkuN>UWGa0cP}tbJsh=Lh9x3phZqH|FHj zsSDrWD|!K0eok|L&UzfZOFVH*Kd$9t$&2NRov!7Iu`j~07M^dkM@Y3LY7Z&@xZ8~u z$K@sQjHbhIPwcADZ;kL46nS zx{KuP^c0tv=B{BYQvOt`sP9$?&*c5;*q;Z4)4x?VB!W1{v&iN1{_U?O#YIXbC`oWG1Le(Wly0W6Ix>##hO0k|Fb(**hk3Z1_xb5Ba)aR-I5dg+FiVQ&R zTThmZPid_{B%L8lnds0*-p>bchpwH2u1IWR!i!YSIkG7ox3CVg$JZ|=h#k3I(R(59 zTI&N;dcmq(go-SC>K!o=kYZ1%JHxY8H#So-rq1vJfhv zOeG0Z_agYQ5h~yIfZMG$FvNgNWGqBu0Eu{b8tZWrIyC9@sZvU2TFY=W8cDAj@|E{8 z_QtI2b6pi*+G@tI?34Z^V1n<(4J*IJ{@OeMWYx4;i9UW9N)}GJOx^Lt>U|N zN;U5@xw+0wxhbc^B+?a!@3BECY>*tIE6yi;%*hu2n_Wb`aZ7FdV6kUQxpgeKcsgHs zn3P>EUg%#~j^y;^4NT-e=qyPs zM!Z2*+#qRo8}x*srSn(5_#4+JIG5B?l7%`Jm55uJycSo@;5;SYCrq}+3e&k}16j4X zTIfZ3rO@k91Nl0-awTpc0ar@)`83kMc(jRWkjhI&a^D?&(2^wf0;RquyYS(ro}t&d zm&5vupsMTzxwXLTWheR3YN1@hA?$S4*PaLbnS0;1ns?5lc!V|B$o4|UP&R@x{+ifx zisN423_s7{d7BDIsa82`|N^(Y=F2{Ai*5v5mdWYYde! zte`uG-PVndS;c@*r&)%Vw1Zf)A@I<7p>3L|ahu*Pt4H`S?nj&bQGVi3H{yc5ymIAa ztBH`-T+6WTnwey-`xm=h8l{A(YhP)7&mKO(i+7`1D%5%;dWd$Yny6T6ReL z&Sq-?G1-LTFu#*)YPVI3iv=mfE)6QBX+AFBx$jr!2B}e4vJOlr?b)@i^bbjj?pl{s z4A%N3S=Kn1z3W{TSxoa6tKo_r6Z{FMAlm val } source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag sonar_version = module.globals.tarball_location.version hub_info = { hub_ip_address = module.hub.public_ip @@ -230,7 +230,7 @@ module "db_onboarding_mysql" { module "rds_mssql" { count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag rds_subnet_ids = module.vpc.public_subnets security_group_ingress_cidrs = local.workstation_cidr @@ -243,7 +243,7 @@ module "rds_mssql" { module "db_onboarding_mssql" { for_each = { for idx, val in module.rds_mssql : idx => val } source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag sonar_version = module.globals.tarball_location.version hub_info = { hub_ip_address = module.hub.public_ip @@ -271,6 +271,6 @@ module "db_onboarding_mssql" { module "statistics" { source = "imperva/dsf-statistics/aws" - version = "1.3.5" # latest release tag + version = "1.3.6" # latest release tag } diff --git a/modules/aws/agentless-gw/README.md b/modules/aws/agentless-gw/README.md index ae15604ac..0da3d03db 100644 --- a/modules/aws/agentless-gw/README.md +++ b/modules/aws/agentless-gw/README.md @@ -108,4 +108,4 @@ SSH access is required to provision this module. To SSH into the DSF agentless g ## Additional Information For more information about the DSF agentless gateway and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v4.10-sonar-user-guide/page/81265.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.3.5). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.3.6). \ No newline at end of file diff --git a/modules/aws/agentless-gw/main.tf b/modules/aws/agentless-gw/main.tf index e535b37e6..2973abe10 100644 --- a/modules/aws/agentless-gw/main.tf +++ b/modules/aws/agentless-gw/main.tf @@ -24,9 +24,9 @@ module "gw_instance" { binaries_location = var.binaries_location hub_federation_public_key = var.hub_federation_public_key proxy_info = { - proxy_address = var.ingress_communication_via_proxy.proxy_address - proxy_ssh_key_path = var.ingress_communication_via_proxy.proxy_private_ssh_key_path - proxy_ssh_user = var.ingress_communication_via_proxy.proxy_ssh_user + proxy_address = var.ingress_communication_via_proxy.proxy_address + proxy_ssh_key_path = var.ingress_communication_via_proxy.proxy_private_ssh_key_path + proxy_ssh_user = var.ingress_communication_via_proxy.proxy_ssh_user } - skip_instance_health_verification = var.skip_instance_health_verification + skip_instance_health_verification = var.skip_instance_health_verification } diff --git a/modules/aws/hub/README.md b/modules/aws/hub/README.md index a18451c1f..03e141f7b 100644 --- a/modules/aws/hub/README.md +++ b/modules/aws/hub/README.md @@ -111,4 +111,4 @@ SSH access is required to provision this module. To SSH into the DSF Hub instanc ## Additional Information For more information about the DSF Hub and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v4.10-sonar-user-guide/page/81265.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.3.5). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.3.6). \ No newline at end of file diff --git a/modules/aws/hub/main.tf b/modules/aws/hub/main.tf index 86f42d602..f9712e775 100644 --- a/modules/aws/hub/main.tf +++ b/modules/aws/hub/main.tf @@ -24,9 +24,9 @@ module "hub_instance" { hub_federation_public_key = local.dsf_hub_ssh_public_federation_key sonarw_secret_name = local.secret_aws_name proxy_info = { - proxy_address = var.ingress_communication_via_proxy.proxy_address - proxy_ssh_key_path = var.ingress_communication_via_proxy.proxy_private_ssh_key_path - proxy_ssh_user = var.ingress_communication_via_proxy.proxy_ssh_user + proxy_address = var.ingress_communication_via_proxy.proxy_address + proxy_ssh_key_path = var.ingress_communication_via_proxy.proxy_private_ssh_key_path + proxy_ssh_user = var.ingress_communication_via_proxy.proxy_ssh_user } - skip_instance_health_verification = var.skip_instance_health_verification + skip_instance_health_verification = var.skip_instance_health_verification } \ No newline at end of file diff --git a/modules/aws/hub/variables.tf b/modules/aws/hub/variables.tf index 810a02c82..ea2193e5a 100644 --- a/modules/aws/hub/variables.tf +++ b/modules/aws/hub/variables.tf @@ -34,15 +34,15 @@ variable "ebs" { variable "ingress_communication_via_proxy" { type = object({ - proxy_address = string + proxy_address = string proxy_private_ssh_key_path = string - proxy_ssh_user = string + proxy_ssh_user = string }) description = "Proxy address used for ssh for private hub, Proxy ssh key file path and Proxy ssh user. Keep empty if no proxy is in use" - default = { - proxy_address = null + default = { + proxy_address = null proxy_private_ssh_key_path = null - proxy_ssh_user = null + proxy_ssh_user = null } } diff --git a/modules/aws/poc-db-onboarder/variables.tf b/modules/aws/poc-db-onboarder/variables.tf index 02e1bf058..32918a2b9 100644 --- a/modules/aws/poc-db-onboarder/variables.tf +++ b/modules/aws/poc-db-onboarder/variables.tf @@ -21,16 +21,16 @@ variable "hub_info" { variable "hub_proxy_info" { type = object({ - proxy_address = string + proxy_address = string proxy_private_ssh_key_path = string - proxy_ssh_user = string + proxy_ssh_user = string }) description = "Hub proxy info" - default = { - proxy_address = null + default = { + proxy_address = null proxy_private_ssh_key_path = null - proxy_ssh_user = null + proxy_ssh_user = null } } diff --git a/modules/aws/rds-mssql-db/README.md b/modules/aws/rds-mssql-db/README.md index 73f47ffea..ebf383b62 100644 --- a/modules/aws/rds-mssql-db/README.md +++ b/modules/aws/rds-mssql-db/README.md @@ -80,4 +80,4 @@ module "dsf_rds_mssql" { ## Additional Information -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.3.5). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.3.6). \ No newline at end of file diff --git a/modules/aws/rds-mssql-db/lambdas.tf b/modules/aws/rds-mssql-db/lambdas.tf index 31b17de05..e9e64e7e6 100644 --- a/modules/aws/rds-mssql-db/lambdas.tf +++ b/modules/aws/rds-mssql-db/lambdas.tf @@ -4,14 +4,14 @@ data "aws_iam_role" "lambda_mssql_assignee_role" { } resource "aws_lambda_function" "lambda_mssql_infra" { - function_name = join("-", ["dsf-mssql-infra", local.lambda_salt]) + function_name = join("-", ["dsf-mssql-infra", local.lambda_salt]) s3_bucket = data.aws_s3_object.mssql_lambda_package.bucket s3_key = data.aws_s3_object.mssql_lambda_package.key s3_object_version = data.aws_s3_object.mssql_lambda_package.version_id - role = data.aws_iam_role.lambda_mssql_assignee_role.arn - handler = "createDBsAndEnableAudit.lambda_handler" - runtime = "python3.9" - timeout = 900 + role = data.aws_iam_role.lambda_mssql_assignee_role.arn + handler = "createDBsAndEnableAudit.lambda_handler" + runtime = "python3.9" + timeout = 900 vpc_config { security_group_ids = [aws_security_group.rds_mssql_access.id] diff --git a/modules/aws/rds-mssql-db/main.tf b/modules/aws/rds-mssql-db/main.tf index 7ad9836f9..0e962e87a 100644 --- a/modules/aws/rds-mssql-db/main.tf +++ b/modules/aws/rds-mssql-db/main.tf @@ -123,7 +123,7 @@ resource "aws_security_group_rule" "rds_mssql_all_out" { # copy the files from our s3 prod to the customer s3 data "aws_s3_objects" "source" { provider = aws.poc_scripts_s3_region - bucket = var.db_audit_scripts_bucket_name + bucket = var.db_audit_scripts_bucket_name } data "aws_s3_object" "source" { diff --git a/modules/aws/rds-mssql-db/versions.tf b/modules/aws/rds-mssql-db/versions.tf index 1c0cbbb86..3aaf1c082 100644 --- a/modules/aws/rds-mssql-db/versions.tf +++ b/modules/aws/rds-mssql-db/versions.tf @@ -2,8 +2,8 @@ terraform { required_version = ">= 0.13" required_providers { aws = { - source = "hashicorp/aws" - version = "4.23.0" + source = "hashicorp/aws" + version = "4.23.0" configuration_aliases = [aws.poc_scripts_s3_region] } } diff --git a/modules/aws/sonar-base-instance/variables.tf b/modules/aws/sonar-base-instance/variables.tf index 1595cf9a9..b16dbb520 100644 --- a/modules/aws/sonar-base-instance/variables.tf +++ b/modules/aws/sonar-base-instance/variables.tf @@ -102,15 +102,15 @@ variable "binaries_location" { variable "proxy_info" { type = object({ - proxy_address = string + proxy_address = string proxy_ssh_key_path = string - proxy_ssh_user = string + proxy_ssh_user = string }) description = "Proxy address used for ssh to the sonar instance, Proxy ssh key file path and Proxy ssh user. Keep empty if no proxy is in use" - default = { - proxy_address = null + default = { + proxy_address = null proxy_ssh_key_path = null - proxy_ssh_user = null + proxy_ssh_user = null } } diff --git a/modules/null/federation/main.tf b/modules/null/federation/main.tf index 25bccc8f1..0ee94f8ab 100644 --- a/modules/null/federation/main.tf +++ b/modules/null/federation/main.tf @@ -5,18 +5,18 @@ locals { lock_shell_cmds = file("${path.module}/grab_lock.sh") federate_hub_cmds = templatefile("${path.module}/federate_hub.tpl", { - ssh_key_path = var.hub_info.hub_private_ssh_key_path - dsf_gw_ip = var.gw_info.gw_ip_address - dsf_hub_ip = var.hub_info.hub_ip_address - hub_ssh_user = var.hub_info.hub_ssh_user + ssh_key_path = var.hub_info.hub_private_ssh_key_path + dsf_gw_ip = var.gw_info.gw_ip_address + dsf_hub_ip = var.hub_info.hub_ip_address + hub_ssh_user = var.hub_info.hub_ssh_user hub_proxy_address = var.hub_proxy_info.proxy_address != null ? var.hub_proxy_info.proxy_address : "" hub_proxy_private_ssh_key_path = var.hub_proxy_info.proxy_private_ssh_key_path != null ? var.hub_proxy_info.proxy_private_ssh_key_path : "" hub_proxy_ssh_user = var.hub_proxy_info.proxy_ssh_user != null ? var.hub_proxy_info.proxy_ssh_user : "" }) federate_gw_cmds = templatefile("${path.module}/federate_gw.tpl", { - ssh_key_path = var.gw_info.gw_private_ssh_key_path - dsf_gw_ip = var.gw_info.gw_ip_address - gw_ssh_user = var.gw_info.gw_ssh_user + ssh_key_path = var.gw_info.gw_private_ssh_key_path + dsf_gw_ip = var.gw_info.gw_ip_address + gw_ssh_user = var.gw_info.gw_ssh_user gw_proxy_address = var.gw_proxy_info.proxy_address != null ? var.gw_proxy_info.proxy_address : "" gw_proxy_private_ssh_key_path = var.gw_proxy_info.proxy_private_ssh_key_path != null ? var.gw_proxy_info.proxy_private_ssh_key_path : "" gw_proxy_ssh_user = var.gw_proxy_info.proxy_ssh_user != null ? var.gw_proxy_info.proxy_ssh_user : "" diff --git a/modules/null/federation/variables.tf b/modules/null/federation/variables.tf index 3bc7ec38a..f8d68b88f 100644 --- a/modules/null/federation/variables.tf +++ b/modules/null/federation/variables.tf @@ -22,31 +22,31 @@ variable "hub_info" { variable "gw_proxy_info" { type = object({ - proxy_address = string + proxy_address = string proxy_private_ssh_key_path = string - proxy_ssh_user = string + proxy_ssh_user = string }) description = "Proxy address used for ssh for private gw (Usually hub address), Proxy ssh key file path and Proxy ssh user. Keep empty if no proxy is in use" - default = { - proxy_address = null + default = { + proxy_address = null proxy_private_ssh_key_path = null - proxy_ssh_user = null + proxy_ssh_user = null } } variable "hub_proxy_info" { type = object({ - proxy_address = string + proxy_address = string proxy_private_ssh_key_path = string - proxy_ssh_user = string + proxy_ssh_user = string }) description = "Proxy address used for ssh for private hub, Proxy ssh key file path and Proxy ssh user. Keep empty if no proxy is in use" - default = { - proxy_address = null + default = { + proxy_address = null proxy_private_ssh_key_path = null - proxy_ssh_user = null + proxy_ssh_user = null } }