Skip to content

Commit 2217a81

Browse files
author
Mahsa Hanifi
committed
added the names and the network info in the app.tf and common in the template
1 parent ba7054a commit 2217a81

File tree

2 files changed

+47
-31
lines changed

2 files changed

+47
-31
lines changed

‎infra/templates/az-svc-data-integration-mlw/app.tf‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,18 @@ module "function_app" {
107107
}
108108

109109
module "data-factory" {
110-
source = "../../modules/providers/azure/data-factory"
111-
data_factory_name = local.data_factory_name
112-
resource_group_name = azurerm_resource_group.app_rg.name
110+
source = "../../modules/providers/azure/data-factory"
111+
data_factory_name = local.data_factory_name
112+
resource_group_name = azurerm_resource_group.app_rg.name
113+
data_factory_runtime_name = local.data_factory_runtime_name
114+
data_factory_pipeline_name = local.data_factory_pipeline_name
115+
data_factory_trigger_name = local.data_factory_trigger_name
116+
data_factory_dataset_sql_name = local.data_factory_dataset_sql_name
117+
data_factory_dataset_sql_table_name = local.data_factory_dataset_sql_table_name
118+
data_factory_linked_sql_name = local.data_factory_linked_sql_name
119+
vnet_integration {
120+
vnet_id = module.network.virtual_network_id
121+
subnet_name = module.network.subnet_name
122+
}
113123
}
114124

‎infra/templates/az-svc-data-integration-mlw/commons.tf‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,40 @@ locals {
4141
tenant_id = data.azurerm_client_config.current.tenant_id
4242

4343
// Resource names
44-
app_rg_name = "${local.base_name_83}-app-rg" // app resource group (max 90 chars)
45-
admin_rg_lock = "${local.base_name_83}-adm-rg-delete-lock" // management lock to prevent deletes
46-
app_rg_lock = "${local.base_name_83}-app-rg-delete-lock" // management lock to prevent deletes
47-
func_app_sp_name = "${local.base_name}-sp-fa" // service plan
48-
ai_name = "${local.base_name}-ai" // app insights
49-
mlw_ai_name = "${local.base_name}-mlw-ai" // ml app insights
50-
ad_app_name = "${local.base_name}-ad-app" //service principal
51-
ad_app_management_name = "${local.base_name}-ad-app-management"
52-
graph_id = "00000003-0000-0000-c000-000000000000" // ID for Microsoft Graph API
53-
graph_role_id = "e1fe6dd8-ba31-4d61-89e7-88639da4683d" // ID for User.Read API
54-
kv_name = "${local.base_name_21}-kv" // key vault (max 24 chars)
55-
acr_name = "${replace(local.base_name_46, "-", "")}acr" // container registry (max 50 chars, alphanumeric *only*)
56-
vnet_name = "vnet-${local.base_name_60}" // virtual network (max 64 chars)
57-
subnet_name = "snet-${local.base_name_76}" // subnet (max 76 chars)
58-
function_subnet_name = "snet-func-${local.base_name_76}" // subnet (max 76 chars)
59-
func_subnet_delegation_name = "${local.base_name_21}" // subnet (max 76 chars)
60-
mlw_name = "${local.base_name_21}-mlw" // workspace (max 30 chars)
61-
mlw_rg_name = "${local.base_name_83}-mlw-rg" // mlw resource group (max 90 chars)
62-
public_pip_name = "${local.base_name_76}-ip" // public IP (max 80 chars)
63-
svc_princ_name = "${local.base_name}-svc-principal" // service principal
64-
acr_svc_princ_name = "${local.base_name}-acr-svc-principal" // container registry service principal
65-
app_svc_name_prefix = local.base_name_21
66-
auth_svc_name_prefix = "${local.base_name_21}-au"
67-
smpl_app_postfix = "app"
68-
data_factory_name = "adf-cares-${local.base_name_46}"
69-
func_app_name_prefix = "func-cares-${local.base_name_46}" // Function app name (Max 60 chars)
70-
cosmos_account_name = "cosmos-cares-${local.base_name_21}" // Cosmos databse account name (max 44 chars)
71-
cosmos_db_name = "cosmos-cares-db-${local.base_name_21}" // Cosmos databse account name (max 44 chars)
44+
app_rg_name = "${local.base_name_83}-app-rg" // app resource group (max 90 chars)
45+
admin_rg_lock = "${local.base_name_83}-adm-rg-delete-lock" // management lock to prevent deletes
46+
app_rg_lock = "${local.base_name_83}-app-rg-delete-lock" // management lock to prevent deletes
47+
func_app_sp_name = "${local.base_name}-sp-fa" // service plan
48+
ai_name = "${local.base_name}-ai" // app insights
49+
mlw_ai_name = "${local.base_name}-mlw-ai" // ml app insights
50+
ad_app_name = "${local.base_name}-ad-app" //service principal
51+
ad_app_management_name = "${local.base_name}-ad-app-management"
52+
graph_id = "00000003-0000-0000-c000-000000000000" // ID for Microsoft Graph API
53+
graph_role_id = "e1fe6dd8-ba31-4d61-89e7-88639da4683d" // ID for User.Read API
54+
kv_name = "${local.base_name_21}-kv" // key vault (max 24 chars)
55+
acr_name = "${replace(local.base_name_46, "-", "")}acr" // container registry (max 50 chars, alphanumeric *only*)
56+
vnet_name = "vnet-${local.base_name_60}" // virtual network (max 64 chars)
57+
subnet_name = "snet-${local.base_name_76}" // subnet (max 76 chars)
58+
function_subnet_name = "snet-func-${local.base_name_76}" // subnet (max 76 chars)
59+
func_subnet_delegation_name = "${local.base_name_21}" // subnet (max 76 chars)
60+
mlw_name = "${local.base_name_21}-mlw" // workspace (max 30 chars)
61+
mlw_rg_name = "${local.base_name_83}-mlw-rg" // mlw resource group (max 90 chars)
62+
public_pip_name = "${local.base_name_76}-ip" // public IP (max 80 chars)
63+
svc_princ_name = "${local.base_name}-svc-principal" // service principal
64+
acr_svc_princ_name = "${local.base_name}-acr-svc-principal" // container registry service principal
65+
app_svc_name_prefix = local.base_name_21
66+
auth_svc_name_prefix = "${local.base_name_21}-au"
67+
smpl_app_postfix = "app"
68+
data_factory_name = "adf-${local.base_name_46}"
69+
data_factory_runtime_name = "adf-runtime-${local.base_name_46}"
70+
data_factory_pipeline_name = "adf-pipeline-${local.base_name_46}"
71+
data_factory_trigger_name = "adf-trigger-${local.base_name_46}"
72+
data_factory_dataset_sql_name = "adf-ds-${local.base_name_46}"
73+
data_factory_dataset_sql_table_name = "adf-table-${local.base_name_46}"
74+
data_factory_linked_sql_name = "adf-linked-${local.base_name_46}"
75+
func_app_name_prefix = "func-${local.base_name_46}" // Function app name (Max 60 chars)
76+
cosmos_account_name = "cosmos-${local.base_name_21}" // Cosmos databse account name (max 44 chars)
77+
cosmos_db_name = "cosmos-db-${local.base_name_21}" // Cosmos databse account name (max 44 chars)
7278

7379
app_service_global_config = {
7480
aad_client_id = format(local.app_setting_kv_format, local.output_secret_map.aad-client-id)

0 commit comments

Comments
 (0)