Skip to content

Commit 4a466c9

Browse files
mrlockstarmrlockstar
committed
wip
1 parent fb1b0bc commit 4a466c9

6 files changed

Lines changed: 21 additions & 104 deletions

File tree

‎.azuredevops/pipelines/hub-infrastructure-dev.yaml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,20 @@ stages:
3636
- job: init_and_plan
3737
displayName: Init, plan, store artifact
3838
steps:
39-
4039
- checkout: self
4140
- checkout: dtos-devops-templates
42-
43-
- task: Bash@3
44-
displayName: 'Debug Terraform directory'
45-
inputs:
46-
targetType: 'inline'
47-
script: |
48-
pwd
49-
ls -la
50-
echo "TF_DIRECTORY=$(TF_DIRECTORY)"
51-
cd $(TF_DIRECTORY)
52-
ls -ltr
53-
find .
54-
terraform --version || true
41+
# - task: Bash@3
42+
# displayName: 'Debug Terraform directory'
43+
# inputs:
44+
# targetType: 'inline'
45+
# script: |
46+
# pwd
47+
# ls -la
48+
# echo "TF_DIRECTORY=$(TF_DIRECTORY)"
49+
# cd $(TF_DIRECTORY)
50+
# ls -ltr
51+
# find .
52+
# terraform --version || true
5553
- template: .azuredevops/templates/steps/tf_plan.yaml@dtos-devops-templates
5654

5755
- stage: terraform_apply

‎infrastructure/terraform/hub/dns_private.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ resource "azurerm_resource_group" "private_dns_rg" {
1212
module "private_dns_resolver" {
1313
for_each = var.regions
1414

15-
source = "../../dtos-devops-templates/infrastructure/modules/private-dns-zone-resolver"
15+
source = "../../../../dtos-devops-templates/infrastructure/modules/private-dns-zone-resolver"
1616

1717
name = "${module.config[each.key].names.resource-application}-private-dns-zone-resolver"
1818
resource_group_name = azurerm_resource_group.private_dns_rg[each.key].name
@@ -69,7 +69,7 @@ locals {
6969
module "private_dns_zones" {
7070
for_each = local.private_dns_zones_map
7171

72-
source = "../../dtos-devops-templates/infrastructure/modules/private-dns-zone"
72+
source = "../../../../dtos-devops-templates/infrastructure/modules/private-dns-zone"
7373

7474
name = each.value.name
7575
resource_group_name = azurerm_resource_group.private_dns_rg[each.value.region].name
@@ -110,7 +110,7 @@ locals {
110110
module "private-dns-a-records" {
111111
for_each = local.private_dns_a_records_map
112112

113-
source = "../../dtos-devops-templates/infrastructure/modules/private-dns-a-record"
113+
source = "../../../../dtos-devops-templates/infrastructure/modules/private-dns-a-record"
114114

115115
name = each.value.name
116116
resource_group_name = resource.azurerm_resource_group.private_dns_rg[each.value.region].name

‎infrastructure/terraform/hub/dns_public.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module "appgw-dns-a-records" {
1313
# No region loop since public DNS is global. Traffic Manager will be required if an additional region is added.
1414
for_each = toset(local.appgw_public_listener_hostnames)
1515

16-
source = "../../../dtos-devops-templates/infrastructure/modules/dns-a-record"
16+
source = "../../../../dtos-devops-templates/infrastructure/modules/dns-a-record"
1717

1818
name = split(".", each.key)[0]
1919
resource_group_name = var.dns_zone_rg_name_public

‎infrastructure/terraform/hub/firewall.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module "firewall" {
22
for_each = var.regions
33

4-
source = "./../../dtos-devops-templates/infrastructure/modules/firewall"
4+
source = "../../../../dtos-devops-templates/infrastructure/modules/firewall"
55

66
firewall_name = module.config[each.key].names.firewall
77
resource_group_name = azurerm_resource_group.rg_hub[each.key].name
@@ -33,7 +33,7 @@ module "firewall" {
3333
module "public_ip" {
3434
for_each = local.public_ips_map
3535

36-
source = "../../dtos-devops-templates/infrastructure/modules/public-ip"
36+
source = "../../../../dtos-devops-templates/infrastructure/modules/public-ip"
3737

3838
name = "${module.config[each.value.region_key].names.public-ip-address}-${each.value.name_suffix}"
3939
resource_group_name = azurerm_resource_group.rg_hub[each.value.region_key].name

‎infrastructure/terraform/hub/variables.tf‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ variable "GITHUB_ORG_DATABASE_ID" {
1515
default = "DEV"
1616
}
1717

18-
variable "LETS_ENCRYPT_CONTACT_EMAIL" {
19-
description = "Contact email address for certificate expiry notifications."
20-
type = string
21-
}
22-
2318
variable "TARGET_SUBSCRIPTION_ID" {
2419
description = "ID of a subscription to deploy infrastructure"
2520
type = string
@@ -31,20 +26,6 @@ variable "WAF_POLICY_ID_APIM_GATEWAY" {
3126
type = string
3227
}
3328

34-
variable "acme_certificates" {
35-
# https://registry.terraform.io/providers/vancluever/acme/latest/docs/resources/certificate
36-
type = map(object({
37-
common_name = string
38-
subject_alternative_names = optional(list(string))
39-
dns_cname_zone_name = optional(string) # CNAME for redirecting DNS-01 challenges
40-
dns_private_cname_zone_name = optional(string) # CNAME for redirecting DNS-01 challenges
41-
dns_challenge_zone_name = string
42-
dns_challenge_zone_rg_name = optional(string)
43-
key_type = optional(string, "P256") # Follow certbot default of ECDSA P256
44-
}))
45-
description = "Map of ACME certificates to be requested"
46-
}
47-
4829
variable "apim_config" {
4930
description = "Configuration for API Management"
5031
type = object({
@@ -217,52 +198,6 @@ variable "env_type" {
217198
type = string
218199
}
219200

220-
variable "event_grid_configs" {
221-
type = map(any) # needs to be a loose type definition to allow merging of var.event_grid_configs
222-
default = {}
223-
}
224-
225-
variable "event_grid_defaults" {
226-
description = "Default configuration for the Event Grid resource"
227-
type = object({
228-
identity_ids = list(string)
229-
identity_type = string
230-
inbound_ip_rules = list(object({
231-
ip_mask = string
232-
action = string
233-
}))
234-
input_schema = map(string)
235-
local_auth_enabled = bool
236-
public_network_access_enabled = bool
237-
})
238-
}
239-
240-
variable "eventhub_namespaces" {
241-
description = "A map of Event Hub Namespaces and contained Event Hubs."
242-
type = map(object({
243-
auto_inflate = optional(bool, false)
244-
capacity = optional(number)
245-
sku = optional(string, "Standard")
246-
minimum_tls_version = optional(string)
247-
maximum_throughput_units = optional(number)
248-
249-
public_network_access_enabled = optional(bool, false)
250-
251-
auth_rule = object({
252-
listen = optional(bool, true)
253-
send = optional(bool, false)
254-
manage = optional(bool, false)
255-
})
256-
257-
event_hubs = optional(map(object({
258-
name = optional(string)
259-
consumer_group = optional(string)
260-
partition_count = optional(number, 2)
261-
message_retention = optional(number, 1)
262-
})))
263-
}))
264-
default = {}
265-
}
266201

267202
variable "features" {
268203
description = "Feature flags for the deployment"
@@ -370,22 +305,6 @@ variable "projects" {
370305
}))
371306
}
372307

373-
variable "regions" {
374-
type = map(object({
375-
address_space = string
376-
is_primary_region = bool
377-
subnets = map(object({
378-
cidr_newbits = string
379-
cidr_offset = string
380-
create_nsg = optional(bool) # defaults to true
381-
name = optional(string) # Optional name override
382-
delegation_name = optional(string)
383-
service_delegation_name = optional(string)
384-
service_delegation_actions = optional(list(string))
385-
}))
386-
}))
387-
}
388-
389308
variable "storage_accounts" {
390309
description = "Configuration for the Storage Account, currently used for Function Apps"
391310
type = map(object({

‎infrastructure/terraform/hub/virtual_desktop.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ resource "azurerm_resource_group" "avd" {
3131
module "virtual-desktop" {
3232
for_each = (local.deploy_blue_avd ? var.regions : {})
3333

34-
source = "./../../dtos-devops-templates/infrastructure/modules/virtual-desktop"
34+
source = "../../../../dtos-devops-templates/infrastructure/modules/virtual-desktop"
3535

3636
custom_rdp_properties = "drivestoredirect:s:*;audiomode:i:0;videoplaybackmode:i:1;redirectclipboard:i:1;redirectprinters:i:1;devicestoredirect:s:*;redirectcomports:i:1;redirectsmartcards:i:1;usbdevicestoredirect:s:*;enablecredsspsupport:i:1;redirectwebauthn:i:1;use multimon:i:1;enablerdsaadauth:i:1;"
3737
computer_name_prefix = "avd${var.env_type}"
@@ -80,7 +80,7 @@ resource "azurerm_resource_group" "avd-v2" {
8080
module "virtual-desktop-v2" {
8181
for_each = (local.deploy_green_avd ? var.regions : {})
8282

83-
source = "../../dtos-devops-templates/infrastructure/modules/virtual-desktop"
83+
source = "../../../../dtos-devops-templates/infrastructure/modules/virtual-desktop"
8484

8585
custom_rdp_properties = "drivestoredirect:s:*;audiomode:i:0;videoplaybackmode:i:1;redirectclipboard:i:1;redirectprinters:i:1;devicestoredirect:s:*;redirectcomports:i:1;redirectsmartcards:i:1;usbdevicestoredirect:s:*;enablecredsspsupport:i:1;redirectwebauthn:i:1;use multimon:i:1;enablerdsaadauth:i:1;"
8686
computer_name_prefix = "av4${var.env_type}"
@@ -120,7 +120,7 @@ module "virtual-desktop-v2" {
120120
module "route-table-virtual-desktop" {
121121
for_each = var.regions
122122

123-
source = "../../dtos-devops-templates/infrastructure/modules/route-table"
123+
source = "../../../../dtos-devops-templates/infrastructure/modules/route-table"
124124

125125
name = "${module.config[each.key].names.route-table}-virtual-desktop"
126126
resource_group_name = azurerm_resource_group.rg_hub[each.key].name

0 commit comments

Comments
 (0)