Merge pull request #5427 from microsoft/qianjin-endgame-june-fix

[Bugfix 1854295] Local run will pop up error when when the IDE window exceeds 1

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/ModuleResource.java

@@ -5,10 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.connector;
 
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
 import com.microsoft.azure.toolkit.intellij.common.AzureFormJPanel;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import lombok.EqualsAndHashCode;
@@ -18,8 +15,6 @@
 import org.jdom.Element;
 
 import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.Objects;
 
 @Getter
 @RequiredArgsConstructor
@@ -29,23 +24,12 @@ public final class ModuleResource implements Resource {
     private final String type = Definition.IJ_MODULE.type;
     @EqualsAndHashCode.Include
     private final String moduleName;
-    private Module module;
 
     @Override
     public String getId() {
         return moduleName;
     }
 
-    public Module getModule() {
-        if (this.module == null) {
-            final Project project = ProjectManager.getInstance().getOpenProjects()[0];
-            this.module = Arrays.stream(ModuleManager.getInstance(project).getModules())
-                    .filter(m -> Objects.equals(m.getName(), moduleName)).findAny()
-                    .orElse(null);
-        }
-        return this.module;
-    }
-
     public String toString() {
         return String.format("Module \"%s\"", this.moduleName);
     }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/connector/database/DatabaseResourceConnection.java

@@ -85,7 +85,7 @@ public boolean isApplicableFor(@Nonnull RunConfiguration configuration) {
     @Override
     @AzureOperation(name = "connector|mysql.prepare_before_run", type = AzureOperation.Type.ACTION)
     public boolean prepareBeforeRun(@Nonnull RunConfiguration configuration, DataContext dataContext) {
-        this.env = this.initEnv();
+        this.env = this.initEnv(configuration.getProject());
         if (configuration instanceof WebAppConfiguration) { // set envs for remote deploy
             final WebAppConfiguration webAppConfiguration = (WebAppConfiguration) configuration;
             webAppConfiguration.setApplicationSettings(this.env);
@@ -116,19 +116,17 @@ private static Module getTargetModule(@NotNull RunConfiguration configuration) {
         return null;
     }
 
-    private Map<String, String> initEnv() {
+    private Map<String, String> initEnv(@Nonnull final Project project) {
         final Map<String, String> env = new HashMap<>();
-        final Module module = this.consumer.getModule();
         final DatabaseResource mysql = this.resource;
-        assert module != null : "loading password from unknown module";
         env.put(mysql.getEnvPrefix() + "URL", this.resource.getJdbcUrl().toString());
         env.put(mysql.getEnvPrefix() + "USERNAME", this.resource.getUsername());
-        env.put(mysql.getEnvPrefix() + "PASSWORD", loadPassword(mysql).or(() -> inputPassword(module, mysql)).orElse(""));
+        env.put(mysql.getEnvPrefix() + "PASSWORD", loadPassword(mysql).or(() -> inputPassword(project, mysql)).orElse(""));
         return env;
     }
 
     private static Optional<String> loadPassword(@Nonnull final DatabaseResource resource) {
-        if (Optional.ofNullable(resource.getPassword()).map(Password::saveType).get() == Password.SaveType.NEVER) {
+        if (Objects.nonNull(resource.getPassword()) && resource.getPassword().saveType() == Password.SaveType.NEVER) {
             return Optional.empty();
         }
         final String saved = PasswordStore.loadPassword(resource.getId(), resource.getUsername(), resource.getPassword().saveType());
@@ -143,11 +141,11 @@ private static Optional<String> loadPassword(@Nonnull final DatabaseResource res
     }
 
     @Nonnull
-    private static Optional<String> inputPassword(@Nonnull final Module module, @Nonnull final DatabaseResource resource) {
+    private static Optional<String> inputPassword(@Nonnull final Project project, @Nonnull final DatabaseResource resource) {
         final AtomicReference<Password> passwordRef = new AtomicReference<>();
         final IAzureOperationTitle title = AzureOperationBundle.title("mysql.update_password");
         AzureTaskManager.getInstance().runAndWait(title, () -> {
-            final PasswordDialog dialog = new PasswordDialog(module.getProject(), resource);
+            final PasswordDialog dialog = new PasswordDialog(project, resource);
             if (dialog.showAndGet()) {
                 final Password password = dialog.getData();
                 resource.getPassword().saveType(password.saveType());