Merge pull request #1378 from solliancenet/mg-cherry-pick-pr1377

Cherry pick from PR 1377 into Release 0.8.0
solliancenet · Aug 8, 2024 · 6357c3e · 6357c3e
2 parents 515e330 + fa4d9d6
commit 6357c3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/deploy/standard/azd-hooks/predeploy.ps1 b/deploy/standard/azd-hooks/predeploy.ps1
@@ -80,11 +80,11 @@ try {
     }
 
     $entraClientIds = @{
-        authorization = $env:FLLM_AUTHORIZATION_CLIENT_ID
-        chat          = $env:FLLM_USER_PORTAL_CLIENT_ID
-        core          = $env:FLLM_CORE_API_CLIENT_ID
-        managementapi = $env:FLLM_MANAGEMENT_API_CLIENT_ID
-        managementui  = $env:FLLM_MANAGEMENT_PORTAL_CLIENT_ID
+        authorization = $env:ENTRA_AUTH_API_CLIENT_ID
+        chat          = $env:ENTRA_CHAT_UI_CLIENT_ID
+        core          = $env:ENTRA_CORE_API_CLIENT_ID
+        managementapi = $env:ENTRA_MANAGEMENT_API_CLIENT_ID
+        managementui  = $env:ENTRA_MANAGEMENT_UI_CLIENT_ID
     }
 
     $entraScopes = @{

diff --git a/deploy/standard/infra/main.parameters.json b/deploy/standard/infra/main.parameters.json
@@ -6,7 +6,7 @@
         "value": "${FLLM_ALLOWED_CIDR=192.168.101.0/28}"
       },
       "authAppRegistrationClientId": {
-        "value": "${FLLM_AUTHORIZATION_CLIENT_ID}"
+        "value": "${ENTRA_AUTH_API_CLIENT_ID}"
       },
       "authAppRegistrationInstance": {
         "value": "${ENTRA_AUTH_API_INSTANCE=https://login.microsoftonline.com}"
@@ -45,7 +45,7 @@
         "value": "${FOUNDATIONALLM_HUB_TENANT_ID}"
       },
       "hubVnetName": {
-        "value": "${FOUNDATIONALL_HUB_VNET_NAME}"
+        "value": "${FOUNDATIONALLM_HUB_VNET_NAME}"
       },
       "instanceId": {
         "value": "${FOUNDATIONALLM_INSTANCE_ID=''}"