Merge pull request #5296 from microsoft/qianjin-s187-bugfix-02

bugfix: long loading time during opening resource in portal.

Author: shenqianjin

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/helpers/azure/sdk/AzureSDKManager.java

@@ -28,6 +28,7 @@
 import com.microsoft.azure.management.storage.SkuName;
 import com.microsoft.azure.management.storage.StorageAccount;
 import com.microsoft.azure.management.storage.StorageAccountSkuType;
+import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
@@ -264,7 +265,8 @@ public static List<String> getLocationsForInsights(String subscriptionId) throws
         if (azureManager == null) {
             return Collections.emptyList();
         }
-        final String accessToken = azureManager.getAccessToken(azureManager.getTenantIdBySubscription(subscriptionId));
+        Subscription subscription = com.microsoft.azure.toolkit.lib.Azure.az(AzureAccount.class).account().getSubscription(subscriptionId);
+        final String accessToken = azureManager.getAccessToken(subscription.getTenantId());
         request.setHeader("Authorization", String.format("Bearer %s", accessToken));
         final CloseableHttpResponse response = HttpClients.createDefault().execute(request);
         final InputStream responseStream = response.getEntity().getContent();

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/Node.java

@@ -7,6 +7,9 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
+import com.microsoft.azure.toolkit.lib.Azure;
+import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
+import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
@@ -429,10 +432,10 @@ public void openResourcesInPortal(String subscriptionId, String resourceId) {
             return;
         }
         final String portalUrl = azureManager.getPortalUrl();
-        final String tenantId = azureManager.getTenantIdBySubscription(subscriptionId);
+        Subscription subscription = Azure.az(AzureAccount.class).account().getSubscription(subscriptionId);
         final String url = portalUrl
                 + REST_SEGMENT_JOB_MANAGEMENT_TENANTID
-                + tenantId
+                + subscription.getTenantId()
                 + REST_SEGMENT_JOB_MANAGEMENT_RESOURCE
                 + resourceId;
         DefaultLoader.getIdeHelper().openLinkInBrowser(url);

Utils/azuretools-core/src/com/microsoft/azuretools/sdkmanage/AzureManager.java

@@ -52,8 +52,6 @@ default List<String> getSelectedSubscriptionIds() {
 
     String getStorageEndpointSuffix();
 
-    String getTenantIdBySubscription(String subscriptionId);
-
     String getScmSuffix();
 
     Environment getEnvironment();

Utils/azuretools-core/src/com/microsoft/azuretools/sdkmanage/AzureManagerBase.java

@@ -23,12 +23,9 @@
 import com.microsoft.azuretools.authmanage.SubscriptionManager;
 import com.microsoft.azuretools.authmanage.interact.INotification;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
-import com.microsoft.azuretools.enums.ErrorEnum;
-import com.microsoft.azuretools.exception.AzureRuntimeException;
 import com.microsoft.azuretools.telemetry.TelemetryInterceptor;
 import com.microsoft.azuretools.utils.AzureRegisterProviderNamespaces;
 import com.microsoft.azuretools.utils.Pair;
-
 import okhttp3.internal.http2.Settings;
 import org.apache.commons.lang3.StringUtils;
 
@@ -100,16 +97,6 @@ public String getScmSuffix() {
         }
     }
 
-    @Override
-    @AzureOperation(name = "account|subscription.get_tenant", params = {"subscriptionId"}, type = AzureOperation.Type.TASK)
-    public String getTenantIdBySubscription(String subscriptionId) {
-        final Pair<Subscription, Tenant> subscriptionTenantPair = getSubscriptionsWithTenant().stream()
-                .filter(pair -> pair != null && pair.first() != null && pair.second() != null)
-                .filter(pair -> StringUtils.equals(pair.first().getId(), subscriptionId))
-                .findFirst().orElseThrow(() -> new AzureRuntimeException(ErrorEnum.INVALID_SUBSCRIPTION_CACHE));
-        return subscriptionTenantPair.second().tenantId();
-    }
-
     protected <T extends AzureConfigurable<T>> T buildAzureManager(AzureConfigurable<T> configurable) {
         return configurable.withInterceptor(new TelemetryInterceptor())
                 .withUserAgent(CommonSettings.USER_AGENT);