From a9a075b8b40bd9b81427f76cfa65b2f0bf4c3dc2 Mon Sep 17 00:00:00 2001 From: Jared Holgate Date: Tue, 7 Nov 2023 20:08:39 +0000 Subject: [PATCH] Fix linting issues --- templates/complete/config.yaml | 7 +++--- templates/complete_modular/config.yaml | 12 +++++----- templates/complete_modular/locals.tf | 22 +++++++++---------- .../complete_modular/management_groups.tf | 12 +++++----- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/templates/complete/config.yaml b/templates/complete/config.yaml index e6ad107a..9b76bbfb 100644 --- a/templates/complete/config.yaml +++ b/templates/complete/config.yaml @@ -1,4 +1,5 @@ -archetypes: # `caf-enterprise-scale` module, add inputs as listed on the module registry where necessary. +--- +archetypes: # `caf-enterprise-scale` module, add inputs as listed on the module registry where necessary. root_name: es root_id: Enterprise-Scale deploy_corp_landing_zones: true @@ -24,7 +25,7 @@ archetypes: # `caf-enterprise-scale` module, add inputs as listed on the module management: name: aa-management connectivity: - hubnetworking: # `hubnetworking` module, add inputs as listed on the module registry where necessary. + hubnetworking: # `hubnetworking` module, add inputs as listed on the module registry where necessary. hub_virtual_networks: primary: name: vnet-hub @@ -37,7 +38,7 @@ connectivity: sku_name: AZFW_VNet sku_tier: Standard subnet_address_prefix: 10.0.1.0/24 - virtual_network_gateway: # `vnet-gateway` module, add inputs as listed on the module registry where necessary. + virtual_network_gateway: # `vnet-gateway` module, add inputs as listed on the module registry where necessary. name: vgw-hub sku: VpnGw1 type: Vpn diff --git a/templates/complete_modular/config.yaml b/templates/complete_modular/config.yaml index 4fe3f96e..3d1294e8 100644 --- a/templates/complete_modular/config.yaml +++ b/templates/complete_modular/config.yaml @@ -6,7 +6,7 @@ # `subscription_id_identity`: The subscription ID of the subscription to deploy the identity resources to, sourced from the variable `subscription_id_identity`. # `subscription_id_connectivity`: The subscription ID of the subscription to deploy the connectivity resources to, sourced from the variable `subscription_id_connectivity`. # `subscription_id_management`: The subscription ID of the subscription to deploy the management resources to, sourced from the variable `subscription_id_management`. - +--- management: automation_account_name: aa-${default_postfix} location: uksouth @@ -35,21 +35,21 @@ management_groups: parent_id: platform-${default_postfix} base_archetype: identity subscriptions: - - ${subscription_id_identity} + - ${subscription_id_identity} connectivity: id: connectivity-${default_postfix} display_name: connectivity parent_id: platform-${default_postfix} base_archetype: connectivity subscriptions: - - ${subscription_id_connectivity} + - ${subscription_id_connectivity} management: id: management-${default_postfix} display_name: management parent_id: landing-zones-${default_postfix} base_archetype: management subscriptions: - - ${subscription_id_management} + - ${subscription_id_management} corp: id: corp-${default_postfix} display_name: corp @@ -67,7 +67,7 @@ management_groups: base_archetype: sandboxes connectivity: - hub_networking: # `hubnetworking` module, add inputs as listed on the module registry where necessary. + hub_networking: # `hubnetworking` module, add inputs as listed on the module registry where necessary. hub_virtual_networks: primary: name: vnet-hub-${default_postfix} @@ -80,7 +80,7 @@ connectivity: sku_name: AZFW_VNet sku_tier: Standard subnet_address_prefix: 10.0.1.0/24 - virtual_network_gateway: # `vnet-gateway` module, add inputs as listed on the module registry where necessary. + virtual_network_gateway: # `vnet-gateway` module, add inputs as listed on the module registry where necessary. name: vgw-hub-${default_postfix} sku: VpnGw1 type: Vpn diff --git a/templates/complete_modular/locals.tf b/templates/complete_modular/locals.tf index 28ad23c7..cb000308 100644 --- a/templates/complete_modular/locals.tf +++ b/templates/complete_modular/locals.tf @@ -45,14 +45,14 @@ locals { } } - output "test" { - value = { - management_groups_layer_1 = local.management_groups_layer_1 - management_groups_layer_2 = local.management_groups_layer_2 - management_groups_layer_3 = local.management_groups_layer_3 - management_groups_layer_4 = local.management_groups_layer_4 - management_groups_layer_5 = local.management_groups_layer_5 - management_groups_layer_6 = local.management_groups_layer_6 - management_groups_layer_7 = local.management_groups_layer_7 - } - } \ No newline at end of file +output "test" { + value = { + management_groups_layer_1 = local.management_groups_layer_1 + management_groups_layer_2 = local.management_groups_layer_2 + management_groups_layer_3 = local.management_groups_layer_3 + management_groups_layer_4 = local.management_groups_layer_4 + management_groups_layer_5 = local.management_groups_layer_5 + management_groups_layer_6 = local.management_groups_layer_6 + management_groups_layer_7 = local.management_groups_layer_7 + } +} diff --git a/templates/complete_modular/management_groups.tf b/templates/complete_modular/management_groups.tf index 8219888c..72487099 100644 --- a/templates/complete_modular/management_groups.tf +++ b/templates/complete_modular/management_groups.tf @@ -22,7 +22,7 @@ module "management_groups_layer_2" { default_location = var.default_location default_log_analytics_workspace_id = module.management_resources.log_analytics_workspace.id subscription_ids = try(each.value.subscription_ids, []) - depends_on = [module.management_groups_layer_1] + depends_on = [module.management_groups_layer_1] } module "management_groups_layer_3" { @@ -36,7 +36,7 @@ module "management_groups_layer_3" { default_location = var.default_location default_log_analytics_workspace_id = module.management_resources.log_analytics_workspace.id subscription_ids = try(each.value.subscription_ids, []) - depends_on = [module.management_groups_layer_2] + depends_on = [module.management_groups_layer_2] } module "management_groups_layer_4" { @@ -50,7 +50,7 @@ module "management_groups_layer_4" { default_location = var.default_location default_log_analytics_workspace_id = module.management_resources.log_analytics_workspace.id subscription_ids = try(each.value.subscription_ids, []) - depends_on = [module.management_groups_layer_3] + depends_on = [module.management_groups_layer_3] } module "management_groups_layer_5" { @@ -64,7 +64,7 @@ module "management_groups_layer_5" { default_location = var.default_location default_log_analytics_workspace_id = module.management_resources.log_analytics_workspace.id subscription_ids = try(each.value.subscription_ids, []) - depends_on = [module.management_groups_layer_4] + depends_on = [module.management_groups_layer_4] } module "management_groups_layer_6" { @@ -78,7 +78,7 @@ module "management_groups_layer_6" { default_location = var.default_location default_log_analytics_workspace_id = module.management_resources.log_analytics_workspace.id subscription_ids = try(each.value.subscription_ids, []) - depends_on = [module.management_groups_layer_5] + depends_on = [module.management_groups_layer_5] } module "management_groups_layer_7" { @@ -92,5 +92,5 @@ module "management_groups_layer_7" { default_location = var.default_location default_log_analytics_workspace_id = module.management_resources.log_analytics_workspace.id subscription_ids = try(each.value.subscription_ids, []) - depends_on = [module.management_groups_layer_6] + depends_on = [module.management_groups_layer_6] }