adding bdns_url to csp_src_connect

axiologic-pla · Jan 5, 2024 · 675df6f · 675df6f
1 parent 2101553
commit 675df6f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/deployments/terraform/7-lwa-app-deployment-pla/locals.tf b/deployments/terraform/7-lwa-app-deployment-pla/locals.tf
@@ -12,7 +12,7 @@ locals {
 
   csp_script_src_unsafe_hashes = "'sha256-XkPjGMp0z+c11Qt/zG8pIkC1TIiA9lf9XEXevRQbMTU='"
 
-  csp_connect_src = local.bdns_json_url_specified ? "${var.csp_src_connect} https://${local.fqdn} ${join(" ", [for url in distinct(regexall("https://[^\"/]+", data.http.bdns_json[0].response_body)) : url])}" : "https://${local.fqdn} ${join(" ", [for url in distinct(regexall("https://[^\"/]+", file(local.bdns_json_local_path))) : url])}"
+  csp_connect_src = local.bdns_json_url_specified ? "${var.bdns_json_url} https://${local.fqdn} ${join(" ", [for url in distinct(regexall("https://[^\"/]+", data.http.bdns_json[0].response_body)) : url])}" : "https://${local.fqdn} ${join(" ", [for url in distinct(regexall("https://[^\"/]+", file(local.bdns_json_local_path))) : url])}"
 
   s3_object_js   = setsubtract(fileset("${path.module}/LWA", "**/*.js"), ["environment.js"])
   s3_object_json = setsubtract(fileset("${path.module}/LWA", "**/*.json"), ["bdns.json"])

diff --git a/deployments/terraform/7-lwa-app-deployment-pla/terraform.sh b/deployments/terraform/7-lwa-app-deployment-pla/terraform.sh
@@ -27,7 +27,6 @@ TIME_PER_CALL="${13}"
 TOTAL_WAIT_TIME="${14}"
 GTO_TIME_PER_CALL="${15}"
 GTO_TOTAL_WAIT_TIME="${16}"
-CSP_SRC_CONNECT="${17}"
 
 DEPLOYMENT_NAME="LWA"
 
@@ -58,7 +57,6 @@ time_per_call       = ${TIME_PER_CALL}
 total_wait_time     = ${TOTAL_WAIT_TIME}
 gto_time_per_call   = ${GTO_TIME_PER_CALL}
 gto_total_wait_time = ${GTO_TOTAL_WAIT_TIME}
-csp_src_connect = ${CSP_SRC_CONNECT}
 EOF
 
 terraform init -reconfigure \

diff --git a/deployments/terraform/7-lwa-app-deployment-pla/variables.tf b/deployments/terraform/7-lwa-app-deployment-pla/variables.tf
@@ -50,8 +50,3 @@ variable "hostname" {
   type    = string
   default = ""
 }
-
-variable "csp_src_connect" {
-  type = string
-  default = ""
-}