From 834862d4ce24db7d0514d2787fb9646c423d7995 Mon Sep 17 00:00:00 2001 From: Reidar Johansen Date: Tue, 15 Aug 2023 19:34:01 +0000 Subject: [PATCH] Changes after terraform fmt --- solution/landingzone.tf | 22 +++++++++++----------- solution/local.devcenter.tf | 2 +- solution/local.github.tf | 6 +++--- solution/local.logic_app.tf | 2 +- solution/local.messaging.tf | 8 ++++---- solution/local.networking.tf | 2 +- solution/local.shared_services.tf | 4 ++-- solution/local.webapp.tf | 14 +++++++------- solution/main.tf | 4 ++-- solution/variables.devcenter.tf | 2 +- solution/variables.github.tf | 24 ++++++++++++------------ solution/variables.tf | 2 +- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/solution/landingzone.tf b/solution/landingzone.tf index 0a6ec28..8705d0c 100644 --- a/solution/landingzone.tf +++ b/solution/landingzone.tf @@ -6,17 +6,17 @@ module "solution" { azurerm.vhub = azurerm.vhub } - github = local.github - azuread = local.azuread - cloud = local.cloud - compute = local.compute - apim = local.apim - cognitive_services = local.cognitive_services - current_landingzone_key = try(var.landingzone.key, var.landingzone[var.backend_type].key) - custom_role_definitions = var.custom_role_definitions - data_factory = local.data_factory - database = local.database - data_protection = local.data_protection + github = local.github + azuread = local.azuread + cloud = local.cloud + compute = local.compute + apim = local.apim + cognitive_services = local.cognitive_services + current_landingzone_key = try(var.landingzone.key, var.landingzone[var.backend_type].key) + custom_role_definitions = var.custom_role_definitions + data_factory = local.data_factory + database = local.database + data_protection = local.data_protection # devcenter = local.devcenter diagnostic_storage_accounts = var.diagnostic_storage_accounts diagnostics_definition = var.diagnostics_definition diff --git a/solution/local.devcenter.tf b/solution/local.devcenter.tf index 2bd09e1..1e06043 100644 --- a/solution/local.devcenter.tf +++ b/solution/local.devcenter.tf @@ -2,7 +2,7 @@ locals { devcenter = merge( var.devcenter, { - network_connections = var.network_connections + network_connections = var.network_connections } ) } \ No newline at end of file diff --git a/solution/local.github.tf b/solution/local.github.tf index de42530..7eceae7 100644 --- a/solution/local.github.tf +++ b/solution/local.github.tf @@ -2,9 +2,9 @@ locals { github = merge( var.github, { - github_membership = var.github_membership - github_teams = var.github_teams - github_repositories = var.github_repositories + github_membership = var.github_membership + github_teams = var.github_teams + github_repositories = var.github_repositories } ) } diff --git a/solution/local.logic_app.tf b/solution/local.logic_app.tf index 4cbbd19..d661a12 100644 --- a/solution/local.logic_app.tf +++ b/solution/local.logic_app.tf @@ -4,7 +4,7 @@ locals { { # logic_app_integration_account_certificate = var.logic_app_integration_account_certificate # logic_app_integration_account_session = var.logic_app_integration_account_session - logic_app_standard = var.logic_app_standard + logic_app_standard = var.logic_app_standard integration_service_environment = var.integration_service_environment logic_app_action_custom = var.logic_app_action_custom logic_app_action_http = var.logic_app_action_http diff --git a/solution/local.messaging.tf b/solution/local.messaging.tf index 3bf11ac..483a6ff 100644 --- a/solution/local.messaging.tf +++ b/solution/local.messaging.tf @@ -2,10 +2,10 @@ locals { messaging = merge( var.messaging, { - signalr_services = var.signalr_services - servicebus_namespaces = var.servicebus_namespaces - servicebus_topics = var.servicebus_topics - servicebus_queues = var.servicebus_queues + signalr_services = var.signalr_services + servicebus_namespaces = var.servicebus_namespaces + servicebus_topics = var.servicebus_topics + servicebus_queues = var.servicebus_queues eventgrid_domain = var.eventgrid_domain eventgrid_topic = var.eventgrid_topic eventgrid_event_subscription = var.eventgrid_event_subscription diff --git a/solution/local.networking.tf b/solution/local.networking.tf index f702421..54a0840 100644 --- a/solution/local.networking.tf +++ b/solution/local.networking.tf @@ -17,7 +17,7 @@ locals { azurerm_routes = var.azurerm_routes cdn_endpoints = var.cdn_endpoints # Check for cdn_endpoint cdn_profiles = var.cdn_profiles # Check for cdn_profile - ddos_services = var.ddos_services + ddos_services = var.ddos_services dns_zone_records = var.dns_zone_records dns_zones = var.dns_zones domain_name_registrations = var.domain_name_registrations diff --git a/solution/local.shared_services.tf b/solution/local.shared_services.tf index eee0172..d55cfac 100644 --- a/solution/local.shared_services.tf +++ b/solution/local.shared_services.tf @@ -12,8 +12,8 @@ locals { log_analytics_storage_insights = var.log_analytics_storage_insights monitor_action_groups = var.monitor_action_groups monitor_autoscale_settings = var.monitor_autoscale_settings - monitor_metric_alert = var.monitor_metric_alert - monitor_activity_log_alert = var.monitor_activity_log_alert + monitor_metric_alert = var.monitor_metric_alert + monitor_activity_log_alert = var.monitor_activity_log_alert monitoring = var.monitoring packer_build = var.packer_build packer_managed_identity = var.packer_managed_identity diff --git a/solution/local.webapp.tf b/solution/local.webapp.tf index c155342..1d6e5e0 100644 --- a/solution/local.webapp.tf +++ b/solution/local.webapp.tf @@ -5,13 +5,13 @@ locals { azurerm_application_insights = var.azurerm_application_insights azurerm_application_insights_web_test = var.azurerm_application_insights_web_test azurerm_application_insights_standard_web_test = var.azurerm_application_insights_standard_web_test - app_service_environments = var.app_service_environments - app_service_environments_v3 = var.app_service_environments_v3 - app_service_plans = var.app_service_plans - app_services = var.app_services - azurerm_application_insights = var.azurerm_application_insights - function_apps = var.function_apps - static_sites = var.static_sites + app_service_environments = var.app_service_environments + app_service_environments_v3 = var.app_service_environments_v3 + app_service_plans = var.app_service_plans + app_services = var.app_services + azurerm_application_insights = var.azurerm_application_insights + function_apps = var.function_apps + static_sites = var.static_sites } ) } diff --git a/solution/main.tf b/solution/main.tf index 9670666..bd16f7b 100644 --- a/solution/main.tf +++ b/solution/main.tf @@ -32,11 +32,11 @@ provider "github" { } provider "azuread" { - partner_id = "d40f4895-5a21-5612-aa15-69cd25571694" + partner_id = "d40f4895-5a21-5612-aa15-69cd25571694" } provider "azurerm" { - partner_id = "d40f4895-5a21-5612-aa15-69cd25571694" + partner_id = "d40f4895-5a21-5612-aa15-69cd25571694" # partner identifier for CAF Terraform landing zones. features { api_management { diff --git a/solution/variables.devcenter.tf b/solution/variables.devcenter.tf index 45e139c..d9d6b18 100644 --- a/solution/variables.devcenter.tf +++ b/solution/variables.devcenter.tf @@ -6,5 +6,5 @@ variable "devcenter" { } variable "network_connections" { - default = {} + default = {} } \ No newline at end of file diff --git a/solution/variables.github.tf b/solution/variables.github.tf index 5170256..25b2e4e 100644 --- a/solution/variables.github.tf +++ b/solution/variables.github.tf @@ -21,11 +21,11 @@ variable "github_membership" { variable "github_teams" { type = map(object({ - name = string - description = optional(string) - privacy = optional(string) - parent_team_key = optional(string) - ldap_dn = optional(string) + name = string + description = optional(string) + privacy = optional(string) + parent_team_key = optional(string) + ldap_dn = optional(string) create_default_maintainer = optional(bool) })) description = "A map of GitHub team names to their details." @@ -59,12 +59,12 @@ variable "github_repositories" { variable "github" { type = object({ - github_teams = optional(map(object({ - name = string - description = optional(string) - privacy = optional(string) - parent_team_key = optional(string) - ldap_dn = optional(string) + github_teams = optional(map(object({ + name = string + description = optional(string) + privacy = optional(string) + parent_team_key = optional(string) + ldap_dn = optional(string) create_default_maintainer = optional(bool) }))) github_repositories = optional(map(object({ @@ -85,7 +85,7 @@ variable "github" { archived = optional(bool) topics = optional(list(string)) }))) - github_membership = optional(map(object({ + github_membership = optional(map(object({ username = string role = string }))) diff --git a/solution/variables.tf b/solution/variables.tf index 7619615..ba1b2ff 100644 --- a/solution/variables.tf +++ b/solution/variables.tf @@ -193,7 +193,7 @@ variable "user_type" { variable "management_groups" { description = "Management Group configuration object" - default = {} + default = {} # type = map(object({ # name = string # displayName = string