Merge pull request #7667 from microsoft/hanli/fixes-202306

Get environment variables from connection directly in azure connectio…

Author: wangmingliang-ms

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

@@ -16,11 +16,11 @@ public class DotEnvRunConfigurationExtension extends RunConfigurationExtension {
     @ExceptionNotification
     @AzureOperation(name = "platform/connector.inject_env.config", params = {"config.getName()"})
     public <T extends RunConfigurationBase<?>> void updateJavaParameters(@Nonnull T config, @Nonnull JavaParameters params, RunnerSettings s) {
-        AzureTaskManager.getInstance().runLater(() -> config.getBeforeRunTasks().stream()
+        config.getBeforeRunTasks().stream()
                 .filter(t -> t instanceof DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask)
                 .map(t -> (DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask) t)
                 .flatMap(t -> t.loadEnv().stream())
-                .forEach(p -> params.addEnv(p.getKey(), p.getValue())));
+                .forEach(p -> params.addEnv(p.getKey(), p.getValue()));
     }
 
     @Override

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

@@ -171,11 +171,11 @@ private void saveConnectionToDotAzure(Connection<?, ?> connection) {
             if (Objects.nonNull(m)) {
                 final AzureModule module = AzureModule.from(m);
                 final AzureTaskManager taskManager = AzureTaskManager.getInstance();
-                taskManager.write(() -> {
+                taskManager.runLater(() -> taskManager.write(() -> {
                     final Profile profile = module.initializeWithDefaultProfileIfNot();
                     this.future = profile.createOrUpdateConnection(connection);
                     profile.save();
-                });
+                }));
             }
         }
     }

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

@@ -8,6 +8,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.util.PropertiesComponent;
+import com.google.common.util.concurrent.SettableFuture;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
@@ -21,6 +22,7 @@
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
 import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
 import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
+import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
@@ -30,6 +32,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -173,9 +176,9 @@ public void registerActions(AzureActionManager am) {
             .register(am);
     }
 
-    public static Future<?> fixResourceConnection(Connection<?, ?> c, Project project) {
-        final Future<?>[] result = new Future<?>[1];
-        AzureTaskManager.getInstance().runAndWait(() -> {
+    public static Connection<?, ?> fixResourceConnection(Connection<?, ?> c, Project project) {
+        final SettableFuture<Connection<?, ?>> result = SettableFuture.create();
+        AzureTaskManager.getInstance().runLater(() -> {
             final String invalidResourceName = c.getResource().isValidResource() ? null : c.getResource().getDefinition().getTitle();
             final String invalidConsumerName = c.getConsumer().isValidResource() ? null : c.getConsumer().getDefinition().getTitle();
             final String invalidProperties = Stream.of(invalidResourceName, invalidConsumerName)
@@ -187,10 +190,17 @@ public static Future<?> fixResourceConnection(Connection<?, ?> c, Project projec
             dialog.setFixedEnvPrefix(c.getEnvPrefix());
             dialog.setFixedConnectionDefinition(c.getDefinition());
             dialog.setValue(c);
-            dialog.show();
-            result[0] = dialog.getFuture();
+            if (dialog.showAndGet()) {
+                result.set(dialog.getValue());
+            } else {
+                result.set(null);
+            }
         });
-        return Optional.ofNullable(result[0]).orElse(Futures.immediateFuture(null));
+        try {
+            return result.get();
+        } catch (InterruptedException | ExecutionException | RuntimeException e) {
+            throw new AzureToolkitRuntimeException(e);
+        }
     }
 
     private void refreshModuleConnections(AzureModule module) {

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

@@ -39,10 +39,7 @@
 import javax.annotation.Nullable;
 import javax.swing.*;
 import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -134,20 +131,20 @@ public LoadDotEnvBeforeRunTask(RunConfiguration configuration) {
         public List<Pair<String, String>> loadEnv() {
             final AzureModule azureModule = AzureModule.createIfSupport(this.config).orElse(null);
             final Project project = Optional.ofNullable(azureModule).map(AzureModule::getProject).orElse(null);
-            final List<Completable> completables = Optional.ofNullable(azureModule).map(AzureModule::getDefaultProfile)
+            final List<Pair<String, String>> exists = Optional.ofNullable(this.file)
+                    .or(() -> AzureModule.createIfSupport(this.config).map(AzureModule::getDefaultProfile).map(Profile::getDotEnvFile))
+                    .map(Profile::load)
+                    .orElse(Collections.emptyList());
+            final List<Pair<String, String>> result = new ArrayList<>(exists);
+            Optional.ofNullable(azureModule).map(AzureModule::getDefaultProfile)
                     .map(Profile::getConnections)
                     .stream().flatMap(List::stream)
                     .filter(c -> !c.isValidConnection())
                     .map(c -> ResourceConnectionActionsContributor.fixResourceConnection(c, project))
                     .filter(Objects::nonNull)
-                    .map(Completable::fromFuture)
-                    .collect(Collectors.toList());
-            // wait for all connection has been saved to .env)
-            Completable.merge(completables).await();
-            return Optional.ofNullable(this.file)
-                    .or(() -> AzureModule.createIfSupport(this.config).map(AzureModule::getDefaultProfile).map(Profile::getDotEnvFile))
-                    .map(Profile::load)
-                    .orElse(Collections.emptyList());
+                    .forEach(connection -> connection.getEnvironmentVariables(project)
+                            .forEach((key, value) -> result.add(Pair.of(key, value))));
+            return result;
         }
 
         @Override