fixes #97

Author: dantelmomsft

app/start-compose.ps1 renamed to deploy/aca/start-compose.ps1

@@ -1,4 +1,4 @@
-$output = azd -C ..\deploy\aca env get-values
+$output = azd env get-values
 
 foreach ($line in $output) {
   $name, $value = $line.Split("=")

app/compose.yaml renamed to deploy/aks/compose.yaml

@@ -0,0 +1,56 @@
+$output = azd env get-values
+
+foreach ($line in $output) {
+  $name, $value = $line.Split("=")
+  $value = $value -replace '^\"|\"$'
+  [Environment]::SetEnvironmentVariable($name, $value)
+}
+
+Write-Host "Environment variables set."
+$roles = @(
+    "5e0bd9bd-7b93-4f28-af87-19fc36ad61bd",
+    "a97b65f3-24c7-4388-baec-2e87135dc908",
+    "2a2b9908-6ea1-4ae2-8e65-a410df84e7d1",
+    "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
+    "1407120a-92aa-4202-b7e9-c0e197c71c8f",
+    "8ebe5a00-799e-43f5-93ac-243d3dce84a7",
+    "7ca78c08-252a-4471-8644-bb5ff32d4ba0",
+    "4f6d3b9b-027b-4f4c-9142-0e5a2a2247e0"
+)
+
+# Check if service principal exists
+$servicePrincipal = $(az ad sp list --display-name "azure-ai-chat-java-spi" --query [].appId --output tsv)
+
+if ([string]::IsNullOrEmpty($servicePrincipal)) {
+    Write-Host "Service principal not found. Creating service principal"
+    $servicePrincipal = $(az ad sp create-for-rbac --name "azure-ai-chat-java-spi" --role reader --scopes "/subscriptions/$($env:AZURE_SUBSCRIPTION_ID)/resourceGroups/$($env:AZURE_RESOURCE_GROUP)" --query appId --output tsv)
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "Failed to create service principal"
+        exit $LASTEXITCODE
+    }
+    $servicePrincipalObjectId = $(az ad sp show --id $servicePrincipal --query id --output tsv)
+    Write-Host "Assigning Roles to service principal azure-ai-chat-java-spi with principal id: $servicePrincipal and object id[$servicePrincipalObjectId]"
+    foreach ($role in $roles) {
+        Write-Host "Assigning Role[$role] to principal id[$servicePrincipal] for resource[/subscriptions/$($env:AZURE_SUBSCRIPTION_ID)/resourceGroups/$($env:AZURE_RESOURCE_GROUP)]"
+        az role assignment create `
+            --role $role `
+            --assignee-object-id $servicePrincipalObjectId `
+            --scope "/subscriptions/$($env:AZURE_SUBSCRIPTION_ID)/resourceGroups/$($env:AZURE_RESOURCE_GROUP)" `
+            --assignee-principal-type ServicePrincipal
+    }
+}
+
+$servicePrincipalPassword = $(az ad sp credential reset --id $servicePrincipal --query password --output tsv)
+$servicePrincipalTenant = $(az ad sp show --id $servicePrincipal --query appOwnerOrganizationId --output tsv)
+
+# Set environment variables
+[Environment]::SetEnvironmentVariable("servicePrincipal", $servicePrincipal)
+[Environment]::SetEnvironmentVariable("servicePrincipalPassword", $servicePrincipalPassword)
+[Environment]::SetEnvironmentVariable("servicePrincipalTenant", $servicePrincipalTenant)
+
+
+Write-Host ""
+Write-Host "Starting solution locally using docker compose."
+Write-Host ""
+
+docker compose -f ./compose.yaml up

deploy/aks/start-compose.ps1

@@ -213,10 +213,10 @@ azd up
     az login
     ```
 
-2. Change dir to `app`
+2. Change dir to `deploy/aca`
 
     ```shell
-    cd app
+    cd deploy/aca
     ```
 
 3. Run the `./start-compose.ps1` (Windows) or `./start-compose.sh` (Linux/Mac) scripts or run the "VS Code Task: Start App" to start the project locally.

app/start-compose.sh renamed to deploy/aks/start-compose.sh

@@ -199,10 +199,10 @@ azd up
     az login
     ```
 
-2. Change dir to `app`
+2. Change dir to `deploy/aks`
 
     ```shell
-    cd app
+    cd deploy/aks
     ```
 
 3. Run the `./start-compose.ps1` (Windows) or `./start-compose.sh` (Linux/Mac) scripts or run the "VS Code Task: Start App" to start the project locally.