Skip to content

Commit bfc7642

Browse files
jaredfholgatejaredfholgate
committed
linting
1 parent 7e70d9c commit bfc7642

File tree

9 files changed

+262
-256
lines changed

9 files changed

+262
-256
lines changed

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ This repository provides the starter modules for the Azure Landing Zones IaC Ter
1212

1313
Please head over to [aka.ms/alz/acc](https://aka.ms/alz/acc) for detailed features and usage instructions.
1414

15+
## Issues
16+
17+
Please raise an issue over here: [https://aka.ms/alz/acc/issues](https://aka.ms/alz/acc/issues)
18+
1519
## Contributing
1620

1721
This project welcomes contributions and suggestions. Most contributions require you to agree to a

‎SUPPORT.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Support
22

3-
## How to file issues and get help
3+
## How to file issues and get help
4+
5+
Please raise an issue over here: [https://aka.ms/alz/acc/issues](https://aka.ms/alz/acc/issues)
46

57
This project uses GitHub Issues to track bugs and feature requests. Please search the existing issues before filing new issues to avoid duplicates. For new issues, file your bug or feature request as a new Issue.
68

‎templates/platform_landing_zone/main.config.tf

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
module "config" {
2-
source = "./modules/config-templating"
3-
4-
enable_telemetry = var.enable_telemetry
5-
6-
starter_locations = var.starter_locations
7-
subscription_id_connectivity = var.subscription_id_connectivity
8-
subscription_id_identity = var.subscription_id_identity
9-
subscription_id_management = var.subscription_id_management
10-
root_parent_management_group_id = var.root_parent_management_group_id
11-
12-
custom_replacements = var.custom_replacements
13-
14-
connectivity_resource_groups = var.connectivity_resource_groups
15-
hub_and_spoke_vnet_settings = var.hub_and_spoke_vnet_settings
16-
hub_and_spoke_vnet_virtual_networks = var.hub_and_spoke_vnet_virtual_networks
17-
virtual_wan_settings = var.virtual_wan_settings
18-
virtual_wan_virtual_hubs = var.virtual_wan_virtual_hubs
19-
management_resource_settings = var.management_resource_settings
20-
management_group_settings = var.management_group_settings
21-
tags = var.tags
22-
}
1+
module "config" {
2+
source = "./modules/config-templating"
3+
4+
enable_telemetry = var.enable_telemetry
5+
6+
starter_locations = var.starter_locations
7+
subscription_id_connectivity = var.subscription_id_connectivity
8+
subscription_id_identity = var.subscription_id_identity
9+
subscription_id_management = var.subscription_id_management
10+
root_parent_management_group_id = var.root_parent_management_group_id
11+
12+
custom_replacements = var.custom_replacements
13+
14+
connectivity_resource_groups = var.connectivity_resource_groups
15+
hub_and_spoke_vnet_settings = var.hub_and_spoke_vnet_settings
16+
hub_and_spoke_vnet_virtual_networks = var.hub_and_spoke_vnet_virtual_networks
17+
virtual_wan_settings = var.virtual_wan_settings
18+
virtual_wan_virtual_hubs = var.virtual_wan_virtual_hubs
19+
management_resource_settings = var.management_resource_settings
20+
management_group_settings = var.management_group_settings
21+
tags = var.tags
22+
}

‎templates/platform_landing_zone/modules/config-templating/data.tf

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module "regions" {
2-
source = "Azure/avm-utl-regions/azurerm"
3-
version = "0.3.0"
4-
use_cached_data = false
5-
availability_zones_filter = false
6-
recommended_filter = false
7-
enable_telemetry = var.enable_telemetry
8-
}
9-
10-
data "azurerm_client_config" "current" {}
1+
module "regions" {
2+
source = "Azure/avm-utl-regions/azurerm"
3+
version = "0.3.0"
4+
use_cached_data = false
5+
availability_zones_filter = false
6+
recommended_filter = false
7+
enable_telemetry = var.enable_telemetry
8+
}
9+
10+
data "azurerm_client_config" "current" {}

‎templates/platform_landing_zone/modules/config-templating/locals.config.tf

+92-92
Large diffs are not rendered by default.

‎templates/platform_landing_zone/modules/config-templating/locals.tags.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
locals {
2-
tags_json = tostring(jsonencode(var.tags))
3-
tags_json_templated = templatestring(local.tags_json, local.final_replacements)
4-
tags_json_final = replace(replace(local.tags_json_templated, "\"[", "["), "]\"", "]")
5-
tags = jsondecode(local.tags_json_final)
6-
}
1+
locals {
2+
tags_json = tostring(jsonencode(var.tags))
3+
tags_json_templated = templatestring(local.tags_json, local.final_replacements)
4+
tags_json_final = replace(replace(local.tags_json_templated, "\"[", "["), "]\"", "]")
5+
tags = jsondecode(local.tags_json_final)
6+
}

‎templates/platform_landing_zone/modules/config-templating/outputs.tf

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
output "connectivity_resource_groups" {
2-
value = local.connectivity_resource_groups
3-
}
4-
5-
output "management_resource_settings" {
6-
value = local.management_resource_settings
7-
}
8-
9-
output "management_group_settings" {
10-
value = local.management_group_settings
11-
}
12-
13-
output "hub_and_spoke_vnet_settings" {
14-
value = local.hub_and_spoke_vnet_settings
15-
}
16-
17-
output "hub_and_spoke_vnet_virtual_networks" {
18-
value = local.hub_and_spoke_vnet_virtual_networks
19-
}
20-
21-
output "virtual_wan_settings" {
22-
value = local.virtual_wan_settings
23-
}
24-
25-
output "virtual_wan_virtual_hubs" {
26-
value = local.virtual_wan_virtual_hubs
27-
}
28-
29-
output "tags" {
30-
value = local.tags
31-
}
1+
output "connectivity_resource_groups" {
2+
value = local.connectivity_resource_groups
3+
}
4+
5+
output "management_resource_settings" {
6+
value = local.management_resource_settings
7+
}
8+
9+
output "management_group_settings" {
10+
value = local.management_group_settings
11+
}
12+
13+
output "hub_and_spoke_vnet_settings" {
14+
value = local.hub_and_spoke_vnet_settings
15+
}
16+
17+
output "hub_and_spoke_vnet_virtual_networks" {
18+
value = local.hub_and_spoke_vnet_virtual_networks
19+
}
20+
21+
output "virtual_wan_settings" {
22+
value = local.virtual_wan_settings
23+
}
24+
25+
output "virtual_wan_virtual_hubs" {
26+
value = local.virtual_wan_virtual_hubs
27+
}
28+
29+
output "tags" {
30+
value = local.tags
31+
}

‎templates/platform_landing_zone/modules/config-templating/terraform.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ terraform {
66
version = "~> 4.0"
77
}
88
}
9-
}
9+
}

‎templates/platform_landing_zone/modules/config-templating/variables.tf

+93-93
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
1-
variable "starter_locations" {
2-
type = list(string)
3-
description = "The default for Azure resources. (e.g 'uksouth')|azure_location"
4-
}
5-
6-
variable "subscription_id_connectivity" {
7-
type = string
8-
description = "value of the subscription id for the Connectivity subscription|azure_subscription_id"
9-
}
10-
11-
variable "subscription_id_identity" {
12-
type = string
13-
description = "value of the subscription id for the Identity subscription|azure_subscription_id"
14-
}
15-
16-
variable "subscription_id_management" {
17-
type = string
18-
description = "value of the subscription id for the Management subscription|azure_subscription_id"
19-
}
20-
21-
variable "root_parent_management_group_id" {
22-
type = string
23-
default = ""
24-
description = "This is the id of the management group that the ALZ hierarchy will be nested under, will default to the Tenant Root Group|azure_name"
25-
}
26-
27-
variable "enable_telemetry" {
28-
type = bool
29-
default = true
30-
description = "Flag to enable/disable telemetry"
31-
}
32-
33-
variable "custom_replacements" {
34-
type = object({
35-
names = optional(map(string), {})
36-
resource_group_identifiers = optional(map(string), {})
37-
resource_identifiers = optional(map(string), {})
38-
})
39-
description = "Custom replacements"
40-
}
41-
42-
variable "tags" {
43-
type = map(string)
44-
default = null
45-
description = "(Optional) Tags of the resource."
46-
}
47-
48-
variable "connectivity_resource_groups" {
49-
type = map(object({
50-
name = string
51-
location = string
52-
}))
53-
default = {}
54-
description = <<DESCRIPTION
55-
A map of resource groups to create. These must be created before the connectivity module is applied.
56-
57-
The following attributes are supported:
58-
59-
- name: The name of the resource group
60-
- location: The location of the resource group
61-
62-
DESCRIPTION
63-
}
64-
65-
variable "hub_and_spoke_vnet_settings" {
66-
type = any
67-
default = {}
68-
}
69-
70-
variable "hub_and_spoke_vnet_virtual_networks" {
71-
type = any
72-
default = {}
73-
}
74-
75-
variable "virtual_wan_settings" {
76-
type = any
77-
default = {}
78-
}
79-
80-
variable "virtual_wan_virtual_hubs" {
81-
type = any
82-
default = {}
83-
}
84-
85-
variable "management_resource_settings" {
86-
type = any
87-
default = {}
88-
}
89-
90-
variable "management_group_settings" {
91-
type = any
92-
default = {}
93-
}
1+
variable "starter_locations" {
2+
type = list(string)
3+
description = "The default for Azure resources. (e.g 'uksouth')|azure_location"
4+
}
5+
6+
variable "subscription_id_connectivity" {
7+
type = string
8+
description = "value of the subscription id for the Connectivity subscription|azure_subscription_id"
9+
}
10+
11+
variable "subscription_id_identity" {
12+
type = string
13+
description = "value of the subscription id for the Identity subscription|azure_subscription_id"
14+
}
15+
16+
variable "subscription_id_management" {
17+
type = string
18+
description = "value of the subscription id for the Management subscription|azure_subscription_id"
19+
}
20+
21+
variable "root_parent_management_group_id" {
22+
type = string
23+
default = ""
24+
description = "This is the id of the management group that the ALZ hierarchy will be nested under, will default to the Tenant Root Group|azure_name"
25+
}
26+
27+
variable "enable_telemetry" {
28+
type = bool
29+
default = true
30+
description = "Flag to enable/disable telemetry"
31+
}
32+
33+
variable "custom_replacements" {
34+
type = object({
35+
names = optional(map(string), {})
36+
resource_group_identifiers = optional(map(string), {})
37+
resource_identifiers = optional(map(string), {})
38+
})
39+
description = "Custom replacements"
40+
}
41+
42+
variable "tags" {
43+
type = map(string)
44+
default = null
45+
description = "(Optional) Tags of the resource."
46+
}
47+
48+
variable "connectivity_resource_groups" {
49+
type = map(object({
50+
name = string
51+
location = string
52+
}))
53+
default = {}
54+
description = <<DESCRIPTION
55+
A map of resource groups to create. These must be created before the connectivity module is applied.
56+
57+
The following attributes are supported:
58+
59+
- name: The name of the resource group
60+
- location: The location of the resource group
61+
62+
DESCRIPTION
63+
}
64+
65+
variable "hub_and_spoke_vnet_settings" {
66+
type = any
67+
default = {}
68+
}
69+
70+
variable "hub_and_spoke_vnet_virtual_networks" {
71+
type = any
72+
default = {}
73+
}
74+
75+
variable "virtual_wan_settings" {
76+
type = any
77+
default = {}
78+
}
79+
80+
variable "virtual_wan_virtual_hubs" {
81+
type = any
82+
default = {}
83+
}
84+
85+
variable "management_resource_settings" {
86+
type = any
87+
default = {}
88+
}
89+
90+
variable "management_group_settings" {
91+
type = any
92+
default = {}
93+
}

0 commit comments

Comments
 (0)