Skip to content

Commit c9d3be8

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #384 from microsoft/dev
fix: merging dev to main
2 parents f8688e5 + 5d81505 commit c9d3be8

File tree

2 files changed

+244
-16
lines changed

2 files changed

+244
-16
lines changed

‎Deployment/abbreviations.json‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
{
2+
"ai": {
3+
"aiSearch": "srch-",
4+
"aiServices": "aisa-",
5+
"aiVideoIndexer": "avi-",
6+
"machineLearningWorkspace": "mlw-",
7+
"openAIService": "oai-",
8+
"botService": "bot-",
9+
"computerVision": "cv-",
10+
"contentModerator": "cm-",
11+
"contentSafety": "cs-",
12+
"customVisionPrediction": "cstv-",
13+
"customVisionTraining": "cstvt-",
14+
"documentIntelligence": "di-",
15+
"faceApi": "face-",
16+
"healthInsights": "hi-",
17+
"immersiveReader": "ir-",
18+
"languageService": "lang-",
19+
"speechService": "spch-",
20+
"translator": "trsl-",
21+
"aiHub": "aih-",
22+
"aiHubProject": "aihp-"
23+
},
24+
"analytics": {
25+
"analysisServicesServer": "as",
26+
"databricksWorkspace": "dbw-",
27+
"dataExplorerCluster": "dec",
28+
"dataExplorerClusterDatabase": "dedb",
29+
"dataFactory": "adf-",
30+
"digitalTwin": "dt-",
31+
"streamAnalytics": "asa-",
32+
"synapseAnalyticsPrivateLinkHub": "synplh-",
33+
"synapseAnalyticsSQLDedicatedPool": "syndp",
34+
"synapseAnalyticsSparkPool": "synsp",
35+
"synapseAnalyticsWorkspaces": "synw",
36+
"dataLakeStoreAccount": "dls",
37+
"dataLakeAnalyticsAccount": "dla",
38+
"eventHubsNamespace": "evhns-",
39+
"eventHub": "evh-",
40+
"eventGridDomain": "evgd-",
41+
"eventGridSubscriptions": "evgs-",
42+
"eventGridTopic": "evgt-",
43+
"eventGridSystemTopic": "egst-",
44+
"hdInsightHadoopCluster": "hadoop-",
45+
"hdInsightHBaseCluster": "hbase-",
46+
"hdInsightKafkaCluster": "kafka-",
47+
"hdInsightSparkCluster": "spark-",
48+
"hdInsightStormCluster": "storm-",
49+
"hdInsightMLServicesCluster": "mls-",
50+
"iotHub": "iot-",
51+
"provisioningServices": "provs-",
52+
"provisioningServicesCertificate": "pcert-",
53+
"powerBIEmbedded": "pbi-",
54+
"timeSeriesInsightsEnvironment": "tsi-"
55+
},
56+
"compute": {
57+
"appServiceEnvironment": "ase-",
58+
"appServicePlan": "asp-",
59+
"loadTesting": "lt-",
60+
"availabilitySet": "avail-",
61+
"arcEnabledServer": "arcs-",
62+
"arcEnabledKubernetesCluster": "arck",
63+
"batchAccounts": "ba-",
64+
"cloudService": "cld-",
65+
"communicationServices": "acs-",
66+
"diskEncryptionSet": "des",
67+
"functionApp": "func-",
68+
"gallery": "gal",
69+
"hostingEnvironment": "host-",
70+
"imageTemplate": "it-",
71+
"managedDiskOS": "osdisk",
72+
"managedDiskData": "disk",
73+
"notificationHubs": "ntf-",
74+
"notificationHubsNamespace": "ntfns-",
75+
"proximityPlacementGroup": "ppg-",
76+
"restorePointCollection": "rpc-",
77+
"snapshot": "snap-",
78+
"staticWebApp": "stapp-",
79+
"virtualMachine": "vm",
80+
"virtualMachineScaleSet": "vmss-",
81+
"virtualMachineMaintenanceConfiguration": "mc-",
82+
"virtualMachineStorageAccount": "stvm",
83+
"webApp": "app-"
84+
},
85+
"containers": {
86+
"aksCluster": "aks-",
87+
"aksSystemNodePool": "npsystem-",
88+
"aksUserNodePool": "np-",
89+
"containerApp": "ca-",
90+
"containerAppsEnvironment": "cae-",
91+
"containerRegistry": "cr",
92+
"containerInstance": "ci",
93+
"serviceFabricCluster": "sf-",
94+
"serviceFabricManagedCluster": "sfmc-"
95+
},
96+
"databases": {
97+
"cosmosDBDatabase": "cosmos-",
98+
"cosmosDBApacheCassandra": "coscas-",
99+
"cosmosDBMongoDB": "cosmon-",
100+
"cosmosDBNoSQL": "cosno-",
101+
"cosmosDBTable": "costab-",
102+
"cosmosDBGremlin": "cosgrm-",
103+
"cosmosDBPostgreSQL": "cospos-",
104+
"cacheForRedis": "redis-",
105+
"sqlDatabaseServer": "sql-",
106+
"sqlDatabase": "sqldb-",
107+
"sqlElasticJobAgent": "sqlja-",
108+
"sqlElasticPool": "sqlep-",
109+
"mariaDBServer": "maria-",
110+
"mariaDBDatabase": "mariadb-",
111+
"mySQLDatabase": "mysql-",
112+
"postgreSQLDatabase": "psql-",
113+
"sqlServerStretchDatabase": "sqlstrdb-",
114+
"sqlManagedInstance": "sqlmi-"
115+
},
116+
"developerTools": {
117+
"appConfigurationStore": "appcs-",
118+
"mapsAccount": "map-",
119+
"signalR": "sigr",
120+
"webPubSub": "wps-"
121+
},
122+
"devOps": {
123+
"managedGrafana": "amg-"
124+
},
125+
"integration": {
126+
"apiManagementService": "apim-",
127+
"integrationAccount": "ia-",
128+
"logicApp": "logic-",
129+
"serviceBusNamespace": "sbns-",
130+
"serviceBusQueue": "sbq-",
131+
"serviceBusTopic": "sbt-",
132+
"serviceBusTopicSubscription": "sbts-"
133+
},
134+
"managementGovernance": {
135+
"automationAccount": "aa-",
136+
"applicationInsights": "appi-",
137+
"monitorActionGroup": "ag-",
138+
"monitorDataCollectionRules": "dcr-",
139+
"monitorAlertProcessingRule": "apr-",
140+
"blueprint": "bp-",
141+
"blueprintAssignment": "bpa-",
142+
"dataCollectionEndpoint": "dce-",
143+
"logAnalyticsWorkspace": "log-",
144+
"logAnalyticsQueryPacks": "pack-",
145+
"managementGroup": "mg-",
146+
"purviewInstance": "pview-",
147+
"resourceGroup": "rg-",
148+
"templateSpecsName": "ts-"
149+
},
150+
"migration": {
151+
"migrateProject": "migr-",
152+
"databaseMigrationService": "dms-",
153+
"recoveryServicesVault": "rsv-"
154+
},
155+
"networking": {
156+
"applicationGateway": "agw-",
157+
"applicationSecurityGroup": "asg-",
158+
"cdnProfile": "cdnp-",
159+
"cdnEndpoint": "cdne-",
160+
"connections": "con-",
161+
"dnsForwardingRuleset": "dnsfrs-",
162+
"dnsPrivateResolver": "dnspr-",
163+
"dnsPrivateResolverInboundEndpoint": "in-",
164+
"dnsPrivateResolverOutboundEndpoint": "out-",
165+
"firewall": "afw-",
166+
"firewallPolicy": "afwp-",
167+
"expressRouteCircuit": "erc-",
168+
"expressRouteGateway": "ergw-",
169+
"frontDoorProfile": "afd-",
170+
"frontDoorEndpoint": "fde-",
171+
"frontDoorFirewallPolicy": "fdfp-",
172+
"ipGroups": "ipg-",
173+
"loadBalancerInternal": "lbi-",
174+
"loadBalancerExternal": "lbe-",
175+
"loadBalancerRule": "rule-",
176+
"localNetworkGateway": "lgw-",
177+
"natGateway": "ng-",
178+
"networkInterface": "nic-",
179+
"networkSecurityGroup": "nsg-",
180+
"networkSecurityGroupSecurityRules": "nsgsr-",
181+
"networkWatcher": "nw-",
182+
"privateLink": "pl-",
183+
"privateEndpoint": "pep-",
184+
"publicIPAddress": "pip-",
185+
"publicIPAddressPrefix": "ippre-",
186+
"routeFilter": "rf-",
187+
"routeServer": "rtserv-",
188+
"routeTable": "rt-",
189+
"serviceEndpointPolicy": "se-",
190+
"trafficManagerProfile": "traf-",
191+
"userDefinedRoute": "udr-",
192+
"virtualNetwork": "vnet-",
193+
"virtualNetworkGateway": "vgw-",
194+
"virtualNetworkManager": "vnm-",
195+
"virtualNetworkPeering": "peer-",
196+
"virtualNetworkSubnet": "snet-",
197+
"virtualWAN": "vwan-",
198+
"virtualWANHub": "vhub-"
199+
},
200+
"security": {
201+
"bastion": "bas-",
202+
"keyVault": "kv-",
203+
"keyVaultManagedHSM": "kvmhsm-",
204+
"managedIdentity": "id-",
205+
"sshKey": "sshkey-",
206+
"vpnGateway": "vpng-",
207+
"vpnConnection": "vcn-",
208+
"vpnSite": "vst-",
209+
"webApplicationFirewallPolicy": "waf",
210+
"webApplicationFirewallPolicyRuleGroup": "wafrg"
211+
},
212+
"storage": {
213+
"storSimple": "ssimp",
214+
"backupVault": "bvault-",
215+
"backupVaultPolicy": "bkpol-",
216+
"fileShare": "share-",
217+
"storageAccount": "st",
218+
"storageSyncService": "sss-"
219+
},
220+
"virtualDesktop": {
221+
"labServicesPlan": "lp-",
222+
"virtualDesktopHostPool": "vdpool-",
223+
"virtualDesktopApplicationGroup": "vdag-",
224+
"virtualDesktopWorkspace": "vdws-",
225+
"virtualDesktopScalingPlan": "vdscaling-"
226+
}
227+
}

‎Deployment/main.bicep‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,55 @@
22
// Licensed under the MIT license.
33
@description('The Data Center where the model is deployed.')
44
param modeldatacenter string
5+
var abbrs = loadJsonContent('./abbreviations.json')
56

67
targetScope = 'subscription'
78
var resourceprefix = padLeft(take(uniqueString(deployment().name), 5), 5, '0')
89
var resourceprefix_name = 'kmgs'
910

1011
// Create a resource group
1112
resource gs_resourcegroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
12-
name: 'rg-${resourceprefix_name}${resourceprefix}'
13+
name: '${abbrs.managementGovernance.resourceGroup}${resourceprefix_name}${resourceprefix}'
1314
location: deployment().location
1415
}
1516

1617
// Create a storage account
1718
module gs_storageaccount 'bicep/azurestorageaccount.bicep' = {
18-
name: 'blob${resourceprefix_name}${resourceprefix}'
19+
name: '${abbrs.storage.storageAccount}${resourceprefix_name}${resourceprefix}'
1920
scope: gs_resourcegroup
2021
params: {
21-
storageAccountName: 'blob${resourceprefix}'
22+
storageAccountName: '${abbrs.storage.storageAccount}${resourceprefix}'
2223
location: deployment().location
2324
}
2425
}
2526

2627
// Create a Azure Search Service
2728
module gs_azsearch 'bicep/azuresearch.bicep' = {
28-
name: 'search-${resourceprefix_name}${resourceprefix}'
29+
name: '${abbrs.ai.aiSearch}${resourceprefix_name}${resourceprefix}'
2930
scope: gs_resourcegroup
3031
params: {
31-
searchServiceName: 'search-${resourceprefix}'
32+
searchServiceName: '${abbrs.ai.aiSearch}${resourceprefix}'
3233
location: deployment().location
3334
}
3435
}
3536

3637

3738
// Create Container Registry
3839
module gs_containerregistry 'bicep/azurecontainerregistry.bicep' = {
39-
name: 'acr${resourceprefix_name}${resourceprefix}'
40+
name: '${abbrs.containers.containerRegistry}${resourceprefix_name}${resourceprefix}'
4041
scope: gs_resourcegroup
4142
params: {
42-
acrName: 'acr${resourceprefix_name}${resourceprefix}'
43+
acrName: '${abbrs.containers.containerRegistry}${resourceprefix_name}${resourceprefix}'
4344
location: deployment().location
4445
}
4546
}
4647

4748
// Create AKS Cluster
4849
module gs_aks 'bicep/azurekubernetesservice.bicep' = {
49-
name: 'aks-${resourceprefix_name}${resourceprefix}'
50+
name: '${abbrs.compute.arcEnabledKubernetesCluster}${resourceprefix_name}${resourceprefix}'
5051
scope: gs_resourcegroup
5152
params: {
52-
aksName: 'aks-${resourceprefix_name}${resourceprefix}'
53+
aksName: '${abbrs.compute.arcEnabledKubernetesCluster}${resourceprefix_name}${resourceprefix}'
5354
location: deployment().location
5455
}
5556
dependsOn: [
@@ -74,20 +75,20 @@ module gs_aks 'bicep/azurekubernetesservice.bicep' = {
7475

7576
// Create Azure Cognitive Service
7677
module gs_azcognitiveservice 'bicep/azurecognitiveservice.bicep' = {
77-
name: 'cognitiveservice-${resourceprefix_name}${resourceprefix}'
78+
name: '${abbrs.ai.documentIntelligence}${resourceprefix_name}${resourceprefix}'
7879
scope: gs_resourcegroup
7980
params: {
80-
cognitiveServiceName: 'cognitiveservice-${resourceprefix_name}${resourceprefix}'
81+
cognitiveServiceName: '${abbrs.ai.documentIntelligence}${resourceprefix_name}${resourceprefix}'
8182
location: 'eastus'
8283
}
8384
}
8485

8586
// Create Azure Open AI Service
8687
module gs_openaiservice 'bicep/azureopenaiservice.bicep' = {
87-
name: 'openaiservice-${resourceprefix_name}${resourceprefix}'
88+
name: '${abbrs.ai.openAIService}${resourceprefix_name}${resourceprefix}'
8889
scope: gs_resourcegroup
8990
params: {
90-
openAIServiceName: 'openaiservice-${resourceprefix_name}${resourceprefix}'
91+
openAIServiceName: '${abbrs.ai.openAIService}${resourceprefix_name}${resourceprefix}'
9192
// GPT-4-32K model & GPT-4o available Data center information.
9293
// https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models#gpt-4
9394
location: modeldatacenter
@@ -138,10 +139,10 @@ module gs_openaiservicemodels_text_embedding 'bicep/azureopenaiservicemodel.bice
138139

139140
// Create Azure Cosmos DB Mongo
140141
module gs_cosmosdb 'bicep/azurecosmosdb.bicep' = {
141-
name: 'cosmosdb-${resourceprefix_name}${resourceprefix}'
142+
name: '${abbrs.databases.cosmosDBDatabase}${resourceprefix_name}${resourceprefix}'
142143
scope: gs_resourcegroup
143144
params: {
144-
cosmosDbAccountName: 'cosmosdb-${resourceprefix_name}${resourceprefix}'
145+
cosmosDbAccountName: '${abbrs.databases.cosmosDBDatabase}${resourceprefix_name}${resourceprefix}'
145146
location: deployment().location
146147
}
147148
}
@@ -157,7 +158,7 @@ module gs_appconfig 'bicep/azureappconfigservice.bicep' = {
157158
}
158159

159160
// return all resource names as a output
160-
output gs_resourcegroup_name string = 'rg-${resourceprefix_name}${resourceprefix}'
161+
output gs_resourcegroup_name string = '${abbrs.managementGovernance.resourceGroup}${resourceprefix_name}${resourceprefix}'
161162
output gs_solution_prefix string = '${resourceprefix_name}${resourceprefix}'
162163
output gs_storageaccount_name string = gs_storageaccount.outputs.storageAccountName
163164
output gs_azsearch_name string = gs_azsearch.outputs.searchServiceName

0 commit comments

Comments
 (0)