more changes

Author: howieleung

azure.yaml

@@ -2,15 +2,9 @@
 # TODO: do we need hooks? 
 # TODO: do we need all of the variables?
 
-name: bogus
+name: azd-get-started-with-ai-agents
 metadata:
-  template: [email protected]
-
-services:
-  api_and_frontend:
-    project: ./src
-    language: py
-    host: containerapp
+  template: [email protected]
 
 hooks:
   postprovision:

infra/api.bicep

@@ -4,9 +4,7 @@ param tags object = {}
 
 param identityName string
 param containerAppsEnvironmentName string
-param containerRegistryName string
 param serviceName string = 'api'
-param exists bool
 param projectConnectionString string
 param agentDeploymentName string
 param searchConnectionName string
@@ -16,6 +14,7 @@ param embeddingDeploymentDimensions string
 param searchServiceEndpoint string
 param agentName string
 param agentID string
+param projectName string
 
 resource apiIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: identityName
@@ -78,15 +77,13 @@ module app 'core/host/container-app-upsert.bicep' = {
     location: location
     tags: union(tags, { 'azd-service-name': serviceName })
     identityName: apiIdentity.name
-    exists: exists
     containerAppsEnvironmentName: containerAppsEnvironmentName
-    containerRegistryName: containerRegistryName
     targetPort: 50505
     env: env
+    projectName: projectName
   }
 }
 
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = apiIdentity.properties.principalId
 output SERVICE_API_NAME string = app.outputs.name
 output SERVICE_API_URI string = app.outputs.uri
-output SERVICE_API_IMAGE_NAME string = app.outputs.imageName

infra/core/host/container-app-upsert.bicep

@@ -23,12 +23,6 @@ param containerMinReplicas int = 1
 @description('The name of the container')
 param containerName string = 'main'
 
-@description('The name of the container registry')
-param containerRegistryName string = ''
-
-@description('Hostname suffix for container registry. Set when deploying to sovereign clouds')
-param containerRegistryHostSuffix string = 'azurecr.io'
-
 @allowed([ 'http', 'grpc' ])
 @description('The protocol used by Dapr to connect to the app, e.g., HTTP or gRPC')
 param daprAppProtocol string = 'http'
@@ -39,9 +33,6 @@ param daprEnabled bool = false
 @description('The Dapr app ID')
 param daprAppId string = containerName
 
-@description('Specifies if the resource already exists')
-param exists bool = false
-
 @description('Specifies if Ingress is enabled for the container app')
 param ingressEnabled bool = true
 
@@ -52,9 +43,6 @@ param identityType string = 'None'
 @description('The name of the user-assigned identity')
 param identityName string = ''
 
-@description('The name of the container image')
-param imageName string = ''
-
 @description('The secrets required for the container')
 @secure()
 param secrets object = {}
@@ -71,9 +59,8 @@ param serviceBinds array = []
 @description('The target port for the container')
 param targetPort int = 80
 
-resource existingApp 'Microsoft.App/containerApps@2023-05-02-preview' existing = if (exists) {
-  name: 'crgetstartwithaiagents'
-}
+param projectName string
+
 
 module app 'container-app.bicep' = {
   name: '${deployment().name}-update'
@@ -86,8 +73,6 @@ module app 'container-app.bicep' = {
     ingressEnabled: ingressEnabled
     containerName: containerName
     containerAppsEnvironmentName: containerAppsEnvironmentName
-    // containerRegistryName: containerRegistryName
-    containerRegistryHostSuffix: containerRegistryHostSuffix
     containerCpuCoreCount: containerCpuCoreCount
     containerMemory: containerMemory
     containerMinReplicas: containerMinReplicas
@@ -98,13 +83,12 @@ module app 'container-app.bicep' = {
     secrets: secrets
     external: external
     env: env
-    imageName: !empty(imageName) ? imageName : exists ? existingApp.properties.template.containers[0].image : ''
     targetPort: targetPort
     serviceBinds: serviceBinds
+    dependOn: projectName
   }
 }
 
 output defaultDomain string = app.outputs.defaultDomain
-output imageName string = app.outputs.imageName
 output name string = app.outputs.name
 output uri string = app.outputs.uri

infra/core/host/container-app.bicep

@@ -25,12 +25,6 @@ param containerMinReplicas int = 1
 @description('The name of the container')
 param containerName string = 'main'
 
-// @description('The name of the container registry')
-// param containerRegistryName string = ''
-
-@description('Hostname suffix for container registry. Set when deploying to sovereign clouds')
-param containerRegistryHostSuffix string = 'azurecr.io'
-
 @description('The protocol used by Dapr to connect to the app, e.g., http or grpc')
 @allowed([ 'http', 'grpc' ])
 param daprAppProtocol string = 'http'
@@ -54,14 +48,14 @@ param identityName string = ''
 @allowed([ 'None', 'SystemAssigned', 'UserAssigned' ])
 param identityType string = 'None'
 
-@description('The name of the container image')
-param imageName string = ''
 
 @description('Specifies if Ingress is enabled for the container app')
 param ingressEnabled bool = true
 
 param revisionMode string = 'Single'
 
+param dependOn string = ''
+
 @description('The secrets required for the container')
 @secure()
 param secrets object = {}
@@ -79,20 +73,9 @@ resource userIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-
   name: identityName
 }
 
-// Private registry support requires both an ACR name and a User Assigned managed identity
-// var usePrivateRegistry = !empty(identityName) && !empty(containerRegistryName)
-
 // Automatically set to `UserAssigned` when an `identityName` has been set
 var normalizedIdentityType = !empty(identityName) ? 'UserAssigned' : identityType
 
-// module containerRegistryAccess '../security/registry-access.bicep' = if (usePrivateRegistry) {
-//   name: '${deployment().name}-registry-access'
-//   params: {
-//     containerRegistryName: containerRegistryName
-//     principalId: usePrivateRegistry ? userIdentity.properties.principalId : ''
-//   }
-// }
-
 resource app 'Microsoft.App/containerApps@2023-05-02-preview' = {
   name: name
   location: location
@@ -101,7 +84,7 @@ resource app 'Microsoft.App/containerApps@2023-05-02-preview' = {
   // otherwise the container app will throw a provision error
   // This also forces us to use an user assigned managed identity since there would no way to 
   // provide the system assigned identity with the ACR pull access before the app is created
-  dependsOn: []
+  dependsOn: empty(dependOn)? [] : [dependOn]
   identity: {
     type: normalizedIdentityType
     userAssignedIdentities: !empty(identityName) && normalizedIdentityType == 'UserAssigned' ? { '${userIdentity.id}': {} } : null
@@ -158,7 +141,6 @@ resource containerAppsEnvironment 'Microsoft.App/managedEnvironments@2023-05-01'
 
 output defaultDomain string = containerAppsEnvironment.properties.defaultDomain
 output identityPrincipalId string = normalizedIdentityType == 'None' ? '' : (empty(identityName) ? app.identity.principalId : userIdentity.properties.principalId)
-output imageName string = imageName
 output name string = app.name
 output serviceBind object = !empty(serviceType) ? { serviceId: app.id, name: name } : {}
 output uri string = ingressEnabled ? 'https://${app.properties.configuration.ingress.fqdn}' : ''

infra/main.bicep

@@ -39,8 +39,6 @@ param applicationInsightsName string = ''
 param aiServicesName string = ''
 @description('The AI Services connection name. If ommited will use a default value')
 param aiServicesConnectionName string = ''
-@description('The Azure Container Registry resource name. If ommited will be generated')
-param containerRegistryName string = ''
 @description('The Azure Key Vault resource name. If ommited will be generated')
 param keyVaultName string = ''
 @description('The Azure Search resource name. If ommited will be generated')
@@ -154,8 +152,6 @@ var aiDeployments = concat(
   aiChatModel,
   useSearchService ? aiEmbeddingModel : [])
 
-//for container and app api
-param apiAppExists bool = false
 
 // Organize resources in a resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
@@ -174,10 +170,6 @@ var resolvedSearchServiceName = !useSearchService
   ? ''
   : !empty(searchServiceName) ? searchServiceName : '${abbrs.searchSearchServices}${resourceToken}'
 
-var containerRegistryResolvedName = !useContainerRegistry
-  ? ''
-  : !empty(containerRegistryName) ? containerRegistryName : '${abbrs.containerRegistryRegistries}${resourceToken}'
-
 module ai 'core/host/ai-environment.bicep' = if (empty(aiExistingProjectConnectionString)) {
   name: 'ai'
   scope: rg
@@ -197,7 +189,6 @@ module ai 'core/host/ai-environment.bicep' = if (empty(aiExistingProjectConnecti
     applicationInsightsName: !useApplicationInsights
       ? ''
       : !empty(applicationInsightsName) ? applicationInsightsName : '${abbrs.insightsComponents}${resourceToken}'
-    containerRegistryName: containerRegistryResolvedName
     searchServiceName: resolvedSearchServiceName
     searchConnectionName: !useSearchService
       ? ''
@@ -260,10 +251,8 @@ module containerApps 'core/host/container-apps.bicep' = {
     name: 'app'
     location: location
     tags: tags
+    containerRegistryName: '${abbrs.containerRegistryRegistries}${resourceToken}'
     containerAppsEnvironmentName: 'containerapps-env-${resourceToken}'
-    containerRegistryName: empty(aiExistingProjectConnectionString)
-      ? ai.outputs.containerRegistryName
-      : containerRegistryResolvedName
     logAnalyticsWorkspaceName: empty(aiExistingProjectConnectionString)
       ? ai.outputs.logAnalyticsWorkspaceName
       : logAnalytics.outputs.name
@@ -283,7 +272,6 @@ module api 'api.bicep' = {
     identityName: '${abbrs.managedIdentityUserAssignedIdentities}api-${resourceToken}'
     containerAppsEnvironmentName: containerApps.outputs.environmentName
     //containerRegistryName: containerApps.outputs.registryName
-    containerRegistryName: 'crgetstartwithaiagents'
     projectConnectionString: projectConnectionString
     agentDeploymentName: agentDeploymentName
     searchConnectionName: searchConnectionName
@@ -293,7 +281,7 @@ module api 'api.bicep' = {
     embeddingDeploymentDimensions: embeddingDeploymentDimensions
     agentName: agentName
     agentID: agentID
-    exists: apiAppExists
+    projectName: projectName
   }
 }
 
@@ -426,5 +414,4 @@ output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerApps.outputs.registry
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
 output SERVICE_API_NAME string = api.outputs.SERVICE_API_NAME
 output SERVICE_API_URI string = api.outputs.SERVICE_API_URI
-output SERVICE_API_IMAGE_NAME string = api.outputs.SERVICE_API_IMAGE_NAME
 output SERVICE_API_ENDPOINTS array = ['${api.outputs.SERVICE_API_URI}']

scripts/write_env.ps1

@@ -15,6 +15,7 @@ $azureAIEmbedDeploymentName = azd env get-value AZURE_AI_EMBED_DEPLOYMENT_NAME
 $azureAIEmbedDimensions = azd env get-value AZURE_AI_EMBED_DIMENSIONS
 $azureAISearchIndexName = azd env get-value AZURE_AI_SEARCH_INDEX_NAME
 $azureAISearchEndpoint = azd env get-value AZURE_AI_SEARCH_ENDPOINT
+$serviceAPIUri = azd env get-value SERVICE_API_URI
 
 Add-Content -Path $envFilePath -Value "AZURE_AIPROJECT_CONNECTION_STRING=$azureAiProjectConnectionString"
 Add-Content -Path $envFilePath -Value "AZURE_AI_AGENT_DEPLOYMENT_NAME=$azureAiagentDeploymentName"
@@ -26,4 +27,7 @@ Add-Content -Path $envFilePath -Value "AZURE_AI_EMBED_DIMENSIONS=$azureAIEmbedDi
 Add-Content -Path $envFilePath -Value "AZURE_AI_SEARCH_INDEX_NAME=$azureAISearchIndexName"
 Add-Content -Path $envFilePath -Value "AZURE_AI_SEARCH_ENDPOINT=$azureAISearchEndpoint"
 Add-Content -Path $envFilePath -Value "AZURE_AI_AGENT_NAME=$azureAiAgentName"
-Add-Content -Path $envFilePath -Value "AZURE_TENANT_ID=$azureTenantId"
+Add-Content -Path $envFilePath -Value "AZURE_TENANT_ID=$azureTenantId"
+
+Write-Host "Web app URL:"
+Write-Host $serviceAPIUri -ForegroundColor Cyan

scripts/write_env.sh

@@ -17,4 +17,7 @@ echo "AZURE_AI_SEARCH_INDEX_NAME=$(azd env get-value AZURE_AI_SEARCH_INDEX_NAME)
 echo "AZURE_AI_SEARCH_ENDPOINT=$(azd env get-value AZURE_AI_SEARCH_ENDPOINT)" >> $ENV_FILE_PATH
 echo "AZURE_AI_AGENT_NAME=$(azd env get-value AZURE_AI_AGENT_NAME)" >> $ENV_FILE_PATH
 echo "AZURE_TENANT_ID=$(azd env get-value AZURE_TENANT_ID)" >> $ENV_FILE_PATH
+
+echo "Web app URL:"
+echo "$(azd env get-value SERVICE_API_URI)"
 exit 0