Get the ADServicePrincipal id

microsoft · Sep 19, 2024 · e32d851 · e32d851
1 parent 925dbc4
commit e32d851
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build/jobs/provision-deploy.yml b/build/jobs/provision-deploy.yml
@@ -132,7 +132,8 @@ jobs:
         if("${{ parameters.sql }}" -eq "false"){
             Write-Host "Add DevOps MI permission to Cosmos databases"
 
-            $principalId = (Get-AzContext).Account.Id
+            $account = Get-AzContext
+            $principalId = (Get-AzADServicePrincipal -ApplicationId $account.Account.Id).Id
 
             New-AzCosmosDBSqlRoleAssignment `
               -AccountName $webAppName `

diff --git a/build/jobs/run-tests.yml b/build/jobs/run-tests.yml
@@ -48,6 +48,7 @@ jobs:
         Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_TENANT_ID]$env:AZURESUBSCRIPTION_TENANT_ID"
         Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_SERVICE_CONNECTION_ID]$env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID"
 
+        $appServiceName = '${{ parameters.appServiceName }}'
         $appSettings = (Get-AzWebApp -ResourceGroupName $(ResourceGroupName) -Name $appServiceName).SiteConfig.AppSettings
         $dataStoreResourceId = $appSettings | where {$_.Name -eq "FhirServer__ResourceManager__DataStoreResourceId"}
         $dataStoreResourceId = $dataStoreResourceId[0].Value