fix: Private network issue while reusing foundry project (#243)

* feat: Down merge from main to dev (#240)

* updated model capacity to minimum 100

* Add principalType 'ServicePrincipal' to role assignments in Bicep modules

* update mainjson file

* removed text embedding condition

* add reuse guide for existing Azure AI Foundry project

* remove redundant replica settings for container and API apps in deployment workflow

* disable private networking in deployment parameters

* normalize secondary location value to lowercase in deployment parameters

* fix: correct casing for SOLUTION_NAME in deployment output extraction

* refactor: remove unused SOLUTION_NAME output and related steps in deployment workflow

* fix: prepend https to CONTAINER_WEB_APPURL in deployment output extraction

---------

Co-authored-by: Priyanka-Microsoft <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Abdul-Microsoft <[email protected]>
Co-authored-by: Prasanjeet-Microsoft <[email protected]>
Co-authored-by: Vinay Sharma <[email protected]>

* feat: Down merge from main to dev (#241)

* updated model capacity to minimum 100

* Add principalType 'ServicePrincipal' to role assignments in Bicep modules

* update mainjson file

* removed text embedding condition

* add reuse guide for existing Azure AI Foundry project

* remove redundant replica settings for container and API apps in deployment workflow

* disable private networking in deployment parameters

* normalize secondary location value to lowercase in deployment parameters

* fix: correct casing for SOLUTION_NAME in deployment output extraction

* refactor: remove unused SOLUTION_NAME output and related steps in deployment workflow

* fix: prepend https to CONTAINER_WEB_APPURL in deployment output extraction

---------

Co-authored-by: Priyanka-Microsoft <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Abdul-Microsoft <[email protected]>
Co-authored-by: Prasanjeet-Microsoft <[email protected]>
Co-authored-by: Vinay Sharma <[email protected]>

* fix: Handling Private network connections with existing foundry projrect (#242)

* updated model capacity to minimum 100

* Add principalType 'ServicePrincipal' to role assignments in Bicep modules

* update mainjson file

* removed text embedding condition

* add reuse guide for existing Azure AI Foundry project

* remove redundant replica settings for container and API apps in deployment workflow

* disable private networking in deployment parameters

* normalize secondary location value to lowercase in deployment parameters

* fix: correct casing for SOLUTION_NAME in deployment output extraction

* refactor: remove unused SOLUTION_NAME output and related steps in deployment workflow

* fix: prepend https to CONTAINER_WEB_APPURL in deployment output extraction

* fix: Disable Network configurations in case of resuing the foundry project

---------

Co-authored-by: Priyanka-Microsoft <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Abdul-Microsoft <[email protected]>
Co-authored-by: Prasanjeet-Microsoft <[email protected]>
Co-authored-by: Vinay Sharma <[email protected]>

* fix: Resolved conflicts

---------

Co-authored-by: Priyanka-Microsoft <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Abdul-Microsoft <[email protected]>
Co-authored-by: Prasanjeet-Microsoft <[email protected]>
Co-authored-by: Vinay Sharma <[email protected]>

Author: 6 people

infra/main.bicep

@@ -91,6 +91,8 @@ var solutionPrefix = 'cps-${padLeft(take(toLower(uniqueString(subscription().id,
 // Resources      //
 // ============== //
 
+var existingProjectResourceId = trim(existingFoundryProjectResourceId)
+
 // ========== AVM Telemetry ========== //
 #disable-next-line no-deployments-resources
 resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
@@ -579,7 +581,7 @@ module avmAiServices 'modules/account/main.bicep' = {
     name: 'aisa-${solutionPrefix}'
     projectName: 'aifp-${solutionPrefix}'
     projectDescription: 'aifp-${solutionPrefix}'
-    existingFoundryProjectResourceId: existingFoundryProjectResourceId
+    existingFoundryProjectResourceId: existingProjectResourceId
     location: aiDeploymentsLocation
     sku: 'S0'
     allowProjectManagement: true
@@ -632,7 +634,7 @@ module avmAiServices 'modules/account/main.bicep' = {
     // WAF related parameters
     publicNetworkAccess: (enablePrivateNetworking) ? 'Disabled' : 'Enabled'
     //publicNetworkAccess: 'Enabled' // Always enabled for AI Services
-    privateEndpoints: (enablePrivateNetworking)
+    privateEndpoints: (enablePrivateNetworking && empty(existingProjectResourceId))
       ? [
           {
             name: 'ai-services-private-endpoint-${solutionPrefix}'