Skip to content

Commit d814115

Browse files
denniseikdenniseik
committed
update resource abbrevations to azure standarsd
1 parent 96075ca commit d814115

File tree

9 files changed

+36
-38
lines changed

9 files changed

+36
-38
lines changed

‎quickstart/101-machine-learning/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ provider "azurerm" {
1616
data "azurerm_client_config" "current" {}
1717

1818
resource "azurerm_resource_group" "default" {
19-
name = "${var.name}-${var.environment}-rgp"
20-
location = "${var.location}"
19+
name = "rg-${var.name}-${var.environment}"
20+
location = var.location
2121
}

‎quickstart/101-machine-learning/readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Azure Machine Learning workspace
22

3-
This deployment template specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace),
3+
This deployment configuration specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace),
44
and its associated resources including Azure Key Vault, Azure Storage, Azure Application Insights and Azure Container Registry.
55

6-
This template describes the minimal set of resources you require to get started with Azure Machine Learning.
6+
This configuration describes the minimal set of resources you require to get started with Azure Machine Learning.
77

88
## Resources
99

‎quickstart/101-machine-learning/variables.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
variable "name" {
22
type = string
33
description = "Name of the deployment"
4-
default = "azureml999"
54
}
65

76
variable "environment" {

‎quickstart/101-machine-learning/workspace.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Dependent resources for Azure Machine Learning
22
resource "azurerm_application_insights" "default" {
3-
name = "${var.name}-${var.environment}-ain"
3+
name = "appi-${var.name}-${var.environment}"
44
location = azurerm_resource_group.default.location
55
resource_group_name = azurerm_resource_group.default.name
66
application_type = "web"
77
}
88

99
resource "azurerm_key_vault" "default" {
10-
name = "${var.name}${var.environment}kv"
10+
name = "kv-${var.name}-${var.environment}"
1111
location = azurerm_resource_group.default.location
1212
resource_group_name = azurerm_resource_group.default.name
1313
tenant_id = data.azurerm_client_config.current.tenant_id
@@ -21,7 +21,7 @@ resource "azurerm_key_vault" "default" {
2121
}
2222

2323
resource "azurerm_storage_account" "default" {
24-
name = "${var.name}${var.environment}sa"
24+
name = "st${var.name}${var.environment}"
2525
location = azurerm_resource_group.default.location
2626
resource_group_name = azurerm_resource_group.default.name
2727
account_tier = "Standard"
@@ -34,7 +34,7 @@ resource "azurerm_storage_account" "default" {
3434
}
3535

3636
resource "azurerm_container_registry" "default" {
37-
name = "${var.name}${var.environment}cr"
37+
name = "cr${var.name}${var.environment}"
3838
location = azurerm_resource_group.default.location
3939
resource_group_name = azurerm_resource_group.default.name
4040
sku = "Premium"
@@ -43,7 +43,7 @@ resource "azurerm_container_registry" "default" {
4343

4444
# Machine Learning workspace
4545
resource "azurerm_machine_learning_workspace" "default" {
46-
name = "${var.name}-${var.environment}-aml"
46+
name = "mlw-${var.name}-${var.environment}"
4747
location = azurerm_resource_group.default.location
4848
resource_group_name = azurerm_resource_group.default.name
4949
application_insights_id = azurerm_application_insights.default.id

‎quickstart/201-machine-learning-private/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ provider "azurerm" {
1616
data "azurerm_client_config" "current" {}
1717

1818
resource "azurerm_resource_group" "default" {
19-
name = "${var.name}-${var.environment}-rgp"
20-
location = "${var.location}"
21-
}
19+
name = "rg-${var.name}-${var.environment}"
20+
location = var.location
21+
}

‎quickstart/201-machine-learning-private/network.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Virtual Network
22
resource "azurerm_virtual_network" "default" {
3-
name = "${var.name}-${var.environment}-vnet"
3+
name = "vnet-${var.name}-${var.environment}"
44
address_space = var.vnet_address_space
55
location = azurerm_resource_group.default.location
66
resource_group_name = azurerm_resource_group.default.name

‎quickstart/201-machine-learning-private/readme.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Azure Machine Learning workspace using Azure Private Link
22

3-
This deployment template specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace),
3+
This deployment configuration specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace),
44
and its associated resources including Azure Key Vault, Azure Storage, Azure Application Insights and Azure Container Registry.
55

6-
In addition to these core services, this template deploys any networking components that are required to set up Azure Machine Learning
6+
In addition to these core services, this configuration specifies any networking components that are required to set up Azure Machine Learning
77
for private network connectivity using [Azure Private Link](https://docs.microsoft.com/en-us/azure/private-link/).
88

9-
This template describes the minimal set of resources you require to get started with Azure Machine Learning in a network-isolated set-up.
9+
This configuration describes the minimal set of resources you require to get started with Azure Machine Learning in a network-isolated set-up.
1010

1111
To learn more about security configurations in Azure Machine Learning, see [Enterprise security and governance for Azure Machine Learning](https://docs.microsoft.com/en-us/azure/machine-learning/concept-enterprise-security).
1212

‎quickstart/201-machine-learning-private/variables.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
variable "name" {
22
type = string
33
description = "Name of the deployment"
4-
default = "azureml568"
54
}
65

76
variable "environment" {

‎quickstart/201-machine-learning-private/workspace.tf‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Dependent resources for the workspace
1+
# Dependent resources for Azure Machine Learning
22
resource "azurerm_application_insights" "default" {
3-
name = "${var.name}-${var.environment}-ain"
3+
name = "appi-${var.name}-${var.environment}"
44
location = azurerm_resource_group.default.location
55
resource_group_name = azurerm_resource_group.default.name
66
application_type = "web"
77
}
88

99
resource "azurerm_key_vault" "default" {
10-
name = "${var.name}${var.environment}kv"
10+
name = "kv-${var.name}-${var.environment}"
1111
location = azurerm_resource_group.default.location
1212
resource_group_name = azurerm_resource_group.default.name
1313
tenant_id = data.azurerm_client_config.current.tenant_id
1414
sku_name = "premium"
15-
purge_protection_enabled = true
15+
purge_protection_enabled = false
1616

1717
network_acls {
1818
default_action = "Deny"
@@ -21,7 +21,7 @@ resource "azurerm_key_vault" "default" {
2121
}
2222

2323
resource "azurerm_storage_account" "default" {
24-
name = "${var.name}${var.environment}sa"
24+
name = "st${var.name}${var.environment}"
2525
location = azurerm_resource_group.default.location
2626
resource_group_name = azurerm_resource_group.default.name
2727
account_tier = "Standard"
@@ -34,7 +34,7 @@ resource "azurerm_storage_account" "default" {
3434
}
3535

3636
resource "azurerm_container_registry" "default" {
37-
name = "${var.name}${var.environment}cr"
37+
name = "cr${var.name}${var.environment}"
3838
location = azurerm_resource_group.default.location
3939
resource_group_name = azurerm_resource_group.default.name
4040
sku = "Premium"
@@ -43,7 +43,7 @@ resource "azurerm_container_registry" "default" {
4343

4444
# Machine Learning workspace
4545
resource "azurerm_machine_learning_workspace" "default" {
46-
name = "${var.name}-${var.environment}-aml"
46+
name = "mlw-${var.name}-${var.environment}"
4747
location = azurerm_resource_group.default.location
4848
resource_group_name = azurerm_resource_group.default.name
4949
application_insights_id = azurerm_application_insights.default.id
@@ -57,8 +57,8 @@ resource "azurerm_machine_learning_workspace" "default" {
5757
}
5858

5959
# Private endpoints
60-
resource "azurerm_private_endpoint" "keyvault_ple" {
61-
name = "${var.name}-${var.environment}-kv-ple"
60+
resource "azurerm_private_endpoint" "kv_ple" {
61+
name = "ple-${var.name}-${var.environment}-kv"
6262
location = azurerm_resource_group.default.location
6363
resource_group_name = azurerm_resource_group.default.name
6464
subnet_id = azurerm_subnet.mlsubnet.id
@@ -69,15 +69,15 @@ resource "azurerm_private_endpoint" "keyvault_ple" {
6969
}
7070

7171
private_service_connection {
72-
name = "${var.name}kv-psc"
72+
name = "psc-${var.name}-kv"
7373
private_connection_resource_id = azurerm_key_vault.default.id
7474
subresource_names = [ "vault" ]
7575
is_manual_connection = false
7676
}
7777
}
7878

79-
resource "azurerm_private_endpoint" "storage_ple_blob" {
80-
name = "${var.name}-${var.environment}-sa-ple-blob"
79+
resource "azurerm_private_endpoint" "st_ple_blob" {
80+
name = "ple-${var.name}-${var.environment}-st-blob"
8181
location = azurerm_resource_group.default.location
8282
resource_group_name = azurerm_resource_group.default.name
8383
subnet_id = azurerm_subnet.mlsubnet.id
@@ -88,15 +88,15 @@ resource "azurerm_private_endpoint" "storage_ple_blob" {
8888
}
8989

9090
private_service_connection {
91-
name = "${var.name}sa-psc"
91+
name = "psc-${var.name}-st"
9292
private_connection_resource_id = azurerm_storage_account.default.id
9393
subresource_names = [ "blob" ]
9494
is_manual_connection = false
9595
}
9696
}
9797

9898
resource "azurerm_private_endpoint" "storage_ple_file" {
99-
name = "${var.name}-${var.environment}-sa-ple-file"
99+
name = "ple-${var.name}-${var.environment}-st-file"
100100
location = azurerm_resource_group.default.location
101101
resource_group_name = azurerm_resource_group.default.name
102102
subnet_id = azurerm_subnet.mlsubnet.id
@@ -107,15 +107,15 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
107107
}
108108

109109
private_service_connection {
110-
name = "${var.name}sa-psc"
110+
name = "psc-${var.name}-st"
111111
private_connection_resource_id = azurerm_storage_account.default.id
112112
subresource_names = [ "file" ]
113113
is_manual_connection = false
114114
}
115115
}
116116

117117
resource "azurerm_private_endpoint" "cr_ple" {
118-
name = "${var.name}-${var.environment}-cr-ple"
118+
name = "ple-${var.name}-${var.environment}-cr"
119119
location = azurerm_resource_group.default.location
120120
resource_group_name = azurerm_resource_group.default.name
121121
subnet_id = azurerm_subnet.mlsubnet.id
@@ -126,15 +126,15 @@ resource "azurerm_private_endpoint" "cr_ple" {
126126
}
127127

128128
private_service_connection {
129-
name = "${var.name}cr-psc"
129+
name = "psc-${var.name}-cr"
130130
private_connection_resource_id = azurerm_container_registry.default.id
131131
subresource_names = [ "registry" ]
132132
is_manual_connection = false
133133
}
134134
}
135135

136-
resource "azurerm_private_endpoint" "ml_ple" {
137-
name = "${var.name}-${var.environment}-ml-ple"
136+
resource "azurerm_private_endpoint" "mlw_ple" {
137+
name = "ple-${var.name}-${var.environment}-mlw"
138138
location = azurerm_resource_group.default.location
139139
resource_group_name = azurerm_resource_group.default.name
140140
subnet_id = azurerm_subnet.mlsubnet.id
@@ -148,7 +148,7 @@ resource "azurerm_private_endpoint" "ml_ple" {
148148
}
149149

150150
private_service_connection {
151-
name = "${var.name}ml-psc"
151+
name = "psc-${var.name}-mlw"
152152
private_connection_resource_id = azurerm_machine_learning_workspace.default.id
153153
subresource_names = [ "amlworkspace" ]
154154
is_manual_connection = false

0 commit comments

Comments
 (0)