removed the ACR deployment and few infra updates

Author: Ragini-Microsoft

content-gen/azure.yaml

@@ -2,9 +2,9 @@ environment:
   name: content-generation
   location: eastus
 
-# name: content-generation
-# metadata:
-#   template: content-generation@1.22
+name: content-generation
+metadata:
+  template: content-generation@1.22
 
 requiredVersions:
   azd: '>= 1.18.0'
@@ -46,10 +46,6 @@ infra:
   path: ./infra
   module: main
 
-# Custom workflow: 
-# 1. First provision creates infrastructure (skips ACI for private networking)
-# 2. Build container image to ACR
-# 3. Second provision creates ACI with the now-available image
 workflows:
   up:
     steps:
@@ -120,47 +116,6 @@ hooks:
           Write-Host "  Cosmos DB role may already be assigned" -ForegroundColor Yellow
         }
         
-        # ============================================================
-        # ACR Image Build - COMMENTED OUT
-        # Images should be pre-built and pushed to ACR before deployment:
-        #   Frontend (App Service): content-gen-webapp:latest
-        #   Backend (ACI):          content-gen-api:latest
-        # 
-        # To build and push manually:
-        #   az acr build --registry $ACR_NAME --image content-gen-webapp:latest --file ./src/Frontend.Dockerfile ./src
-        #   az acr build --registry $ACR_NAME --image content-gen-api:latest --file ./src/backend/ApiApp.Dockerfile ./src
-        # ============================================================
-        
-        # # Build container image and deploy ACI if ACR exists and ACI was skipped
-        # $skipContainer = azd env get-value skipContainerDeployment 2>$null
-        # if ($env:ACR_NAME -and $skipContainer -eq 'true') {
-        #   Write-Host ""
-        #   Write-Host "===== Building Container Image =====" -ForegroundColor Yellow
-        #   Write-Host "Building and pushing image to ACR: $env:ACR_NAME" -ForegroundColor Cyan
-        #   
-        #   az acr build --registry $env:ACR_NAME --image content-gen-api:latest --file ./src/backend/ApiApp.Dockerfile ./src
-        #   
-        #   if ($LASTEXITCODE -eq 0) {
-        #     Write-Host "Container image built and pushed successfully!" -ForegroundColor Green
-        #     
-        #     # Enable container deployment and re-provision
-        #     Write-Host ""
-        #     Write-Host "===== Deploying Container Instance =====" -ForegroundColor Yellow
-        #     azd env set skipContainerDeployment false
-        #     
-        #     Write-Host "Re-running provision to deploy ACI..." -ForegroundColor Cyan
-        #     azd provision --no-prompt
-        #     
-        #     if ($LASTEXITCODE -eq 0) {
-        #       Write-Host "Container Instance deployed successfully!" -ForegroundColor Green
-        #     } else {
-        #       Write-Host "Container Instance deployment failed" -ForegroundColor Red
-        #     }
-        #   } else {
-        #     Write-Host "Failed to build container image" -ForegroundColor Red
-        #   }
-        # }
-        
         if ($env:CONTAINER_INSTANCE_NAME) {
           Write-Host ""
           Write-Host "Container Instance: " -NoNewline
@@ -169,48 +124,6 @@ hooks:
           Write-Host "$env:CONTAINER_INSTANCE_PRIVATE_IP" -ForegroundColor Cyan
         }
         
-        Write-Host ""
-        Write-Host "Container Registry: " -NoNewline
-        Write-Host "$env:ACR_NAME" -ForegroundColor Cyan
-        
-        # ============================================================
-        # Frontend Build/Deploy - COMMENTED OUT (using pre-built ACR image)
-        # ============================================================
-        # # Build and deploy frontend to App Service
-        # Write-Host ""
-        # Write-Host "===== Building Frontend =====" -ForegroundColor Yellow
-        # Push-Location ./src/frontend
-        # npm install
-        # npm run build
-        # 
-        # if ($LASTEXITCODE -eq 0) {
-        #   Write-Host "Frontend build completed!" -ForegroundColor Green
-        #   
-        #   # Copy build to frontend-server
-        #   Copy-Item -Path ../static/* -Destination ../frontend-server/static/ -Recurse -Force -ErrorAction SilentlyContinue
-        #   
-        #   Push-Location ../frontend-server
-        #   
-        #   # Create deployment package
-        #   Write-Host "Creating deployment package..."
-        #   Remove-Item -Path frontend-deploy.zip -Force -ErrorAction SilentlyContinue
-        #   Compress-Archive -Path static, server.js, package.json, package-lock.json -DestinationPath frontend-deploy.zip -Force
-        #   
-        #   Write-Host ""
-        #   Write-Host "===== Deploying Frontend to App Service =====" -ForegroundColor Yellow
-        #   az webapp deploy --resource-group $env:RESOURCE_GROUP_NAME --name $env:APP_SERVICE_NAME --src-path frontend-deploy.zip --type zip
-        #   
-        #   if ($LASTEXITCODE -eq 0) {
-        #     Write-Host "Frontend deployed successfully!" -ForegroundColor Green
-        #   } else {
-        #     Write-Host "Frontend deployment failed" -ForegroundColor Red
-        #   }
-        #   
-        #   Pop-Location
-        # } else {
-        #   Write-Host "Frontend build failed" -ForegroundColor Red
-        # }
-        # Pop-Location
         
         # Run post-deploy script to upload sample data and create search index
         Write-Host ""
@@ -272,43 +185,6 @@ hooks:
           --principal-id "$signed_user_id" \
           --scope "/" 2>/dev/null && echo "  Cosmos DB role assigned successfully" || echo "  Cosmos DB role may already be assigned"
         
-        # ============================================================
-        # ACR Image Build - COMMENTED OUT
-        # Images should be pre-built and pushed to ACR before deployment:
-        #   Frontend (App Service): content-gen-webapp:latest
-        #   Backend (ACI):          content-gen-api:latest
-        # 
-        # To build and push manually:
-        #   az acr build --registry $ACR_NAME --image content-gen-webapp:latest --file ./src/Frontend.Dockerfile ./src
-        #   az acr build --registry $ACR_NAME --image content-gen-api:latest --file ./src/backend/ApiApp.Dockerfile ./src
-        # ============================================================
-        
-        # # Build container image and deploy ACI if ACR exists and ACI was skipped
-        # skip_container=$(azd env get-value skipContainerDeployment 2>/dev/null || echo "")
-        # if [ -n "$ACR_NAME" ] && [ "$skip_container" = "true" ]; then
-        #   echo ""
-        #   echo "===== Building Container Image ====="
-        #   echo "Building and pushing image to ACR: $ACR_NAME"
-        #   
-        #   if az acr build --registry "$ACR_NAME" --image content-gen-api:latest --file ./src/backend/ApiApp.Dockerfile ./src; then
-        #     echo "Container image built and pushed successfully!"
-        #     
-        #     # Enable container deployment and re-provision
-        #     echo ""
-        #     echo "===== Deploying Container Instance ====="
-        #     azd env set skipContainerDeployment false
-        #     
-        #     echo "Re-running provision to deploy ACI..."
-        #     if azd provision --no-prompt; then
-        #       echo "Container Instance deployed successfully!"
-        #     else
-        #       echo "Container Instance deployment failed"
-        #     fi
-        #   else
-        #     echo "Failed to build container image"
-        #   fi
-        # fi
-        
         if [ -n "$CONTAINER_INSTANCE_NAME" ]; then
           echo ""
           echo "Container Instance: $CONTAINER_INSTANCE_NAME"
@@ -318,44 +194,6 @@ hooks:
         echo ""
         echo "Container Registry: $ACR_NAME"
         
-        # ============================================================
-        # Frontend Build/Deploy - COMMENTED OUT (using pre-built ACR image)
-        # ============================================================
-        # # Build and deploy frontend to App Service
-        # echo ""
-        # echo "===== Building Frontend ====="
-        # cd ./src/frontend
-        # if npm install && npm run build; then
-        #   echo "Frontend build completed!"
-        #   
-        #   # Copy build to frontend-server
-        #   cp -r ../static/* ../frontend-server/static/ 2>/dev/null || true
-        #   
-        #   cd ../frontend-server
-        #   
-        #   # Create deployment package
-        #   echo "Creating deployment package..."
-        #   rm -f frontend-deploy.zip
-        #   zip -r frontend-deploy.zip static/ server.js package.json package-lock.json
-        #   
-        #   echo ""
-        #   echo "===== Deploying Frontend to App Service ====="
-        #   if az webapp deploy \
-        #     --resource-group "$RESOURCE_GROUP_NAME" \
-        #     --name "$APP_SERVICE_NAME" \
-        #     --src-path frontend-deploy.zip \
-        #     --type zip; then
-        #     echo "Frontend deployed successfully!"
-        #   else
-        #     echo "Frontend deployment failed"
-        #   fi
-        #   
-        #   cd ../..
-        # else
-        #   echo "Frontend build failed"
-        #   cd ../..
-        # fi
-        
         # Run post-deploy script to upload sample data and create search index
         echo ""
         echo "===== Running Post-Deploy Script ====="

content-gen/infra/main.bicep

@@ -678,33 +678,6 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.30.0' = {
   }
 }
 
-// ========== Azure Container Registry ========== //
-// COMMENTED OUT: ACR is NOT deployed - images are pre-built and pushed to an existing ACR before deployment
-// The acrName parameter should be set to point to your existing ACR
-// Required images:
-//   - content-gen-webapp:latest (Frontend - App Service)
-//   - content-gen-api:latest (Backend - ACI, for private networking mode)
-// 
-// module containerRegistry 'br/public:avm/res/container-registry/registry:0.9.3' = {
-//   name: take('avm.res.container-registry.registry.${acrResourceName}', 64)
-//   params: {
-//     name: acrResourceName
-//     location: solutionLocation
-//     tags: tags
-//     enableTelemetry: enableTelemetry
-//     acrSku: 'Basic'
-//     acrAdminUserEnabled: false
-//     publicNetworkAccess: 'Enabled'
-//     roleAssignments: [
-//       {
-//         roleDefinitionIdOrName: '7f951dda-4ed3-4680-a7ca-43fe172d538d' // AcrPull
-//         principalId: userAssignedIdentity.outputs.principalId
-//         principalType: 'ServicePrincipal'
-//       }
-//     ]
-//   }
-// }
-
 // ========== Cosmos DB ========== //
 var cosmosDBResourceName = 'cosmos-${solutionSuffix}'
 var cosmosDBDatabaseName = 'content_generation_db'

content-gen/infra/modules/container-instance.bicep

@@ -1,6 +1,5 @@
 // ========== container-instance.bicep ========== //
 // Azure Container Instance module for backend API deployment
-// Supports both private (VNet) and public IP modes
 
 @description('Required. Name of the container group.')
 param name string
@@ -38,10 +37,6 @@ param registryServer string
 @description('Optional. User-assigned managed identity resource ID for ACR pull.')
 param userAssignedIdentityResourceId string = ''
 
-// ============== //
-// Variables      //
-// ============== //
-
 var isPrivateNetworking = !empty(subnetResourceId)
 
 // ============== //

content-gen/scripts/post_deploy.py

@@ -228,7 +228,7 @@ async def upload_images(config: ResourceConfig, dry_run: bool = False) -> int:
             print(f"  - {img.name}")
         return len(image_files)
 
-    # Upload images one at a time to avoid App Service gateway timeout (230s)
+    # Upload images one at a time
     uploaded_count = 0
 
     async with httpx.AsyncClient(timeout=120.0) as client:  # 2 minute timeout per image
@@ -243,7 +243,6 @@ async def upload_images(config: ResourceConfig, dry_run: bool = False) -> int:
                 "content_type": content_type,
                 "data": base64.b64encode(image_bytes).decode("utf-8")
             }
-            print_step(f"Uploading: {image_path.name} ({len(image_bytes):,} bytes)...")
 
             try:
                 response = await client.post(
@@ -257,7 +256,6 @@ async def upload_images(config: ResourceConfig, dry_run: bool = False) -> int:
                     return uploaded_count
 
                 if response.status_code == 200:
-                    print_success(f"{image_path.name}")
                     uploaded_count += 1
                 else:
                     print_error(f"{image_path.name}: API returned {response.status_code}")

content-gen/scripts/requirements-post-deploy.txt

@@ -2,7 +2,7 @@
 #
 # Installs the core application dependencies first, then adds post-deploy-only deps.
 
--r ../src/requirements.txt
+-r ../src/backend/requirements.txt
 
 # Post-deploy script deps
 azure-search-documents>=11.6.0