Fixes issues in v3.48.0 end game (#4886)

* Close AzureComboBox dropdown when click extension button

* Read expose port from docker file during docker run

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java

@@ -270,7 +270,12 @@ protected JTextField createEditorComponent() {
         }
 
         protected ExtendableTextComponent.Extension getExtension() {
-            return AzureComboBox.this.getExtension();
+            final ExtendableTextComponent.Extension extension = AzureComboBox.this.getExtension();
+            return extension == null ? null : ExtendableTextComponent.Extension.create(
+                extension.getIcon(true), extension.getTooltip(), () -> {
+                    AzureComboBox.this.hidePopup();
+                    extension.getActionOnClick().run();
+                });
         }
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/container/dockerhost/DockerHostRunState.java

@@ -22,9 +22,6 @@
 
 package com.microsoft.intellij.runner.container.dockerhost;
 
-import static com.microsoft.azuretools.telemetry.TelemetryConstants.DEPLOY_WEBAPP_DOCKERLOCAL;
-import static com.microsoft.azuretools.telemetry.TelemetryConstants.WEBAPP;
-
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessListener;
 import com.intellij.execution.process.ProcessOutputTypes;
@@ -41,22 +38,29 @@
 import com.microsoft.intellij.util.MavenRunTaskUtil;
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.messages.Container;
-
 import com.spotify.docker.client.shaded.com.google.common.collect.ImmutableList;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.FileNotFoundException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.microsoft.azuretools.telemetry.TelemetryConstants.DEPLOY_WEBAPP_DOCKERLOCAL;
+import static com.microsoft.azuretools.telemetry.TelemetryConstants.WEBAPP;
 
 public class DockerHostRunState extends AzureRunProfileState<String> {
+    private static final String DEFAULT_PORT = Constant.TOMCAT_SERVICE_PORT;
+    private static final Pattern PORT_PATTERN = Pattern.compile("EXPOSE\\s+(\\d+).*");
     private static final String DOCKER_PING_ERROR = "Failed to connect docker host: %s\nIs Docker installed and running?";
     private final DockerHostRunSetting dataModel;
 
-
     public DockerHostRunState(Project project, DockerHostRunSetting dataModel) {
         super(project);
         this.dataModel = dataModel;
@@ -140,9 +144,11 @@ public void onTextAvailable(ProcessEvent processEvent, Key key) {
         );
 
         // docker run
+        final String port = getPortFromDockerfile(content);
         String containerId = DockerUtil.createContainer(
                 docker,
-                String.format("%s:%s", dataModel.getImageName(), dataModel.getTagName())
+                String.format("%s:%s", dataModel.getImageName(), dataModel.getTagName()),
+                port
         );
         runningContainerId[0] = containerId;
         Container container = DockerUtil.runContainer(docker, containerId);
@@ -152,7 +158,7 @@ public void onTextAvailable(ProcessEvent processEvent, Key key) {
         ImmutableList<Container.PortMapping> ports = container.ports();
         if (ports != null) {
             for (Container.PortMapping portMapping : ports) {
-                if (Constant.TOMCAT_SERVICE_PORT.equals(String.valueOf(portMapping.privatePort()))) {
+                if (StringUtils.equals(port, String.valueOf(portMapping.privatePort()))) {
                     publicPort = String.valueOf(portMapping.publicPort());
                 }
             }
@@ -182,4 +188,12 @@ protected void updateTelemetryMap(@NotNull Map<String, String> telemetryMap) {
             telemetryMap.put("FileType", "");
         }
     }
+
+    private String getPortFromDockerfile(@NotNull String dockerFileContent) {
+        final Matcher result = Arrays.stream(dockerFileContent.split("\\R+"))
+                                     .map(value -> PORT_PATTERN.matcher(value))
+                                     .filter(Matcher::matches)
+                                     .findFirst().orElse(null);
+        return result == null ? DEFAULT_PORT : result.group(1);
+    }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/container/utils/DockerUtil.java

@@ -66,20 +66,20 @@ public static void createDockerFile(String basePath, String folderName, String f
     /**
      * create container with specified ImageName:TagName.
      */
-    public static String createContainer(DockerClient docker, String imageNameWithTag)
+    public static String createContainer(DockerClient docker, String imageNameWithTag, String port)
             throws DockerException, InterruptedException {
         final Map<String, List<PortBinding>> portBindings = new HashMap<>();
         List<PortBinding> randomPort = new ArrayList<>();
         PortBinding randomBinding = PortBinding.randomPort("0.0.0.0");
         randomPort.add(randomBinding);
-        portBindings.put(Constant.TOMCAT_SERVICE_PORT, randomPort);
+        portBindings.put(port, randomPort);
 
         final HostConfig hostConfig = HostConfig.builder().portBindings(portBindings).build();
 
         final ContainerConfig config = ContainerConfig.builder()
                 .hostConfig(hostConfig)
                 .image(imageNameWithTag)
-                .exposedPorts(Constant.TOMCAT_SERVICE_PORT)
+                .exposedPorts(port)
                 .build();
         final ContainerCreation container = docker.createContainer(config);
         return container.id();