Merge pull request #6886 from microsoft/resolve-conflicts

develop -> develop.next

Author: wangmingliang-ms

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.68.0-SNAPSHOT</version>
+    <version>3.68.0</version>
   </parent>
   <groupId>com.microsoft.azuretools</groupId>
   <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
   </organization>
 
   <properties>
-    <azuretool.version>3.68.0-SNAPSHOT</azuretool.version>
+    <azuretool.version>3.68.0</azuretool.version>
     <azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
-    <azure.toolkit-lib.version>0.24.0-SNAPSHOT</azure.toolkit-lib.version>
+    <azure.toolkit-lib.version>0.24.0</azure.toolkit-lib.version>
   </properties>
   <dependencyManagement>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF

@@ -43,4 +43,4 @@ Export-Package: com.microsoft.azuretools.appservice,
  com.microsoft.azuretools.appservice.handlers,
  com.microsoft.azuretools.appservice.ui
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-appservice-lib-0.24.0-SNAPSHOT.jar
+ target/lib/azure-toolkit-ide-appservice-lib-0.24.0.jar

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-appservice-lib</artifactId>
-      <version>0.24.0-SNAPSHOT</version>
+      <version>0.24.0</version>
     </dependency>
   </dependencies>
   <repositories>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-springcloud-lib-0.24.0-SNAPSHOT.jar
+ target/lib/azure-toolkit-ide-springcloud-lib-0.24.0.jar
 Import-Package: com.microsoft.azuretools.core.actions,
  org.eclipse.core.expressions,
  org.eclipse.jface.text.hyperlink,

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
-      <version>0.24.0-SNAPSHOT</version>
+      <version>0.24.0</version>
     </dependency>
   </dependencies>
   <build>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/IntelliJApplicationInsightsActionsContributor.java

@@ -5,7 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.applicationinsights;
 
-import com.azure.resourcemanager.applicationinsights.models.ApplicationInsightsComponent;
+import com.google.common.base.Preconditions;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.microsoft.azure.toolkit.ide.applicationinsights.ApplicationInsightsActionsContributor;
 import com.microsoft.azure.toolkit.ide.common.IActionsContributor;
@@ -20,18 +20,20 @@
 import com.microsoft.azure.toolkit.lib.applicationinsights.AzureApplicationInsights;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
+import com.microsoft.azure.toolkit.lib.common.cache.CacheManager;
+import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResource;
 import com.microsoft.azure.toolkit.lib.common.model.AzResource;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.OperationBundle;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.common.utils.Utils;
-import com.microsoft.azure.toolkit.lib.resource.AzureResources;
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
-import com.microsoft.azure.toolkit.lib.resource.ResourceGroupDraft;
+import org.apache.commons.collections4.CollectionUtils;
 
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
@@ -59,16 +61,29 @@ public void registerHandlers(AzureActionManager am) {
     }
 
     private static ApplicationInsightDraft getDraftApplicationInsight(@Nullable final ResourceGroup resourceGroup) {
-        final List<Subscription> selectedSubscriptions = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
-        if (selectedSubscriptions.size() == 0) {
-            return null;
-        }
+        final List<Subscription> subs = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
+        Preconditions.checkArgument(CollectionUtils.isNotEmpty(subs), "There are no subscriptions in your account.");
+
+        final Subscription historySub = CacheManager.getUsageHistory(Subscription.class).peek(subs::contains);
+        final ResourceGroup historyRg = CacheManager.getUsageHistory(ResourceGroup.class)
+            .peek(r -> Objects.isNull(historySub) || r.getSubscriptionId().equals(historySub.getId()));
+        final Region historyRegion = CacheManager.getUsageHistory(Region.class).peek();
+
         final String timestamp = Utils.getTimestamp();
-        final Subscription subscription = selectedSubscriptions.get(0);
-        final Region region = Optional.ofNullable(resourceGroup).map(ResourceGroup::getRegion).orElse(null);
-        final String resourceGroupName = resourceGroup == null ? String.format("rg-%s", timestamp) : resourceGroup.getResourceGroupName();
+        final ResourceGroup rg = Optional.ofNullable(resourceGroup)
+            .or(() -> Optional.ofNullable(historyRg))
+            .orElse(null);
+        final Subscription subscription = Optional.ofNullable(rg).map(AzResource::getSubscription)
+            .or(() -> Optional.ofNullable(historySub).filter(subs::contains))
+            .orElse(subs.get(0));
+        final Region region = Optional.ofNullable(rg).map(ResourceGroup::getRegion)
+            .or(() -> Optional.ofNullable(historyRegion))
+            .orElse(null);
+        final String resourceGroupName = Optional.ofNullable(rg)
+            .map(AbstractAzResource::getResourceGroupName)
+            .orElse(String.format("rg-%s", timestamp));
         final ApplicationInsightDraft applicationInsightDraft = Azure.az(AzureApplicationInsights.class).applicationInsights(subscription.getId())
-                .create(String.format("ai-%s", timestamp), resourceGroupName);
+            .create(String.format("ai-%s", timestamp), resourceGroupName);
         applicationInsightDraft.setRegion(region);
         return applicationInsightDraft;
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/connection/ApplicationInsightsResourcePanel.java

@@ -12,6 +12,7 @@
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.applicationinsights.ApplicationInsight;
 import com.microsoft.azure.toolkit.lib.applicationinsights.AzureApplicationInsights;
+import com.microsoft.azure.toolkit.lib.common.cache.CacheManager;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
@@ -23,6 +24,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -71,25 +73,32 @@ public Resource<ApplicationInsight> getValue() {
     @Override
     public List<AzureFormInput<?>> getInputs() {
         return Arrays.asList(
-                this.insightComboBox,
-                this.subscriptionComboBox
+            this.insightComboBox,
+            this.subscriptionComboBox
         );
     }
 
     protected void createUIComponents() {
         final Supplier<List<? extends ApplicationInsight>> loader = () -> Optional
-                .ofNullable(this.subscriptionComboBox)
-                .map(AzureComboBox::getValue)
-                .map(Subscription::getId)
-                .map(id -> Azure.az(AzureApplicationInsights.class).applicationInsights(id).list()
-                        .stream().sorted((first, second) -> StringUtils.compare(first.getName(), second.getName())).collect(Collectors.toList()))
-                .orElse(Collections.emptyList());
+            .ofNullable(this.subscriptionComboBox)
+            .map(AzureComboBox::getValue)
+            .map(Subscription::getId)
+            .map(id -> Azure.az(AzureApplicationInsights.class).applicationInsights(id).list()
+                .stream().sorted((first, second) -> StringUtils.compare(first.getName(), second.getName())).collect(Collectors.toList()))
+            .orElse(Collections.emptyList());
         this.insightComboBox = new AzureComboBox<>(loader) {
             @Override
             protected String getItemText(Object item) {
                 return Optional.ofNullable(item).map(i -> ((ApplicationInsight) i).getName()).orElse(StringUtils.EMPTY);
             }
 
+            @Nullable
+            @Override
+            protected ApplicationInsight doGetDefaultValue() {
+                return CacheManager.getUsageHistory(ApplicationInsight.class)
+                    .peek(v -> Objects.isNull(subscriptionComboBox) || Objects.equals(subscriptionComboBox.getValue(), v.getSubscription()));
+            }
+
             @Override
             protected void refreshItems() {
                 Optional.ofNullable(ApplicationInsightsResourcePanel.this.subscriptionComboBox)

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/creation/CreateApplicationInsightsAction.java

@@ -11,6 +11,7 @@
 import com.microsoft.azure.toolkit.lib.applicationinsights.ApplicationInsightDraft;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
+import com.microsoft.azure.toolkit.lib.common.cache.CacheManager;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.operation.OperationBundle;
 import com.microsoft.azure.toolkit.lib.common.operation.OperationContext;
@@ -51,6 +52,8 @@ public static ApplicationInsight createApplicationInsights(ApplicationInsightDra
             final ResourceGroup newResourceGroup = Azure.az(AzureResources.class)
                     .groups(subscriptionId).createResourceGroupIfNotExist(draft.getResourceGroupName(), draft.getRegion());
         }
-        return draft.commit();
+        final ApplicationInsight resource = draft.commit();
+        CacheManager.getUsageHistory(ApplicationInsight.class).push(draft);
+        return resource;
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceComboBox.java

@@ -71,6 +71,7 @@ protected T convertAppServiceToConfig(final Supplier<T> supplier, AppServiceAppB
                 config.setRuntime(appService.getRuntime());
                 config.setRegion(appService.getRegion());
                 config.setServicePlan(AppServicePlanConfig.fromResource(appService.getAppServicePlan()));
+                config.setAppSettings(appService.getAppSettings());
             })).subscribe();
         return config;
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogConsoleView.java

@@ -27,15 +27,16 @@ public class AppServiceStreamingLogConsoleView extends ConsoleViewImpl {
     public AppServiceStreamingLogConsoleView(@NotNull Project project, String resourceId) {
         super(project, true);
         this.isDisposed = false;
+        this.setUpdateFoldingsEnabled(false);
         this.resourceId = resourceId;
     }
 
     public void startStreamingLog(Flux<String> logStreaming) {
         if (!isActive()) {
             printlnToConsole(message("appService.logStreaming.hint.connect"), SYSTEM_OUTPUT);
             subscription = logStreaming.subscribeOn(Schedulers.boundedElastic())
-                                       .doAfterTerminate(() -> printlnToConsole(message("appService.logStreaming.hint.disconnected"), SYSTEM_OUTPUT))
-                                       .subscribe((log) -> printlnToConsole(log, NORMAL_OUTPUT));
+                    .doAfterTerminate(() -> printlnToConsole(message("appService.logStreaming.hint.disconnected"), SYSTEM_OUTPUT))
+                    .subscribe((log) -> printlnToConsole(log, NORMAL_OUTPUT));
         }
     }