Merge pull request #5213 from microsoft/feature-track2-file-explorer

Merge feature track2 file explorer to develop

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/ProcessComboBox.java

@@ -9,8 +9,9 @@
 import com.intellij.ui.components.fields.ExtendableTextComponent;
 import com.microsoft.azure.management.appservice.WebAppBase;
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
-import com.microsoft.azure.toolkit.lib.appservice.ProcessInfo;
 import com.microsoft.azure.toolkit.lib.appservice.jfr.FlightRecorderManager;
+import com.microsoft.azure.toolkit.lib.appservice.model.ProcessInfo;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,7 +29,7 @@
 public class ProcessComboBox extends AzureComboBox<ProcessInfo> {
     @Setter
     @Getter
-    private WebAppBase appService;
+    private IAppService appService;
 
     @NotNull
     @Override

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/action/ProfileFlightRecordAction.java

@@ -9,19 +9,18 @@
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.WebAppBase;
 import com.microsoft.azure.toolkit.intellij.appservice.jfr.RunFlightRecorderDialog;
 import com.microsoft.azure.toolkit.lib.appservice.jfr.FlightRecorderConfiguration;
 import com.microsoft.azure.toolkit.lib.appservice.jfr.FlightRecorderManager;
 import com.microsoft.azure.toolkit.lib.appservice.jfr.FlightRecorderStarterBase;
+import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.appservice.utils.Utils;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperationBundle;
 import com.microsoft.azure.toolkit.lib.common.operation.IAzureOperationTitle;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
-import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
 import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.intellij.util.PluginUtil;
@@ -50,12 +49,13 @@ public class ProfileFlightRecordAction extends NodeActionListener {
     private final Project project;
     private final String webAppId;
 
-    private WebAppBase appService;
+    private IAppService appService;
 
     public ProfileFlightRecordAction(WebAppNode webAppNode) {
         super();
         this.project = (Project) webAppNode.getProject();
         this.webAppId = webAppNode.getWebAppId();
+        this.appService = webAppNode.getWebappManager();
     }
 
     @Override
@@ -73,9 +73,7 @@ private void doProfileFlightRecorderAll() {
             // prerequisite check
             final String subscriptionId = AzureMvpModel.getSegment(webAppId, "subscriptions");
             // Always get latest app service status, workaround for https://dev.azure.com/mseng/VSJava/_workitems/edit/1797916
-            appService = AzureWebAppMvpModel.getInstance().getWebAppById(subscriptionId, webAppId);
-            if (appService.operatingSystem() == OperatingSystem.LINUX &&
-                StringUtils.containsIgnoreCase(appService.linuxFxVersion(), "DOCKER|")) {
+            if (appService.getRuntime().getOperatingSystem() == OperatingSystem.DOCKER) {
                 final String message = message("webapp.flightRecord.error.notSupport.message", appService.name());
                 notifyUserWithErrorMessage(message("webapp.flightRecord.error.notSupport.title"), message);
                 return;
@@ -117,7 +115,7 @@ private void doProfileFlightRecorderAll() {
 
     private FlightRecorderConfiguration collectFlightRecorderConfiguration() {
         RunFlightRecorderDialog ui = new RunFlightRecorderDialog(project, appService);
-        ui.setTitle(message("webapp.flightRecord.task.startRecorder.title", appService.defaultHostName()));
+        ui.setTitle(message("webapp.flightRecord.task.startRecorder.title", appService.hostName()));
         ui.setOkActionListener((config) -> {
             ui.close(DialogWrapper.OK_EXIT_CODE);
         });

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/jfr/RunFlightRecorderDialog.java

@@ -6,11 +6,11 @@
 package com.microsoft.azure.toolkit.intellij.appservice.jfr;
 
 import com.intellij.openapi.project.Project;
-import com.microsoft.azure.management.appservice.WebAppBase;
 import com.microsoft.azure.toolkit.intellij.appservice.ProcessComboBox;
 import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
-import com.microsoft.azure.toolkit.lib.appservice.ProcessInfo;
 import com.microsoft.azure.toolkit.lib.appservice.jfr.FlightRecorderConfiguration;
+import com.microsoft.azure.toolkit.lib.appservice.model.ProcessInfo;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
@@ -28,9 +28,9 @@ public class RunFlightRecorderDialog extends AzureDialog<FlightRecorderConfigura
     private ProcessComboBox processComboBox1;
     private DurationPanel durationPanel;
 
-    private WebAppBase appService;
+    private IAppService appService;
 
-    public RunFlightRecorderDialog(final Project project, WebAppBase appService) {
+    public RunFlightRecorderDialog(final Project project, IAppService appService) {
         super(project);
         this.appService = appService;
         this.init();

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/TunnelProxy.java

@@ -7,8 +7,8 @@
 
 import com.google.common.base.Joiner;
 import com.jcraft.jsch.*;
-import com.microsoft.azure.management.appservice.PublishingProfile;
-import com.microsoft.azure.management.appservice.WebAppBase;
+import com.microsoft.azure.toolkit.lib.appservice.model.PublishingProfile;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.common.utils.WebSocketSSLProxy;
 import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.NotNull;
@@ -29,21 +29,21 @@ public class TunnelProxy {
     public static final String DEFAULT_SSH_PASSWORD = "Docker!";
     private static final Logger logger = Logger.getLogger(TunnelProxy.class.getName());
     private static final String LOCALHOST = "localhost";
-    private WebAppBase webAppBase;
+    private IAppService appService;
     private WebSocketSSLProxy wssProxy;
 
-    public TunnelProxy(@NotNull WebAppBase webAppBase) {
-        this.webAppBase = webAppBase;
+    public TunnelProxy(@NotNull IAppService webAppBase) {
+        this.appService = webAppBase;
         reset();
     }
 
     public void reset() {
-        String host = webAppBase.defaultHostName().toLowerCase().replace("http://", "").replace("https://", "");
+        String host = appService.hostName().toLowerCase().replace("http://", "").replace("https://", "");
         String[] parts = host.split("\\.", 2);
         host = Joiner.on('.').join(parts[0], "scm", parts[1]);
-        PublishingProfile publishingProfile = webAppBase.getPublishingProfile();
+        PublishingProfile publishingProfile = appService.getPublishingProfile();
         wssProxy = new WebSocketSSLProxy(String.format("wss://%s/AppServiceTunnel/Tunnel.ashx", host),
-                                         publishingProfile.gitUsername(), publishingProfile.gitPassword());
+                                         publishingProfile.getGitUsername(), publishingProfile.getGitPassword());
     }
 
     public void close() {

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/jfr/CommandOutput.java

@@ -5,8 +5,8 @@
 
 package com.microsoft.azure.toolkit.lib.appservice.jfr;
 
-import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.WebAppBase;
+import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -17,14 +17,14 @@
 public class FlightRecorderManager {
     private static Map<String, FlightRecorderStarterBase> jfrStarters = new ConcurrentHashMap<>();
 
-    public static FlightRecorderStarterBase getFlightRecorderStarter(@NotNull WebAppBase appService) {
+    public static FlightRecorderStarterBase getFlightRecorderStarter(@NotNull IAppService appService) {
         return jfrStarters.computeIfAbsent(appService.id(), id -> {
-            if (appService.operatingSystem() == OperatingSystem.LINUX) {
+            if (appService.getRuntime().getOperatingSystem() == OperatingSystem.LINUX) {
                 return new LinuxFlightRecorderStarter(appService);
-            } else if (appService.operatingSystem() == OperatingSystem.WINDOWS) {
+            } else if (appService.getRuntime().getOperatingSystem() == OperatingSystem.WINDOWS) {
                 return new WindowFlightRecorderStarter(appService);
             } else {
-                throw new IllegalStateException(message("appService.jfr.error.unknownOs", appService.operatingSystem(), appService.name()));
+                throw new IllegalStateException(message("appService.jfr.error.unknownOs", appService.getRuntime().getOperatingSystem(), appService.name()));
             }
         });
     }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/jfr/FlightRecorderKuduClient.java

@@ -5,20 +5,21 @@
 
 package com.microsoft.azure.toolkit.lib.appservice.jfr;
 
-import com.microsoft.azure.management.appservice.WebAppBase;
-import com.microsoft.azure.toolkit.lib.appservice.ProcessInfo;
+import com.azure.core.util.FluxUtil;
+import com.microsoft.azure.toolkit.lib.appservice.model.ProcessInfo;
+import com.microsoft.azure.toolkit.lib.appservice.model.CommandOutput;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
+import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.List;
 
 public abstract class FlightRecorderStarterBase {
-    protected WebAppBase appService;
-    protected FlightRecorderKuduClient client;
+    protected IAppService appService;
 
-    public FlightRecorderStarterBase(@NotNull WebAppBase appService) {
+    public FlightRecorderStarterBase(@NotNull IAppService appService) {
         this.appService = appService;
-        client = new FlightRecorderKuduClient(appService);
     }
 
     public abstract List<ProcessInfo> listProcess() throws IOException;
@@ -33,6 +34,7 @@ protected String constructJcmdCommand(int pid, int timeInSeconds, String fileNam
     public abstract CommandOutput startFlightRecorder(int pid, int timeInSeconds, String fileName) throws IOException;
 
     public byte[] downloadJFRFile(String fileName) {
-        return client.getFileContent(getFinalJfrPath(fileName));
+        return FluxUtil.collectBytesInByteBufferStream(appService.getFileContent(getFinalJfrPath(fileName))).blockOptional()
+                .orElseThrow(() -> new AzureToolkitRuntimeException(String.format("Failed to download JFR file %s from %s", fileName, appService.name())));
     }
 }