Skip to content

Commit

Permalink
Fix linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredfholgate committed Nov 7, 2023
1 parent accf2e3 commit c6324a2
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 26 deletions.
7 changes: 4 additions & 3 deletions templates/complete/config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions templates/complete_modular/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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}
Expand All @@ -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
Expand Down
22 changes: 11 additions & 11 deletions templates/complete_modular/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
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
}
}
12 changes: 6 additions & 6 deletions templates/complete_modular/management_groups.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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" {
Expand All @@ -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" {
Expand All @@ -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" {
Expand All @@ -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" {
Expand All @@ -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]
}

0 comments on commit c6324a2

Please sign in to comment.