Allows to use custom appinsights agent version

databricks_access_connectors.tf

@@ -2,12 +2,12 @@ module "databricks_access_connectors" {
   source   = "./modules/analytics/databricks_access_connector"
   for_each = local.database.databricks_access_connectors
 
-  client_config     = local.client_config
-  global_settings   = local.global_settings
-  name              = each.value.name
-  settings          = each.value
-  resource_groups   = local.combined_objects_resource_groups
-  base_tags         = local.global_settings.inherit_tags
+  client_config   = local.client_config
+  global_settings = local.global_settings
+  name            = each.value.name
+  settings        = each.value
+  resource_groups = local.combined_objects_resource_groups
+  base_tags       = local.global_settings.inherit_tags
   remote_objects = {
     managed_identities = local.combined_objects_managed_identities
   }

examples/apim/118-api_management_platform_stv2/configuration.tfvars

@@ -26,20 +26,20 @@ vnets = {
     region             = "region1"
     vnet = {
       name          = "example-uks" # prefix-vnet-example-uks
-      address_space = ["10.0.0.0/16"] 
+      address_space = ["10.0.0.0/16"]
     }
     subnets = {
-      
+
       # Example subnet for APIM private endpoint
-      
+
       snet_example_apim_uks = {
-        name            = "example-apim-uks" #prefix-snet-example-apim-uks
-        cidr            = ["10.0.1.0/24"]
-        nsg_key         = "nsg_example_apim_uks"
-      # route_table_key = ""
+        name    = "example-apim-uks" #prefix-snet-example-apim-uks
+        cidr    = ["10.0.1.0/24"]
+        nsg_key = "nsg_example_apim_uks"
+        # route_table_key = ""
         service_endpoints = ["Microsoft.KeyVault", "Microsoft.Storage", "Microsoft.Sql", "Microsoft.EventHub", "Microsoft.ServiceBus"] # service endpoints required for APIM
       }
-    }  
+    }
   }
 }
 
@@ -142,31 +142,31 @@ public_ip_addresses = {
 
 api_management = {
   apim_uks = {
-    name                 = "example-uks" # prefix-apim-example-uks
-    resource_group_key   = "rg_example_apim_uks"
-    publisher_name       = "apim.example.sre.com"
-    publisher_email      = "[email protected]"
-    sku_name             = "Developer_1" # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management#sku_name
-    region               = "region1"
+    name               = "example-uks" # prefix-apim-example-uks
+    resource_group_key = "rg_example_apim_uks"
+    publisher_name     = "apim.example.sre.com"
+    publisher_email    = "[email protected]"
+    sku_name           = "Developer_1" # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management#sku_name
+    region             = "region1"
 
     # Required to deploy APIM on platform verions stv2.*
-    public_ip_address = {       
-      key     = "pip_apim_uks"
-     # lz_key = ""
-    }  
+    public_ip_address = {
+      key = "pip_apim_uks"
+      # lz_key = ""
+    }
 
     virtual_network_type = "Internal" # The type of virtual network you want to use, valid values include: None, External, Internal. Defaults to None.
     virtual_network_configuration = {
       vnet_key   = "vnet_example_uks"
       subnet_key = "snet_example_apim_uks"
-    # lz_key     = ""
+      # lz_key     = ""
     }
 
     identity = {
       type                  = "UserAssigned"
       managed_identity_keys = ["msi_apim_uks"]
     }
-    
+
     portal = {
       host_name = "example.apim.com"
     }

examples/compute/kubernetes_services/108-single-cluster-remote-adgroup-admin/aks.tfvars

@@ -39,7 +39,7 @@ aks_clusters = {
 
     addon_profile = {
       oms_agent = {
-        log_analytics_key = "central_logs_region1"
+        log_analytics_key               = "central_logs_region1"
         msi_auth_for_monitoring_enabled = true
       }
     }

examples/compute/virtual_machine/113-single-linux-custom-data-template/configuration.tfvars

@@ -63,23 +63,23 @@ virtual_machines = {
         disable_password_authentication = true
 
         custom_data = {
-          templatefile        = "compute/virtual_machine/113-single-linux-custom-data-template/custom_data.tpl"
-          my_value            = "my_value"
+          templatefile = "compute/virtual_machine/113-single-linux-custom-data-template/custom_data.tpl"
+          my_value     = "my_value"
         }
         dynamic_custom_data = {
           vnets = {
-            vnet_region1 ={}
+            vnet_region1 = {}
           }
           storage_accounts = {
             sa1 = {
-                file_share           = "share1"
-                file_share_directory = "dir1"
+              file_share           = "share1"
+              file_share_directory = "dir1"
             }
           }
           keyvault_keys = {
             key1 = {
               keyvault_key = "example_vm_rg1"
-              name = "disk-key"
+              name         = "disk-key"
             }
           }
         }

examples/databricks_access_connectors/100-databricks_access_connectors/configuration.tfvars

@@ -13,16 +13,16 @@ resource_groups = {
 
 databricks_access_connectors = {
   dac_1 = {
-      name = "example-name"
-      resource_group_key = "dac_test"
-      identity = {
-        type   = "UserAssigned" #SystemAssigned
-        managed_identity_keys = ["dac_test"]
+    name               = "example-name"
+    resource_group_key = "dac_test"
+    identity = {
+      type                  = "UserAssigned" #SystemAssigned
+      managed_identity_keys = ["dac_test"]
+    }
+    tags = {
+      test  = "test"
+      test1 = "test1"
     }
-     tags = {
-       test = "test"
-       test1 = "test1"
-     }
   }
 }
 

examples/maintenance_configuration/200-maintenance-configuration-assignment-vm-windows/configuration.tfvars

@@ -94,7 +94,7 @@ virtual_machines = {
         priority        = "Spot"
         eviction_policy = "Deallocate"
 
-        patch_mode                         = "AutomaticByPlatform"
+        patch_mode                                             = "AutomaticByPlatform"
         bypass_platform_safety_checks_on_user_schedule_enabled = true
         # When you want to load the file from the folder in the custom_data always use the relative path from the caf_solution in landing zones
         custom_data = "../../examples/compute/virtual_machine/101-single-windows-vm/scripts/custom.ps1"

examples/maintenance_configuration/201-maintenance-configuration-assignment-vm-linux/configuration.tfvars

@@ -6,7 +6,7 @@ global_settings = {
   }
 
   inherit_tags = true
-  
+
   resource_defaults = {
     virtual_machines = {
       # set the below to enable az managed boot diagostics for vms
@@ -70,17 +70,17 @@ virtual_machines = {
         # Spot VM to save money
         priority        = "Spot"
         eviction_policy = "Deallocate"
-        
-        patch_mode                         = "AutomaticByPlatform"
+
+        patch_mode                                             = "AutomaticByPlatform"
         bypass_platform_safety_checks_on_user_schedule_enabled = true
 
         # Value of the nic keys to attach the VM. The first one in the list is the default nic
         network_interface_keys = ["nic0"]
 
         os_disk = {
-          name                    = "example_vm1-os"
-          caching                 = "ReadWrite"
-          storage_account_type    = "Standard_LRS"
+          name                 = "example_vm1-os"
+          caching              = "ReadWrite"
+          storage_account_type = "Standard_LRS"
         }
         identity = {
           type = "SystemAssigned" #SystemAssigned OR UserAssigned OR SystemAssigned, UserAssigned
@@ -105,10 +105,10 @@ virtual_machines = {
         name                 = "server1-data1"
         storage_account_type = "Standard_LRS"
         # Only Empty is supported. More community contributions required to cover other scenarios
-        create_option           = "Empty"
-        disk_size_gb            = "10"
-        lun                     = 1
-        zones                   = ["1"]
+        create_option = "Empty"
+        disk_size_gb  = "10"
+        lun           = 1
+        zones         = ["1"]
       }
     }
   }

examples/mssql_mi/200-mi/configuration.tfvars

@@ -21,7 +21,7 @@ vnets = {
     resource_group_key = "networking_region1"
     vnet = {
       name          = "sqlmi-rg1"
-      address_space = ["172.25.88.0/21","10.2.0.0/24"]
+      address_space = ["172.25.88.0/21", "10.2.0.0/24"]
     }
     subnets = {
       sqlmi1 = {

examples/mssql_mi/200-mi/nsg.tfvars

@@ -84,6 +84,6 @@ network_security_group_definition = {
     ]
   }
   subnet02 = {
-    nsg= []
+    nsg = []
   }
 }

examples/recovery_vault/106-backupvault-with-sqldatabase-saphana/recovery_vaults.tfvars

@@ -10,11 +10,11 @@ recovery_vaults = {
     backup_policies = {
       vm_workloads = {
         sql = {
-          name      = "SQLTest"
-          workload_type = "SQLDataBase"
-          vault_key = "asr1"
-          rg_key    = "primary"
-          timezone  = "UTC"
+          name                = "SQLTest"
+          workload_type       = "SQLDataBase"
+          vault_key           = "asr1"
+          rg_key              = "primary"
+          timezone            = "UTC"
           compression_enabled = false
           protection_policies = {
             sqlfull = {
@@ -23,8 +23,8 @@ recovery_vaults = {
                 frequency = "Daily"
                 time      = "15:00"
               }
-              retention_daily  = {
-                count    = 8
+              retention_daily = {
+                count = 8
               }
             }
             sqllog = {
@@ -39,11 +39,11 @@ recovery_vaults = {
           }
         }
         saphana = {
-          name      = "SAPHANATest"
-          workload_type = "SAPHanaDatabase"
-          vault_key = "asr1"
-          rg_key    = "primary"
-          timezone  = "UTC"
+          name                = "SAPHANATest"
+          workload_type       = "SAPHanaDatabase"
+          vault_key           = "asr1"
+          rg_key              = "primary"
+          timezone            = "UTC"
           compression_enabled = false
           protection_policies = {
             saphanafull = {
@@ -52,8 +52,8 @@ recovery_vaults = {
                 frequency = "Daily"
                 time      = "15:00"
               }
-              retention_daily  = {
-                count    = 8
+              retention_daily = {
+                count = 8
               }
             }
             saphanalog = {
@@ -65,7 +65,7 @@ recovery_vaults = {
                 count = 8
               }
             }
-          }          
+          }
         }
       }
     }

examples/role_mapping/102-azure-openai-managed-identity/configuration.tfvars

@@ -16,16 +16,16 @@ cognitive_services_account = {
     resource_group = {
       key = "rg1"
     }
-    name    = "pinecone-llm-demoopenai"
-    kind    = "OpenAI"
-    sku_name = "S0"
+    name                  = "pinecone-llm-demoopenai"
+    kind                  = "OpenAI"
+    sku_name              = "S0"
     custom_subdomain_name = "cs-alz-caf-llm-demoopenai"
   }
 }
 
 managed_identities = {
   workload-msi = {
-    name = "example-msi-openai-rolemap-msi"
+    name               = "example-msi-openai-rolemap-msi"
     resource_group_key = "rg1"
   }
 }

examples/search_service/100-search-service-both-apikeys-and-azuread/configuration.tfvars

@@ -25,8 +25,8 @@ vnets = {
     }
     subnets = {
       default = {
-        name    = "default"
-        cidr    = ["10.5.1.0/24"]
+        name = "default"
+        cidr = ["10.5.1.0/24"]
       }
     }
   }

examples/search_service/102-search-service-only-azuread/configuration.tfvars

@@ -22,7 +22,7 @@ search_services = {
     identity = {
       type = "SystemAssigned"
     }
-    local_authentication_enabled  = false
+    local_authentication_enabled = false
     # public_network_access_enabled = true
     # allowed_ips                   = ["13.478.57.73"]
   }

examples/tests/mock/e2e_plan.tftest.hcl

@@ -3,7 +3,7 @@ mock_provider "azurerm" {
 }
 
 mock_provider "azurerm" {
-  alias = "vhub"
+  alias  = "vhub"
   source = "./tests/mock_data"
 }
 

examples/variables.tf

@@ -1130,7 +1130,7 @@ variable "maintenance_assignment_virtual_machine" {
   default = {}
 }
 variable "search_services" {
-  default     = {}
+  default = {}
 }
 variable "load_test" {
   default = {}

examples/webapps/appservice/103-appservice-extend/configuration.tfvars

@@ -52,19 +52,19 @@ app_services = {
 
         ip_restriction = [
           {
-            name        = "deny-all-traffic"
-            action      = "Deny"
-            ip_address  = "0.0.0.0/0"
-            priority    = 65000
+            name       = "deny-all-traffic"
+            action     = "Deny"
+            ip_address = "0.0.0.0/0"
+            priority   = 65000
           }
         ]
 
         scm_ip_restriction = [
           {
-            name        = "allow-all-traffic"
-            action      = "Allow"
-            ip_address  = "0.0.0.0/0"
-            priority    = 65000
+            name       = "allow-all-traffic"
+            action     = "Allow"
+            ip_address = "0.0.0.0/0"
+            priority   = 65000
           }
         ]
       }

modules/analytics/databricks_access_connector/main.tf

@@ -5,8 +5,8 @@ locals {
     try(var.settings.tags, null)
   ) : try(var.settings.tags, null)
 
-  
-  resource_group  = var.resource_groups[try(var.settings.lz_key, var.settings.resource_group.lz_key, var.client_config.landingzone_key)][try(var.settings.resource_group.key, var.settings.resource_group_key)]
+
+  resource_group = var.resource_groups[try(var.settings.lz_key, var.settings.resource_group.lz_key, var.client_config.landingzone_key)][try(var.settings.resource_group.key, var.settings.resource_group_key)]
 }
 
 terraform {

modules/analytics/databricks_access_connector/module.tf

@@ -11,5 +11,5 @@ resource "azurerm_databricks_access_connector" "databricks_access_connector" {
       identity_ids = concat(local.managed_identities, try(identity.value.identity_ids, []))
     }
   }
-  
+
 }