remove commented code

Author: Shreyas-Microsoft

infra/deploy_ai_foundry.bicep

@@ -11,6 +11,7 @@ param managedIdentityObjectId string
 param aiServicesEndpoint string
 param aiServicesKey string
 param aiServicesId string
+param aureaiFoundryEndpoint string
 
 param aiFoundryName string
 param existingLogAnalyticsWorkspaceId string = ''
@@ -69,125 +70,6 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' = {
 
 var storageNameCleaned = replace(replace(replace(replace('${storageName}cast', '-', ''), '_', ''), '.', ''),'/', '')
 
-
-
-
-// resource storage 'Microsoft.Storage/storageAccounts@2022-09-01' = {
-//   name: storageNameCleaned
-//   location: location
-//   sku: {
-//     name: storageSkuName
-//   }
-//   kind: 'StorageV2'
-//   identity: {
-//     type: 'SystemAssigned'
-//   }
-//   properties: {
-//     accessTier: 'Hot'
-//     allowBlobPublicAccess: false
-//     allowCrossTenantReplication: false
-//     allowSharedKeyAccess: false
-//     encryption: {
-//       keySource: 'Microsoft.Storage'
-//       requireInfrastructureEncryption: false
-//       services: {
-//         blob: {
-//           enabled: true
-//           keyType: 'Account'
-//         }
-//         file: {
-//           enabled: true
-//           keyType: 'Account'
-//         }
-//         queue: {
-//           enabled: true
-//           keyType: 'Service'
-//         }
-//         table: {
-//           enabled: true
-//           keyType: 'Service'
-//         }
-//       }
-//     }
-//     isHnsEnabled: false
-//     isNfsV3Enabled: false
-//     keyPolicy: {
-//       keyExpirationPeriodInDays: 7
-//     }
-//     largeFileSharesState: 'Disabled'
-//     minimumTlsVersion: 'TLS1_2'
-//     networkAcls: {
-//       bypass: 'AzureServices'
-//       defaultAction: 'Allow'
-//     }
-//     supportsHttpsTrafficOnly: true
-//   }
-// }
-
-// @description('This is the built-in Storage Blob Data Contributor.')
-// resource blobDataContributor 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' existing = {
-//   scope: subscription()
-//   name: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'
-// }
-
-// resource storageroleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
-//   name: guid(resourceGroup().id, managedIdentityObjectId, blobDataContributor.id)
-//   scope: storage
-//   properties: {
-//     principalId: managedIdentityObjectId
-//     roleDefinitionId: blobDataContributor.id
-//     principalType: 'ServicePrincipal'
-//   }
-// }
-
-// resource aiHub 'Microsoft.MachineLearningServices/workspaces@2023-08-01-preview' = {
-//   name: azureAiHubName
-//   location: location
-//   identity: {
-//     type: 'SystemAssigned'
-//   }
-//   properties: {
-//     // organization
-//     friendlyName: aiHubFriendlyName
-//     description: aiHubDescription
-
-//     // dependent resources
-//     keyVault: keyVault.id
-//     storageAccount: storage.id
-//   }
-//   kind: 'hub'
-
-//   resource aiServicesConnection 'connections@2024-07-01-preview' = {
-//     name: '${azureAiHubName}-connection-AzureOpenAI'
-//     properties: {
-//       category: 'AIServices'
-//       target: aiServicesEndpoint
-//       authType: 'ApiKey'
-//       isSharedToAll: true
-//       credentials: {
-//         key: aiServicesKey
-//       }
-//       metadata: {
-//         ApiType: 'Azure'
-//         ResourceId: aiServicesId
-//       }
-//     }
-//   }
-// }
-
-// resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' = {
-//   name: aiProjectName
-//   location: location
-//   kind: 'Project'
-//   identity: {
-//     type: 'SystemAssigned'
-//   }
-//   properties: {
-//     friendlyName: aiProjectFriendlyName
-//     hubResourceId: aiHub.id
-//   }
-// }
-
 resource tenantIdEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
   parent: keyVault
   name: 'TENANT-ID'
@@ -244,13 +126,13 @@ resource azureOpenAIEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-
   }
 }
 
-// resource azureAIProjectConnectionStringEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-AI-PROJECT-CONN-STRING'
-//   properties: {
-//     value: '${split(aiFoundryProject.properties.discoveryUrl, '/')[2]};${subscription().subscriptionId};${resourceGroup().name};${aiFoundryProject.name}'
-//   }
-// }
+resource azureAIProjectEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
+  parent: keyVault
+  name: 'AI-PROJECT-ENDPOINT'
+  properties: {
+    value: aureaiFoundryEndpoint
+  }
+}
 
 resource azureOpenAICUApiVersionEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
   parent: keyVault
@@ -324,5 +206,4 @@ output aiSearchName string = aiSearchName
 output storageAccountName string = storageNameCleaned
 
 output logAnalyticsId string = useExisting ? existingLogAnalyticsWorkspace.id : logAnalytics.id
-// output storageAccountId string = storage.id
 output applicationInsightsConnectionString string = applicationInsights.properties.ConnectionString

infra/main.bicep

@@ -172,6 +172,7 @@ module azureAifoundry 'deploy_ai_foundry.bicep' = {
     aiServicesKey: azureAiServices.listKeys().key1
     aiServicesId: azureAiServices.id
     existingLogAnalyticsWorkspaceId: existingLogAnalyticsWorkspaceId
+    aureaiFoundryEndpoint: aiFoundryProject.properties.endpoints['AI Foundry API']
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -467,6 +468,7 @@ resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
   properties: {
     roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe') // Storage Blob Data Contributor
     principalId: containerAppBackend.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 var openAiContributorRoleId = 'a001fd3d-188f-4b5d-821b-7da978bf7442'  // Fixed Role ID for OpenAI Contributor
@@ -477,6 +479,7 @@ resource openAiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-0
   properties: {
     roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', openAiContributorRoleId) // OpenAI Service Contributor
     principalId: containerAppBackend.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 
@@ -493,10 +496,6 @@ resource containers 'Microsoft.Storage/storageAccounts/blobServices/containers@2
   dependsOn: [azureAifoundry]
 }]
 
-// resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' existing = {
-//   name: '${abbrs.ai.aiHubProject}${ResourcePrefix}' // aiProjectName must be calculated - available at main start.
-// }
-
 resource aiDeveloper 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
   name: '64702f94-c441-49e6-a78b-ef80e0188fee'
 }
@@ -507,6 +506,7 @@ resource aiDeveloperAccessProj 'Microsoft.Authorization/roleAssignments@2022-04-
   properties: {
     roleDefinitionId: aiDeveloper.id
     principalId: containerAppBackend.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 
@@ -521,6 +521,7 @@ resource aiUserAccessProj 'Microsoft.Authorization/roleAssignments@2022-04-01' =
   properties: {
     roleDefinitionId: aiUser.id
     principalId: containerAppBackend.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 
@@ -530,6 +531,7 @@ resource aiUserAccessFoundry 'Microsoft.Authorization/roleAssignments@2022-04-01
   properties: {
     roleDefinitionId: aiUser.id
     principalId: containerAppBackend.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }