Synchronize repo from Repoman

Author: azure-sdk

.azdo/pipelines/azure-dev.yml

@@ -20,9 +20,7 @@ steps:
       AZURE_SUBSCRIPTION_ID: $(AZURE_SUBSCRIPTION_ID)
       AZURE_ENV_NAME: $(AZURE_ENV_NAME)
       AZURE_LOCATION: $(AZURE_LOCATION)
-      ARM_TENANT_ID: $(ARM_TENANT_ID)
-      ARM_CLIENT_ID: $(ARM_CLIENT_ID)
-      ARM_CLIENT_SECRET: $(ARM_CLIENT_SECRET)
+      
   - task: AzureCLI@2
     displayName: Azure Dev Deploy
     inputs:

.devcontainer/devcontainer.json

@@ -7,11 +7,19 @@
         }
     },
     "features": {
-        "github-cli": "2",
-        "azure-cli": "2.38",
-        "dotnet": "6.0",
-        "docker-from-docker": "20.10",
-        "node": {
+        "ghcr.io/devcontainers/features/azure-cli:1": {
+            "version": "2.38"
+        },
+        "ghcr.io/devcontainers/features/docker-from-docker:1": {
+            "version": "20.10"
+        },
+        "ghcr.io/devcontainers/features/dotnet:1": {
+            "version": "6.0"
+        },
+        "ghcr.io/devcontainers/features/github-cli:1": {
+            "version": "2"
+        },
+        "ghcr.io/devcontainers/features/node:1": {
             "version": "16",
             "nodeGypDependencies": false
         }

infra/app/api.bicep

@@ -1,30 +1,33 @@
-param environmentName string
+param name string
 param location string = resourceGroup().location
+param tags object = {}
 
 param allowedOrigins array = []
+param appCommandLine string = ''
 param applicationInsightsName string = ''
 param appServicePlanId string
 param appSettings object = {}
 param keyVaultName string
 param serviceName string = 'api'
 
 module api '../core/host/appservice.bicep' = {
-  name: '${serviceName}-appservice-dotnet-module'
+  name: '${name}-app-module'
   params: {
-    environmentName: environmentName
+    name: name
     location: location
+    tags: union(tags, { 'azd-service-name': serviceName })
     allowedOrigins: allowedOrigins
+    appCommandLine: appCommandLine
     applicationInsightsName: applicationInsightsName
     appServicePlanId: appServicePlanId
     appSettings: appSettings
     keyVaultName: keyVaultName
     runtimeName: 'dotnetcore'
     runtimeVersion: '6.0'
     scmDoBuildDuringDeployment: false
-    serviceName: serviceName
   }
 }
 
-output API_IDENTITY_PRINCIPAL_ID string = api.outputs.identityPrincipalId
-output API_NAME string = api.outputs.name
-output API_URI string = api.outputs.uri
+output SERVICE_API_IDENTITY_PRINCIPAL_ID string = api.outputs.identityPrincipalId
+output SERVICE_API_NAME string = api.outputs.name
+output SERVICE_API_URI string = api.outputs.uri

infra/app/db.bicep

@@ -1,25 +1,31 @@
-param environmentName string
+param name string
 param location string = resourceGroup().location
+param tags object = {}
 
-param databaseName string = 'ToDo'
+param databaseName string = ''
 param keyVaultName string
 
 @secure()
 param sqlAdminPassword string
 @secure()
 param appUserPassword string
 
+// Because databaseName is optional in main.bicep, we make sure the database name is set here.
+var defaultDatabaseName = 'Todo'
+var actualDatabaseName = !empty(databaseName) ? databaseName : defaultDatabaseName
+
 module sqlServer '../core/database/sqlserver/sqlserver.bicep' = {
   name: 'sqlserver'
   params: {
-    environmentName: environmentName
+    name: name
     location: location
-    dbName: databaseName
+    tags: tags
+    databaseName: actualDatabaseName
     keyVaultName: keyVaultName
     sqlAdminPassword: sqlAdminPassword
     appUserPassword: appUserPassword
   }
 }
 
-output sqlConnectionStringKey string = sqlServer.outputs.sqlConnectionStringKey
-output sqlDatabaseName string = databaseName
+output connectionStringKey string = sqlServer.outputs.connectionStringKey
+output databaseName string = sqlServer.outputs.databaseName

infra/app/web.bicep

@@ -1,27 +1,27 @@
-param environmentName string
+param name string
 param location string = resourceGroup().location
-
+param tags object = {}
 param serviceName string = 'web'
 param appCommandLine string = 'pm2 serve /home/site/wwwroot --no-daemon --spa'
 param applicationInsightsName string = ''
 param appServicePlanId string
 param appSettings object = {}
 
 module web '../core/host/appservice.bicep' = {
-  name: '${serviceName}-appservice-node-module'
+  name: '${name}-deployment'
   params: {
-    environmentName: environmentName
+    name: name
     location: location
-    serviceName: serviceName
     appCommandLine: appCommandLine
     applicationInsightsName: applicationInsightsName
     appServicePlanId: appServicePlanId
     appSettings: appSettings
     runtimeName: 'node'
     runtimeVersion: '16-lts'
+    tags: union(tags, { 'azd-service-name': serviceName })
   }
 }
 
-output WEB_IDENTITY_PRINCIPAL_ID string = web.outputs.identityPrincipalId
-output WEB_NAME string = web.outputs.name
-output WEB_URI string = web.outputs.uri
+output SERVICE_WEB_IDENTITY_PRINCIPAL_ID string = web.outputs.identityPrincipalId
+output SERVICE_WEB_NAME string = web.outputs.name
+output SERVICE_WEB_URI string = web.outputs.uri

infra/core/database/cosmos/cosmos-account.bicep

@@ -1,17 +1,15 @@
-param environmentName string
+param name string
 param location string = resourceGroup().location
+param tags object = {}
 
-param cosmosConnectionStringKey string = 'AZURE-COSMOS-CONNECTION-STRING'
+param connectionStringKey string = 'AZURE-COSMOS-CONNECTION-STRING'
 param keyVaultName string
+
 @allowed([ 'GlobalDocumentDB', 'MongoDB', 'Parse' ])
 param kind string
 
-var abbrs = loadJsonContent('../../../abbreviations.json')
-var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
-var tags = { 'azd-env-name': environmentName }
-
-resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-05-15' = {
-  name: '${abbrs.documentDBDatabaseAccounts}${resourceToken}'
+resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-08-15' = {
+  name: name
   kind: kind
   location: location
   tags: tags
@@ -34,7 +32,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-05-15' = {
 
 resource cosmosConnectionString 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
   parent: keyVault
-  name: cosmosConnectionStringKey
+  name: connectionStringKey
   properties: {
     value: cosmos.listConnectionStrings().connectionStrings[0].connectionString
   }
@@ -44,6 +42,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
   name: keyVaultName
 }
 
-output cosmosEndpoint string = cosmos.properties.documentEndpoint
-output cosmosConnectionStringKey string = cosmosConnectionStringKey
-output cosmosResourceId string = cosmos.id
+output connectionStringKey string = connectionStringKey
+output endpoint string = cosmos.properties.documentEndpoint
+output id string = cosmos.id
+output name string = cosmos.name

infra/core/database/cosmos/mongo/cosmos-mongo-account.bicep

@@ -1,18 +1,22 @@
-param environmentName string
+param name string
 param location string = resourceGroup().location
+param tags object = {}
 
 param keyVaultName string
+param connectionStringKey string = 'AZURE-COSMOS-CONNECTION-STRING'
 
 module cosmos '../../cosmos/cosmos-account.bicep' = {
   name: 'cosmos-account'
   params: {
-    environmentName: environmentName
+    name: name
     location: location
+    connectionStringKey: connectionStringKey
     keyVaultName: keyVaultName
     kind: 'MongoDB'
+    tags: tags
   }
 }
 
-output cosmosEndpoint string = cosmos.outputs.cosmosEndpoint
-output cosmosConnectionStringKey string = cosmos.outputs.cosmosConnectionStringKey
-output cosmosResourceId string = cosmos.outputs.cosmosResourceId
+output connectionStringKey string = cosmos.outputs.connectionStringKey
+output endpoint string = cosmos.outputs.endpoint
+output id string = cosmos.outputs.id

infra/core/database/cosmos/mongo/cosmos-mongo-db.bicep

@@ -1,27 +1,28 @@
-param environmentName string
+param accountName string
+param databaseName string
 param location string = resourceGroup().location
+param tags object = {}
 
 param collections array = []
-param cosmosDatabaseName string
-param cosmosConnectionStringKey string = 'AZURE-COSMOS-CONNECTION-STRING'
+param connectionStringKey string = 'AZURE-COSMOS-CONNECTION-STRING'
 param keyVaultName string
 
-var abbrs = loadJsonContent('../../../../abbreviations.json')
-var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
-
 module cosmos 'cosmos-mongo-account.bicep' = {
   name: 'cosmos-mongo-account'
   params: {
-    environmentName: environmentName
+    name: accountName
     location: location
     keyVaultName: keyVaultName
+    tags: tags
+    connectionStringKey: connectionStringKey
   }
 }
 
-resource database 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2022-05-15' = {
-  name: '${abbrs.documentDBDatabaseAccounts}${resourceToken}/${cosmosDatabaseName}'
+resource database 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2022-08-15' = {
+  name: '${accountName}/${databaseName}'
+  tags: tags
   properties: {
-    resource: { id: cosmosDatabaseName }
+    resource: { id: databaseName }
   }
 
   resource list 'collections' = [for collection in collections: {
@@ -40,6 +41,6 @@ resource database 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2022-0
   ]
 }
 
-output cosmosConnectionStringKey string = cosmosConnectionStringKey
-output cosmosDatabaseName string = cosmosDatabaseName
-output cosmosEndpoint string = cosmos.outputs.cosmosEndpoint
+output connectionStringKey string = connectionStringKey
+output databaseName string = databaseName
+output endpoint string = cosmos.outputs.endpoint

infra/core/database/cosmos/sql/cosmos-sql-account.bicep

@@ -1,18 +1,21 @@
-param environmentName string
+param name string
 param location string = resourceGroup().location
+param tags object = {}
 
 param keyVaultName string
 
 module cosmos '../../cosmos/cosmos-account.bicep' = {
   name: 'cosmos-account'
   params: {
-    environmentName: environmentName
+    name: name
     location: location
+    tags: tags
     keyVaultName: keyVaultName
     kind: 'GlobalDocumentDB'
   }
 }
 
-output cosmosEndpoint string = cosmos.outputs.cosmosEndpoint
-output cosmosConnectionStringKey string = cosmos.outputs.cosmosConnectionStringKey
-output cosmosResourceId string = cosmos.outputs.cosmosResourceId
+output connectionStringKey string = cosmos.outputs.connectionStringKey
+output endpoint string = cosmos.outputs.endpoint
+output id string = cosmos.outputs.id
+output name string = cosmos.outputs.name

infra/core/database/cosmos/sql/cosmos-sql-db.bicep

@@ -1,27 +1,26 @@
-param environmentName string
+param accountName string
+param databaseName string
 param location string = resourceGroup().location
+param tags object = {}
 
 param containers array = []
-param cosmosDatabaseName string
 param keyVaultName string
 param principalIds array = []
 
-var abbrs = loadJsonContent('../../../../abbreviations.json')
-var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
-
 module cosmos 'cosmos-sql-account.bicep' = {
   name: 'cosmos-sql-account'
   params: {
-    environmentName: environmentName
+    name: accountName
     location: location
+    tags: tags
     keyVaultName: keyVaultName
   }
 }
 
 resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2022-05-15' = {
-  name: '${abbrs.documentDBDatabaseAccounts}${resourceToken}/${cosmosDatabaseName}'
+  name: '${accountName}/${databaseName}'
   properties: {
-    resource: { id: cosmosDatabaseName }
+    resource: { id: databaseName }
   }
 
   resource list 'containers' = [for container in containers: {
@@ -43,8 +42,7 @@ resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2022-05-15
 module roleDefintion 'cosmos-sql-role-def.bicep' = {
   name: 'cosmos-sql-role-definition'
   params: {
-    environmentName: environmentName
-    location: location
+    accountName: accountName
   }
   dependsOn: [
     cosmos
@@ -57,9 +55,8 @@ module roleDefintion 'cosmos-sql-role-def.bicep' = {
 module userRole 'cosmos-sql-role-assign.bicep' = [for principalId in principalIds: if (!empty(principalId)) {
   name: 'cosmos-sql-user-role-${uniqueString(principalId)}'
   params: {
-    environmentName: environmentName
-    location: location
-    cosmosRoleDefinitionId: roleDefintion.outputs.cosmosSqlRoleDefinitionId
+    accountName: accountName
+    roleDefinitionId: roleDefintion.outputs.id
     principalId: principalId
   }
   dependsOn: [
@@ -68,8 +65,9 @@ module userRole 'cosmos-sql-role-assign.bicep' = [for principalId in principalId
   ]
 }]
 
-output cosmosConnectionStringKey string = cosmos.outputs.cosmosConnectionStringKey
-output cosmosDatabaseName string = cosmosDatabaseName
-output cosmosEndpoint string = cosmos.outputs.cosmosEndpoint
-output cosmosResourceId string = cosmos.outputs.cosmosResourceId
-output cosmosSqlRoleDefinitionId string = roleDefintion.outputs.cosmosSqlRoleDefinitionId
+output accountId string = cosmos.outputs.id
+output accountName string = cosmos.outputs.name
+output connectionStringKey string = cosmos.outputs.connectionStringKey
+output databaseName string = databaseName
+output endpoint string = cosmos.outputs.endpoint
+output roleDefinitionId string = roleDefintion.outputs.id