From 5ee988a3b2ea54c57c609a6aecb16e4e7baef929 Mon Sep 17 00:00:00 2001
From: Carlos Emiliano Castro Trejo <ccastrotrejo@microsoft.com>
Date: Wed, 4 Dec 2024 10:36:18 -0600
Subject: [PATCH] Add decision to add promise for hybrid logic apps

---
 apps/vs-code-designer/package.json            |  1 -
 apps/vs-code-designer/src/LogicAppResolver.ts | 12 ++++++++----
 pnpm-lock.yaml                                |  3 ---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/vs-code-designer/package.json b/apps/vs-code-designer/package.json
index a4d2e91014a..ac48f7d184d 100644
--- a/apps/vs-code-designer/package.json
+++ b/apps/vs-code-designer/package.json
@@ -16,7 +16,6 @@
     "@azure/arm-appcontainers": "^2.0.0-beta.3",
     "@microsoft/vscode-azureresources-api": "^2.0.2",
     "@azure/arm-resourcegraph": "^4.2.1",
-    "@azure/identity": "^4.5.0",
     "@types/adm-zip": "^0.5.1",
     "@types/fs-extra": "^11.0.4",
     "@types/vscode": "1.76.0",
diff --git a/apps/vs-code-designer/src/LogicAppResolver.ts b/apps/vs-code-designer/src/LogicAppResolver.ts
index 4b56e87724a..d82987f339c 100644
--- a/apps/vs-code-designer/src/LogicAppResolver.ts
+++ b/apps/vs-code-designer/src/LogicAppResolver.ts
@@ -9,7 +9,6 @@ import { ResourceGraphClient } from '@azure/arm-resourcegraph';
 import { LogicAppResourceTree } from './app/tree/LogicAppResourceTree';
 import { logicAppFilter } from './constants';
 import { ext } from './extensionVariables';
-import { DefaultAzureCredential } from '@azure/identity';
 
 export class LogicAppResolver implements AppResourceResolver {
   private siteCacheLastUpdated = 0;
@@ -48,8 +47,7 @@ export class LogicAppResolver implements AppResourceResolver {
     subContext: ISubscriptionContext
   ): Promise<{ logicApps: Map<string, Site>; hybridLogicApps: Map<string, ContainerApp> }> {
     const client = await createWebSiteClient({ ...context, ...subContext });
-    const credential = new DefaultAzureCredential();
-    const resourceGraphClient = new ResourceGraphClient(credential);
+    const resourceGraphClient = new ResourceGraphClient(subContext.credentials);
 
     if (this.siteCacheLastUpdated < Date.now() - 1000 * 3) {
       this.siteCacheLastUpdated = Date.now();
@@ -98,8 +96,14 @@ export class LogicAppResolver implements AppResourceResolver {
           });
       });
 
+      const resolverPromises = [promiseLogicApp];
+
+      if (subContext.environment.resourceManagerEndpointUrl === 'https://management.azure.com/') {
+        resolverPromises.push(promiseHybridLogicApp);
+      }
+
       this.listLogicAppsTask = new Promise((resolve, reject) => {
-        Promise.all([promiseLogicApp, promiseHybridLogicApp])
+        Promise.all(resolverPromises)
           .then(() => {
             resolve();
           })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 75f24bdda30..3015c96f205 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -401,9 +401,6 @@ importers:
       '@azure/arm-storage':
         specifier: 17.2.1
         version: 17.2.1
-      '@azure/identity':
-        specifier: ^4.5.0
-        version: 4.5.0
       '@azure/ms-rest-js':
         specifier: ^2.6.4
         version: 2.7.0