add deployment targets as early as possible.

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/FunctionDeploymentState.java

@@ -79,13 +79,13 @@ public FunctionDeploymentState(Project project, FunctionDeployConfiguration func
         OperationContext.current().setMessager(new RunProcessHandlerMessenger(processHandler));
         applyResourceConnection();
         final FunctionAppBase<?, ?, ?> target = FunctionAppService.getInstance().createOrUpdateFunctionApp(deployModel.getFunctionAppConfig());
-        stagingFolder = FunctionUtils.getTempStagingFolder();
-        prepareStagingFolder(stagingFolder, operation);
         final AzureTaskManager tm = AzureTaskManager.getInstance();
         tm.runOnPooledThread(()-> Optional.ofNullable(this.functionDeployConfiguration.getModule()).map(AzureModule::from)
             .ifPresent(module -> tm.runLater(() -> tm.write(() -> module
                 .initializeWithDefaultProfileIfNot()
                 .addApp(target).save()))));
+        stagingFolder = FunctionUtils.getTempStagingFolder();
+        prepareStagingFolder(stagingFolder, operation);
         // deploy function to Azure
         FunctionAppService.getInstance().deployFunctionApp(target, stagingFolder);
         AzureTaskManager.getInstance().runInBackground("list HTTPTrigger url", () -> {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerapps/src/main/java/com/microsoft/azure/toolkit/intellij/containerapps/deployimage/DeployImageRunState.java

@@ -55,17 +55,6 @@ public ContainerApp executeSteps(@Nonnull RunProcessHandler processHandler, @Non
         // update Image
         final String containerAppId = dataModel.getContainerAppId();
         final ContainerApp containerApp = Objects.requireNonNull(Azure.az(AzureContainerApps.class).getById(containerAppId), String.format("Container app %s was not found", dataModel.getContainerAppId()));
-        final ContainerAppDraft draft = (ContainerAppDraft) containerApp.update();
-        final ContainerAppDraft.Config config = new ContainerAppDraft.Config();
-        final List<EnvironmentVar> vars = dataModel.getEnvironmentVariables().entrySet().stream()
-            .map(e -> new EnvironmentVar().withName(e.getKey()).withValue(e.getValue()))
-            .collect(Collectors.toList());
-        final ContainerAppDraft.ImageConfig imageConfig = new ContainerAppDraft.ImageConfig(configuration.getFinalImageName());
-        imageConfig.setContainerRegistry(registry);
-        imageConfig.setEnvironmentVariables(vars);
-        config.setImageConfig(imageConfig);
-        config.setIngressConfig(dataModel.getIngressConfig());
-        draft.setConfig(config);
         final AzureTaskManager tm = AzureTaskManager.getInstance();
         tm.runOnPooledThread(() -> Optional.ofNullable(image)
             .map(DockerImage::getDockerFile)
@@ -77,6 +66,17 @@ public ContainerApp executeSteps(@Nonnull RunProcessHandler processHandler, @Non
                 Optional.of(containerApp).ifPresent(p::addApp);
                 p.save();
             }))));
+        final ContainerAppDraft draft = (ContainerAppDraft) containerApp.update();
+        final ContainerAppDraft.Config config = new ContainerAppDraft.Config();
+        final List<EnvironmentVar> vars = dataModel.getEnvironmentVariables().entrySet().stream()
+            .map(e -> new EnvironmentVar().withName(e.getKey()).withValue(e.getValue()))
+            .collect(Collectors.toList());
+        final ContainerAppDraft.ImageConfig imageConfig = new ContainerAppDraft.ImageConfig(configuration.getFinalImageName());
+        imageConfig.setContainerRegistry(registry);
+        imageConfig.setEnvironmentVariables(vars);
+        config.setImageConfig(imageConfig);
+        config.setIngressConfig(dataModel.getIngressConfig());
+        draft.setConfig(config);
         draft.updateIfExist();
         return containerApp;
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerregistry/src/main/java/com/microsoft/azure/toolkit/intellij/containerregistry/ContainerService.java

@@ -33,14 +33,22 @@ public static ContainerService getInstance() {
 
     public String pushDockerImage(@Nonnull final IDockerPushConfiguration configuration) throws InterruptedException {
         final IAzureMessager messager = AzureMessager.getMessager();
-        final DockerImage image = configuration.getDockerImageConfiguration();
-        final ContainerRegistry registry = Azure.az(AzureContainerRegistry.class).getById(configuration.getContainerRegistryId());
-        if (Objects.nonNull(registry) && !registry.isAdminUserEnabled()) {
+        final DockerImage image = Objects.requireNonNull(configuration.getDockerImageConfiguration(), "image is not configured.");
+        final ContainerRegistry registry = Objects.requireNonNull(Azure.az(AzureContainerRegistry.class).getById(configuration.getContainerRegistryId()), "registry doesn't exist.");
+        if (!registry.isAdminUserEnabled()) {
             final Action<ContainerRegistry> enableAdminUser = AzureActionManager.getInstance().getAction(ContainerRegistryActionsContributor.ENABLE_ADMIN_USER).bind(registry);
             throw new AzureToolkitRuntimeException(String.format("Admin user is not enabled for (%s), but it is required to push image to Azure Container Registry.", registry.getName()), enableAdminUser);
         }
+        final AzureTaskManager tm = AzureTaskManager.getInstance();
+        tm.runOnPooledThread(() -> Optional.of(image)
+            .map(DockerImage::getDockerFile)
+            .map(f -> VfsUtil.findFileByIoFile(f, true))
+            .map(f -> AzureModule.from(f, configuration.getProject()))
+            .ifPresent(module -> tm.runLater(() -> tm.write(() -> module
+                .initializeWithDefaultProfileIfNot()
+                .addApp(registry).save()))));
         final AzureDockerClient dockerClient = AzureDockerClient.from(Objects.requireNonNull(configuration.getDockerHostConfiguration()));
-        final String loginServerUrl = Objects.requireNonNull(registry).getLoginServerUrl();
+        final String loginServerUrl = registry.getLoginServerUrl();
         final String imageAndTag = configuration.getFinalImageName();
         // tag image with ACR url
         if (!StringUtils.equals(image.getImageName(), imageAndTag)) {
@@ -57,14 +65,6 @@ public void onNext(PushResponseItem item) {
                 super.onNext(item);
             }
         };
-        final AzureTaskManager tm = AzureTaskManager.getInstance();
-        tm.runOnPooledThread(() -> Optional.of(image)
-            .map(DockerImage::getDockerFile)
-            .map(f -> VfsUtil.findFileByIoFile(f, true))
-            .map(f -> AzureModule.from(f, configuration.getProject()))
-            .ifPresent(module -> tm.runLater(() -> tm.write(() -> module
-                .initializeWithDefaultProfileIfNot()
-                .addApp(registry).save()))));
         dockerClient.pushImage(Objects.requireNonNull(loginServerUrl), registry.getUserName(), registry.getPrimaryCredential(), imageAndTag, callBack);
         return loginServerUrl;
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfigurationState.java

@@ -139,13 +139,13 @@ public SpringCloudDeployment execute(IAzureMessager messager) {
                 throw new AzureToolkitRuntimeException(message.toString(), reopen.withLabel("Reopen Deploy Dialog"));
             }
         }
-        deployment.commit();
         final AzureTaskManager tm = AzureTaskManager.getInstance();
         tm.runOnPooledThread(() -> opFile.map(f -> VfsUtil.findFileByIoFile(f, true))
             .map(f -> AzureModule.from(f, this.project))
             .ifPresent(module -> tm.runLater(() -> tm.write(() -> module
                 .initializeWithDefaultProfileIfNot()
                 .addApp(deployment.getParent()).save()))));
+        deployment.commit();
         deployment.getParent().refresh();
         printPublicUrl(deployment.getParent());
         return deployment;