Merge pull request #5217 from microsoft/track2/asc/3-logstreaming

migrate to track2 based azure-toolkit-springcloud-lib for logstreaming

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/streaminglog/SpringCloudStreamingLogAction.java

@@ -6,8 +6,6 @@
 package com.microsoft.azure.toolkit.intellij.springcloud.streaminglog;
 
 import com.intellij.openapi.project.Project;
-import com.microsoft.azure.management.appplatform.v2020_07_01.DeploymentInstance;
-import com.microsoft.azure.management.appplatform.v2020_07_01.implementation.AppPlatformManager;
 import com.microsoft.azure.management.resources.fluentcore.arm.ResourceId;
 import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
 import com.microsoft.azure.toolkit.lib.Azure;
@@ -17,8 +15,9 @@
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.springcloud.AzureSpringCloud;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
+import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
 import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudDeployment;
-import com.microsoft.azuretools.authmanage.AuthMethodManager;
+import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudDeploymentInstanceEntity;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.intellij.util.PluginUtil;
@@ -32,6 +31,7 @@
 import org.apache.commons.lang.StringUtils;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import static com.microsoft.azuretools.telemetry.TelemetryConstants.SPRING_CLOUD;
@@ -58,7 +58,8 @@ public SpringCloudStreamingLogAction(SpringCloudAppNode springCloudAppNode) {
         final ResourceId appId = ResourceId.fromString(this.appId);
         final String subscriptionId = appId.subscriptionId();
         final String clusterName = appId.parent().name();
-        this.app = Azure.az(AzureSpringCloud.class).subscription(subscriptionId).cluster(clusterName).app(appId.name());
+        final SpringCloudCluster cluster = Azure.az(AzureSpringCloud.class).subscription(subscriptionId).cluster(clusterName);
+        this.app = Objects.requireNonNull(cluster, String.format("cluster(%s) not exist", clusterName)).app(appId.name());
     }
 
     @Override
@@ -74,7 +75,7 @@ protected void actionPerformed(NodeActionEvent nodeActionEvent) throws AzureCmdE
                             PluginUtil.displayWarningDialog(FAILED_TO_START_LOG_STREAMING, NO_ACTIVE_DEPLOYMENT));
                         return;
                     }
-                    final List<DeploymentInstance> instances = deployment.entity().getInstances();
+                    final List<SpringCloudDeploymentInstanceEntity> instances = deployment.entity().getInstances();
                     if (CollectionUtils.isEmpty(instances)) {
                         DefaultLoader.getIdeHelper().invokeLater(() ->
                             PluginUtil.displayWarningDialog(FAILED_TO_START_LOG_STREAMING, NO_AVAILABLE_INSTANCES));
@@ -90,12 +91,12 @@ protected void actionPerformed(NodeActionEvent nodeActionEvent) throws AzureCmdE
         });
     }
 
-    private void showLogStreamingDialog(List<DeploymentInstance> instances) {
+    private void showLogStreamingDialog(List<? extends SpringCloudDeploymentInstanceEntity> instances) {
         DefaultLoader.getIdeHelper().invokeLater(() -> {
             final SpringCloudStreamingLogDialog dialog = new SpringCloudStreamingLogDialog(project, instances);
             if (dialog.showAndGet()) {
-                final DeploymentInstance target = dialog.getInstance();
-                SpringCloudStreamingLogManager.getInstance().showStreamingLog(project, appId, target.name());
+                final SpringCloudDeploymentInstanceEntity target = dialog.getInstance();
+                SpringCloudStreamingLogManager.getInstance().showStreamingLog(project, appId, target.getName());
             }
         });
     }
@@ -114,8 +115,4 @@ protected String getOperationName(final NodeActionEvent event) {
     public int getGroup() {
         return Groupable.DIAGNOSTIC_GROUP;
     }
-
-    private static AppPlatformManager getSpringManager(String sid) {
-        return AuthMethodManager.getInstance().getAzureSpringCloudClient(sid);
-    }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/streaminglog/SpringCloudStreamingLogDialog.java

@@ -7,7 +7,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.ListCellRendererWithRightAlignedComponent;
-import com.microsoft.azure.management.appplatform.v2020_07_01.DeploymentInstance;
+import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudDeploymentInstanceEntity;
 import com.microsoft.intellij.ui.components.AzureDialogWrapper;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,31 +17,31 @@
 public class SpringCloudStreamingLogDialog extends AzureDialogWrapper {
 
     private JPanel pnlRoot;
-    private JComboBox<DeploymentInstance> cbInstances;
+    private JComboBox<SpringCloudDeploymentInstanceEntity> cbInstances;
 
-    private DeploymentInstance instance;
+    private SpringCloudDeploymentInstanceEntity instance;
 
-    public SpringCloudStreamingLogDialog(@Nullable final Project project, List<DeploymentInstance> instances) {
+    public SpringCloudStreamingLogDialog(@Nullable final Project project, List<? extends SpringCloudDeploymentInstanceEntity> instances) {
         super(project, false);
-        setTitle("Select instance");
+        setTitle("Select Instance");
         instances.forEach(instance -> cbInstances.addItem(instance));
-        cbInstances.setRenderer(new ListCellRendererWithRightAlignedComponent<DeploymentInstance>() {
+        cbInstances.setRenderer(new ListCellRendererWithRightAlignedComponent<>() {
             @Override
-            protected void customize(final DeploymentInstance deploymentInstance) {
-                setLeftText(deploymentInstance.name());
+            protected void customize(final SpringCloudDeploymentInstanceEntity deploymentInstance) {
+                setLeftText(deploymentInstance.getName());
             }
         });
 
         init();
     }
 
-    public DeploymentInstance getInstance() {
+    public SpringCloudDeploymentInstanceEntity getInstance() {
         return instance;
     }
 
     @Override
     protected void doOKAction() {
-        instance = (DeploymentInstance) cbInstances.getSelectedItem();
+        instance = (SpringCloudDeploymentInstanceEntity) cbInstances.getSelectedItem();
         super.doOKAction();
     }