Moved tf settings to locals.

DFE-Digital · Jun 13, 2024 · e225706 · e225706
1 parent 2556d66
commit e225706
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 38 deletions.
diff --git a/terraform/local.tf b/terraform/local.tf
@@ -16,6 +16,11 @@ locals {
     "KeyVault__Endpoint"                  = "https://${var.resource_name_prefix}-kv.vault.azure.net/"
     "ContentfulOptions__UsePreviewApi"    = var.contentful_use_preview_api
     "WEBSITES_PORT"                       = "8080"
+    "ServiceAccess__IsPublic"             = var.webapp_access_is_public
+    "ServiceAccess__Keys__0"              = var.webapp_e2e_access_key
+    "ServiceAccess__Keys__1"              = var.webapp_team_access_key
+    "ServiceAccess__Keys__2"              = var.webapp_access_key_1
+    "ServiceAccess__Keys__3"              = var.webapp_access_key_2
   }
 
   webapp_slot_app_settings = {
@@ -26,5 +31,10 @@ locals {
     "KeyVault__Endpoint"                  = "https://${var.resource_name_prefix}-kv.vault.azure.net/"
     "ContentfulOptions__UsePreviewApi"    = var.contentful_use_preview_api
     "WEBSITES_PORT"                       = "8080"
+    "ServiceAccess__IsPublic"             = var.webapp_access_is_public
+    "ServiceAccess__Keys__0"              = var.webapp_e2e_access_key
+    "ServiceAccess__Keys__1"              = var.webapp_team_access_key
+    "ServiceAccess__Keys__2"              = var.webapp_access_key_1
+    "ServiceAccess__Keys__3"              = var.webapp_access_key_2
   }
-}
+}
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -84,11 +84,6 @@ module "webapp" {
   webapp_custom_domain_cert_secret_label   = var.kv_certificate_label
   webapp_health_check_path                 = "/health"
   webapp_health_check_eviction_time_in_min = 10
-  webapp_access_is_public                  = false
-  webapp_e2e_access_key                    = ""
-  webapp_team_access_key                   = ""
-  webapp_access_key_1                      = ""
-  webapp_access_key_2                      = ""
   agw_subnet_id                            = module.network.agw_subnet_id
   agw_pip_id                               = module.network.agw_pip_id
   kv_id                                    = module.network.kv_id

diff --git a/terraform/modules/azure-web/variables.tf b/terraform/modules/azure-web/variables.tf
@@ -45,32 +45,6 @@ variable "webapp_name" {
   type        = string
 }
 
-variable "webapp_access_is_public" {
-  description = "Web app service is public, and access is unchallenged"
-  default     = false
-  type        = bool
-}
-
-variable "webapp_e2e_access_key" {
-  description = "Web app access key for automated end-to-end tests"
-  type        = string
-}
-
-variable "webapp_team_access_key" {
-  description = "Web app access key for the service team"
-  type        = string
-}
-
-variable "webapp_access_key_1" {
-  description = "Web app access key for invited access 1"
-  type        = string
-}
-
-variable "webapp_access_key_2" {
-  description = "Web app access key for invited access 2"
-  type        = string
-}
-
 variable "webapp_slot_name" {
   description = "Name for the slot for the Web Application"
   type        = string

diff --git a/terraform/modules/azure-web/web-app.tf b/terraform/modules/azure-web/web-app.tf
@@ -136,11 +136,6 @@ resource "azurerm_linux_web_app_slot" "webapp_slot" {
     "APPINSIGHTS_INSTRUMENTATIONKEY"             = azurerm_application_insights.web.instrumentation_key
     "APPLICATIONINSIGHTS_CONNECTION_STRING"      = azurerm_application_insights.web.connection_string
     "ApplicationInsightsAgent_EXTENSION_VERSION" = "~3"
-    "ServiceAccess__IsPublic"                    = var.webapp_access_is_public
-    "ServiceAccess__Keys__0"                     = var.webapp_e2e_access_key
-    "ServiceAccess__Keys__1"                     = var.webapp_team_access_key
-    "ServiceAccess__Keys__2"                     = var.webapp_access_key_1
-    "ServiceAccess__Keys__3"                     = var.webapp_access_key_2
   }, var.webapp_slot_app_settings)
 
   site_config {

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -90,6 +90,32 @@ variable "webapp_slot_name" {
   type        = string
 }
 
+variable "webapp_access_is_public" {
+  description = "Web app service is public, and access is unchallenged"
+  default     = false
+  type        = bool
+}
+
+variable "webapp_e2e_access_key" {
+  description = "Web app access key for automated end-to-end tests"
+  type        = string
+}
+
+variable "webapp_team_access_key" {
+  description = "Web app access key for the service team"
+  type        = string
+}
+
+variable "webapp_access_key_1" {
+  description = "Web app access key for invited access 1"
+  type        = string
+}
+
+variable "webapp_access_key_2" {
+  description = "Web app access key for invited access 2"
+  type        = string
+}
+
 variable "webapp_docker_registry_url" {
   description = "URL to the Docker Registry"
   type        = string
@@ -134,4 +160,4 @@ variable "contentful_space_id" {
 variable "contentful_use_preview_api" {
   description = "Boolean used to set whether content is preview or published"
   type        = bool
-}
+}