Merge branch 'main' into tamirkamara/3144-airlock-workspace-dns

microsoft · Feb 12, 2023 · 0cc490e · 0cc490e
2 parents 5e0825d + 19fe846
commit 0cc490e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ BUG FIXES:
 * Skip Certs shared service E2E on Friday & Saturday due to LetsEncrypt limits [#3203](https://github.com/microsoft/AzureTRE/pull/3203)
 * Create Workspace AppInsights via AzAPI provider due to an issue with AzureRM [#3207](https://github.com/microsoft/AzureTRE/pull/3207)
 * 'Workspace Owner' is now able to access Airlock request's SAS URL even if the request is not in review [#3208](https://github.com/microsoft/AzureTRE/pull/3208)
+* Ignore changes in log_analytics_destination_type to prevent redundant updates [#3217](https://github.com/microsoft/AzureTRE/pull/3217)
 * Fix DNS conflict in airlock-review workspace that could make the entire airlock module inoperable [#3215](https://github.com/microsoft/AzureTRE/pull/3215)
 
 COMPONENTS:

diff --git a/core/terraform/airlock/airlock_processor.tf b/core/terraform/airlock/airlock_processor.tf
@@ -113,6 +113,8 @@ resource "azurerm_monitor_diagnostic_setting" "airlock_function_app" {
       days    = 365
     }
   }
+
+  lifecycle { ignore_changes = [log_analytics_destination_type] }
 }
 
 resource "azurerm_private_endpoint" "function_storage" {

diff --git a/core/terraform/api-webapp.tf b/core/terraform/api-webapp.tf
@@ -152,4 +152,6 @@ resource "azurerm_monitor_diagnostic_setting" "webapp_api" {
       days    = 365
     }
   }
+
+  lifecycle { ignore_changes = [log_analytics_destination_type] }
 }
diff --git a/core/terraform/appgateway/appgateway.tf b/core/terraform/appgateway/appgateway.tf
@@ -198,7 +198,6 @@ resource "azurerm_monitor_diagnostic_setting" "agw" {
   name                       = "diagnostics-agw-${var.tre_id}"
   target_resource_id         = azurerm_application_gateway.agw.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
-  # log_analytics_destination_type = "Dedicated"
 
   dynamic "enabled_log" {
     for_each = ["ApplicationGatewayAccessLog", "ApplicationGatewayPerformanceLog", "ApplicationGatewayFirewallLog"]
@@ -221,6 +220,8 @@ resource "azurerm_monitor_diagnostic_setting" "agw" {
       days    = 365
     }
   }
+
+  lifecycle { ignore_changes = [log_analytics_destination_type] }
 }
 
 
diff --git a/core/terraform/keyvault.tf b/core/terraform/keyvault.tf
@@ -113,10 +113,9 @@ resource "azurerm_key_vault_secret" "application_admin_client_secret" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "kv" {
-  name                           = "diagnostics-kv-${var.tre_id}"
-  target_resource_id             = azurerm_key_vault.kv.id
-  log_analytics_workspace_id     = module.azure_monitor.log_analytics_workspace_id
-  log_analytics_destination_type = "AzureDiagnostics"
+  name                       = "diagnostics-kv-${var.tre_id}"
+  target_resource_id         = azurerm_key_vault.kv.id
+  log_analytics_workspace_id = module.azure_monitor.log_analytics_workspace_id
 
   dynamic "enabled_log" {
     for_each = ["AuditEvent", "AzurePolicyEvaluationDetails"]
@@ -139,4 +138,6 @@ resource "azurerm_monitor_diagnostic_setting" "kv" {
       days    = 365
     }
   }
+
+  lifecycle { ignore_changes = [log_analytics_destination_type] }
 }
diff --git a/core/terraform/servicebus.tf b/core/terraform/servicebus.tf
@@ -96,7 +96,6 @@ resource "azurerm_monitor_diagnostic_setting" "sb" {
   name                       = "diagnostics-sb-${var.tre_id}"
   target_resource_id         = azurerm_servicebus_namespace.sb.id
   log_analytics_workspace_id = module.azure_monitor.log_analytics_workspace_id
-  # log_analytics_destination_type = "Dedicated"
 
   dynamic "enabled_log" {
     for_each = ["OperationalLogs", "VNetAndIPFilteringLogs", "RuntimeAuditLogs", "ApplicationMetricsLogs"]
@@ -119,4 +118,6 @@ resource "azurerm_monitor_diagnostic_setting" "sb" {
       days    = 365
     }
   }
+
+  lifecycle { ignore_changes = [log_analytics_destination_type] }
 }
diff --git a/core/version.txt b/core/version.txt
@@ -1 +1 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
-Original file line number
+Diff line change
@@ Expand Up @@
           days    = 365
         }
       }
+      lifecycle { ignore_changes = [log_analytics_destination_type] }
     }
     resource "azurerm_private_endpoint" "function_storage" {
@@ Expand Down @@