From 40fa5cb7c6b34dad9c0e10b8598e7a85a497fee0 Mon Sep 17 00:00:00 2001
From: RobertGHippo <robert.gammon@education.gov.uk>
Date: Mon, 7 Oct 2024 14:26:51 +0100
Subject: [PATCH] Slot resource has been renamed (it's conditional)

---
 terraform/main.tf                      |  5 +++++
 terraform/modules/azure-web/web-app.tf | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/terraform/main.tf b/terraform/main.tf
index 1fc3097a..c5e2a0c6 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -13,6 +13,11 @@ provider "azurerm" {
   }
 }
 
+moved {
+  from = module.webapp.azurerm_key_vault_access_policy.webapp_kv_app_service_slot
+  to   = module.webapp.azurerm_key_vault_access_policy.webapp_kv_app_service_slot[0]
+}
+
 # Create Resource Group
 resource "azurerm_resource_group" "rg" {
   name     = "${var.resource_name_prefix}-rg"
diff --git a/terraform/modules/azure-web/web-app.tf b/terraform/modules/azure-web/web-app.tf
index 1a92389d..d6039572 100644
--- a/terraform/modules/azure-web/web-app.tf
+++ b/terraform/modules/azure-web/web-app.tf
@@ -1,3 +1,8 @@
+moved {
+  from = resource.azurerm_linux_web_app_slot.webapp_slot
+  to   = resource.azurerm_linux_web_app_slot.webapp_slot[0]
+}
+
 # Create Log Analytics
 resource "azurerm_log_analytics_workspace" "webapp_logs" {
   name                = "${var.resource_name_prefix}-log"
@@ -151,7 +156,7 @@ resource "azurerm_linux_web_app" "webapp" {
 resource "azurerm_linux_web_app_slot" "webapp_slot" {
 
   count = var.environment != "development" ? 1 : 0
-  
+
   name                      = var.webapp_slot_name
   app_service_id            = azurerm_linux_web_app.webapp.id
   https_only                = true
@@ -206,7 +211,7 @@ resource "azurerm_linux_web_app_slot" "webapp_slot" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "webapp_logs_monitor" {
-  
+
   name                       = "${var.resource_name_prefix}-webapp-mon"
   target_resource_id         = azurerm_linux_web_app.webapp.id
   log_analytics_workspace_id = azurerm_log_analytics_workspace.webapp_logs.id
@@ -231,7 +236,7 @@ resource "azurerm_monitor_diagnostic_setting" "webapp_logs_monitor" {
 resource "azurerm_monitor_diagnostic_setting" "webapp_slot_logs_monitor" {
 
   count = var.environment != "development" ? 1 : 0
-  
+
   name                       = "${var.resource_name_prefix}-webapp-${var.webapp_slot_name}-mon"
   target_resource_id         = azurerm_linux_web_app_slot.webapp_slot.0.id
   log_analytics_workspace_id = azurerm_log_analytics_workspace.webapp_logs.id
@@ -412,7 +417,7 @@ resource "azurerm_key_vault_access_policy" "webapp_kv_app_service" {
 resource "azurerm_key_vault_access_policy" "webapp_kv_app_service_slot" {
 
   count = var.environment != "development" ? 1 : 0
-  
+
   key_vault_id            = var.kv_id
   tenant_id               = data.azurerm_client_config.az_config.tenant_id
   object_id               = azurerm_linux_web_app_slot.webapp_slot.0.identity.0.principal_id