Skip to content

Commit db17ca8

Browse files
committed
terraform stuff
1 parent 3ab1280 commit db17ca8

4 files changed

Lines changed: 58 additions & 19 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
data "azurerm_client_config" "current" {}
2+
3+
data "azuread_group" "avd_users" {
4+
display_name = var.avd_users_group_name
5+
}
6+
7+
data "azuread_group" "avd_admins" {
8+
display_name = var.avd_admins_group_name
9+
}
10+
11+
data "azuread_group" "avd_platform_users" {
12+
display_name = "DToS-platform-team-Dev"
13+
}
14+
15+
# This client id is the same for all Azure customers - it is not a secret.
16+
# https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/app_service_certificate
17+
data "azuread_service_principal" "MicrosoftAzureAppService" {
18+
client_id = "abfa0a7c-a6b6-4736-8310-5855508787cd"
19+
}
20+
21+
data "azuread_service_principal" "MicrosoftAzureFrontDoorCdn" {
22+
client_id = "205478c0-bd83-4e1b-a9d6-db63a3e1e1c8"
23+
}
24+
25+
# data "azurerm_key_vault_secret" "object-id" {
26+
# for_each = var.regions
27+
# name = "dtos-apim-object-id"
28+
# key_vault_id = module.key_vault[each.key].key_vault_id
29+
30+
# depends_on = [azurerm_key_vault_access_policy.terraform-mi]
31+
# }
32+
33+
# data "azurerm_key_vault_secret" "secret" {
34+
# for_each = var.regions
35+
# name = "dtos-apim-secret"
36+
# key_vault_id = module.key_vault[each.key].key_vault_id
37+
38+
# depends_on = [azurerm_key_vault_access_policy.terraform-mi]
39+
# }

infrastructure/terraform/hub/dns_private.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ locals {
7272
private_dns_zones_map = { for obj in local.private_dns_zones_obj_list : "${obj.region}-${obj.description}" => obj }
7373
}
7474

75-
# module "private_dns_zones" {
76-
# for_each = local.private_dns_zones_map
75+
module "private_dns_zones" {
76+
for_each = local.private_dns_zones_map
7777

78-
# source = "../../../../dtos-devops-templates/infrastructure/modules/private-dns-zone"
78+
source = "../../../../dtos-devops-templates/infrastructure/modules/private-dns-zone"
7979

80-
# name = each.value.name
81-
# resource_group_name = azurerm_resource_group.private_dns_rg[each.value.region].name
82-
# vnet_id = module.vnets_hub[each.value.region].vnet.id
80+
name = each.value.name
81+
resource_group_name = azurerm_resource_group.private_dns_rg[each.value.region].name
82+
vnet_id = data.azurerm_virtual_network.hub[0].id
8383

84-
# tags = var.tags
85-
# }
84+
tags = var.tags
85+
}
8686

8787
/*--------------------------------------------------------------------------------------------------
8888
Private DNS A Records for APIM and Application Gateway

infrastructure/terraform/hub/frontdoor.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module "frontdoor_profile" {
1515
metric_enabled = var.diagnostic_settings.metric_enabled
1616

1717
# Front Door Profile is a global resource, hence the use of primary_region Key Vault
18-
certificate_secrets = { for k in each.value.frontdoor_profile.secrets : k => module.acme_certificate[k].key_vault_certificate[local.primary_region].versionless_id }
18+
# certificate_secrets = { for k in each.value.frontdoor_profile.secrets : k => module.acme_certificate[k].key_vault_certificate[local.primary_region].versionless_id }
1919
name = "${module.config[local.primary_region].names.front-door-profile}-${each.value.short_name}"
2020
resource_group_name = azurerm_resource_group.rg_project["${each.key}-${local.primary_region}"].name
2121
sku_name = each.value.frontdoor_profile.sku_name

infrastructure/terraform/hub/log_analytics_workspace.tf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ module "log_analytics_workspace_hub" {
1717
}
1818

1919
# Add a data export rule to forward logs to the Event Hub in the Hub subscription
20-
module "log_analytics_data_export_rule" {
21-
for_each = var.features.log_analytics_data_export_rule_enabled ? var.regions : {}
20+
# module "log_analytics_data_export_rule" {
21+
# for_each = var.features.log_analytics_data_export_rule_enabled ? var.regions : {}
2222

23-
source = "../../../../dtos-devops-templates/infrastructure/modules/log-analytics-data-export-rule"
23+
# source = "../../../../dtos-devops-templates/infrastructure/modules/log-analytics-data-export-rule"
2424

25-
name = "${module.config[each.key].names.log-analytics-workspace}-export-rule"
26-
resource_group_name = azurerm_resource_group.rg_base[each.key].name
27-
workspace_resource_id = module.log_analytics_workspace_hub[each.key].id
28-
destination_resource_id = module.eventhub_law_export["dtos-hub-${each.key}"].event_hubs["dtos-hub"].id
29-
table_names = var.law.export_table_names
30-
enabled = var.law.export_enabled
31-
}
25+
# name = "${module.config[each.key].names.log-analytics-workspace}-export-rule"
26+
# resource_group_name = azurerm_resource_group.rg_base[each.key].name
27+
# workspace_resource_id = module.log_analytics_workspace_hub[each.key].id
28+
# destination_resource_id = module.eventhub_law_export["dtos-hub-${each.key}"].event_hubs["dtos-hub"].id
29+
# table_names = var.law.export_table_names
30+
# enabled = var.law.export_enabled
31+
# }
3232

3333
/*--------------------------------------------------------------------------------------------------
3434
RBAC Assignments

0 commit comments

Comments
 (0)