Merge branch 'endgame-s187' into release

Flanker32 · Flanker32 · commit 7505250bd615 · 2021-05-26T08:13:10.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/ConnectionRunnerForRunConfiguration.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/ConnectionRunnerForRunConfiguration.java
@@ -96,7 +96,7 @@ public boolean isApplicableFor(@NotNull RunConfigurationBase<?> configuration) {
                 final MyBeforeRunTask task = new MyBeforeRunTask();
                 task.setEnabled(true);
                 this.addTask(configuration, task);
-            } else if (!myTasks.isEmpty()) {
+            } else if (!applicable && !myTasks.isEmpty()) {
                 tasks.removeAll(myTasks);
             }
             return applicable;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/dependencesurvey/activity/WorkspaceTaggingActivity.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/dependencesurvey/activity/WorkspaceTaggingActivity.java
@@ -8,7 +8,6 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.OrderEnumerator;
-import com.intellij.openapi.startup.StartupActivity;
 import com.microsoft.azure.toolkit.intellij.azuresdk.service.WorkspaceTaggingService;
 import com.microsoft.azure.toolkit.intellij.common.survey.CustomerSurvey;
 import com.microsoft.azure.toolkit.intellij.common.survey.CustomerSurveyManager;
@@ -26,7 +25,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class WorkspaceTaggingActivity implements StartupActivity.DumbAware {
+public class WorkspaceTaggingActivity {
     private static final Logger logger = Logger.getLogger(WorkspaceTaggingActivity.class.getName());
 
     private static final Pattern PATTERN = Pattern.compile("(Gradle|Maven): (.+):(.+):(.+)");
@@ -40,8 +39,8 @@ public class WorkspaceTaggingActivity implements StartupActivity.DumbAware {
     private static final String MGMT = "mgmt";
     private static final String SPRING = "spring";
 
-    @Override
-    public void runActivity(@NotNull final Project project) {
+    public static void runActivity(@NotNull final Project project) {
+
         ApplicationManager.getApplication().executeOnPooledThread(() -> {
             try {
                 final Set<String> workspaceTags = getWorkspaceTags(project);
@@ -54,7 +53,7 @@ public void runActivity(@NotNull final Project project) {
         });
     }
 
-    private void showCustomerSurvey(final Project project, final Set<String> workspaceTags) {
+    private static void showCustomerSurvey(final Project project, final Set<String> workspaceTags) {
         if (workspaceTags.containsAll(Arrays.asList(CLIENT, MGMT))) {
             CustomerSurveyManager.getInstance().takeSurvey(project, CustomerSurvey.AZURE_SDK);
         }
@@ -68,9 +67,10 @@ private void showCustomerSurvey(final Project project, final Set<String> workspa
         if (workspaceTags.contains(CLIENT)) {
             CustomerSurveyManager.getInstance().takeSurvey(project, CustomerSurvey.AZURE_CLIENT_SDK);
         }
+        CustomerSurveyManager.getInstance().takeSurvey(project, CustomerSurvey.AZURE_INTELLIJ_TOOLKIT);
     }
 
-    private Set<String> getWorkspaceTags(@NotNull final Project project) {
+    private static Set<String> getWorkspaceTags(@NotNull final Project project) {
         final Set<String> tagSet = new HashSet<>();
         OrderEnumerator.orderEntries(project).forEachLibrary(library -> {
             if (StringUtils.isNotEmpty(library.getName())) {
@@ -87,7 +87,7 @@ private Set<String> getWorkspaceTags(@NotNull final Project project) {
         return tagSet;
     }
 
-    private void trackWorkspaceTagging(final Set<String> tagSet) {
+    private static void trackWorkspaceTagging(final Set<String> tagSet) {
         final Map<String, String> properties = new HashMap<>();
         properties.put(SERVICE_NAME, SYSTEM);
         properties.put(OPERATION_NAME, WORKSPACE_TAGGING);
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/resources/META-INF/azure-sdk-reference-book.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/resources/META-INF/azure-sdk-reference-book.xml
@@ -2,7 +2,6 @@
     <extensionPoints>
     </extensionPoints>
     <extensions defaultExtensionNs="com.intellij">
-        <postStartupActivity implementation="com.microsoft.azure.toolkit.intellij.azuresdk.dependencesurvey.activity.WorkspaceTaggingActivity"/>
     </extensions>
     <actions>
         <action id="AzureToolkit.OpenSdkReferenceBook"
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/database/RegionComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/database/RegionComboBox.java
@@ -68,12 +68,12 @@ protected String getItemText(Object item) {
     }
 
     @Override
-    public void setSelectedItem(Object value) {
-        if (!Objects.equals(value, getSelectedItem())) {
-            super.setSelectedItem(value);
+    public void setValue(Region value) {
+        if (!Objects.equals(value, getValue())) {
+            super.setValue(value);
             validateRequired = true;
         } else {
-            super.setSelectedItem(value);
+            super.setValue(value);
         }
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/creation/MySQLCreationAdvancedPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/creation/MySQLCreationAdvancedPanel.java
@@ -70,6 +70,7 @@ private void init() {
         passwordFieldInput = PasswordUtils.generatePasswordFieldInput(this.passwordField, this.adminUsernameTextField);
         confirmPasswordFieldInput = PasswordUtils.generateConfirmPasswordFieldInput(this.confirmPasswordField, this.passwordField);
         regionComboBox.setValidateFunction(new MySQLRegionValidator());
+        serverNameTextField.setSubscriptionId(config.getSubscription().getId());
         serverNameTextField.setMinLength(3);
         serverNameTextField.setMaxLength(63);
         serverNameTextField.setValidateFunction(new SqlServerNameValidator());
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/creation/SqlServerCreationAdvancedPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/creation/SqlServerCreationAdvancedPanel.java
@@ -66,6 +66,7 @@ private void init() {
         passwordFieldInput = PasswordUtils.generatePasswordFieldInput(this.passwordField, this.adminUsernameTextField);
         confirmPasswordFieldInput = PasswordUtils.generateConfirmPasswordFieldInput(this.confirmPasswordField, this.passwordField);
         regionComboBox.setValidateFunction(new SqlServerRegionValidator());
+        serverNameTextField.setSubscriptionId(config.getSubscription().getId());
         serverNameTextField.setMinLength(1);
         serverNameTextField.setMaxLength(63);
         serverNameTextField.setValidateFunction(new SqlServerNameValidator());
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/AzurePlugin.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/AzurePlugin.java
@@ -26,6 +26,7 @@
 import com.intellij.util.containers.HashSet;
 import com.microsoft.applicationinsights.preference.ApplicationInsightsResource;
 import com.microsoft.applicationinsights.preference.ApplicationInsightsResourceRegistry;
+import com.microsoft.azure.toolkit.intellij.azuresdk.dependencesurvey.activity.WorkspaceTaggingActivity;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azuretools.authmanage.CommonSettings;
 import com.microsoft.azuretools.azurecommons.deploy.DeploymentEventArgs;
@@ -38,7 +39,6 @@
 import com.microsoft.azuretools.telemetrywrapper.EventType;
 import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.azuretools.utils.TelemetryUtils;
-import com.microsoft.intellij.helpers.CustomerSurveyHelper;
 import com.microsoft.intellij.helpers.WhatsNewManager;
 import com.microsoft.intellij.ui.libraries.AILibraryHandler;
 import com.microsoft.intellij.ui.libraries.AzureLibrary;
@@ -50,6 +50,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.w3c.dom.Document;
+import rx.Observable;
+import rx.schedulers.Schedulers;
 
 import javax.swing.event.EventListenerList;
 import java.io.*;
@@ -58,6 +60,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -72,6 +75,7 @@ public class AzurePlugin implements StartupActivity.DumbAware {
     public static final String JDBC_LIBRARIES_VERSION = "6.1.0.jre8";
     public static final int REST_SERVICE_MAX_RETRY_COUNT = 7;
     private static PluginStateListener pluginStateListener = null;
+    private static final int POP_UP_DELAY = 30;
 
     // User-agent header for Azure SDK calls
     public static final String USER_AGENT = "Azure Toolkit for IntelliJ, v%s, machineid:%s";
@@ -105,7 +109,6 @@ public void runActivity(@NotNull Project project) {
 
         initializeAIRegistry(project);
         // Showing dialog needs to be run in UI thread
-        initializeFeedbackNotification(project);
         initializeWhatsNew(project);
 
         if (!IS_ANDROID_STUDIO) {
@@ -117,6 +120,7 @@ public void runActivity(@NotNull Project project) {
                 initializeTelemetry();
                 clearTempDirectory();
                 loadWebappsSettings(project);
+                runWorkspaceTaggingActivity(project);
             } catch (ProcessCanceledException e) {
                 throw e;
             } catch (Exception e) {
@@ -137,8 +141,13 @@ private void initializeWhatsNew(Project project) {
             });
     }
 
-    private void initializeFeedbackNotification(Project myProject) {
-        CustomerSurveyHelper.INSTANCE.showFeedbackNotification(myProject);
+    private void runWorkspaceTaggingActivity(Project myProject) {
+        Observable.timer(POP_UP_DELAY, TimeUnit.SECONDS)
+                .subscribeOn(Schedulers.newThread())
+                .take(1)
+                .subscribe(next -> {
+                    WorkspaceTaggingActivity.runActivity(myProject);
+                });
     }
 
     private synchronized void initializeTelemetry() throws Exception {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/forms/CreateVirtualNetworkForm.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/forms/CreateVirtualNetworkForm.java
@@ -62,7 +62,7 @@ public void changedUpdate(DocumentEvent documentEvent) {
         subnetNameField.getDocument().addDocumentListener(docListener);
         subnetAddressRangeField.getDocument().addDocumentListener(docListener);
 
-        regionField.setText(region.toString());
+        regionField.setText(region.getLabel().toString());
 
         validateFields();
         init();
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/sqlserver/SqlServerNode.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/sqlserver/SqlServerNode.java
@@ -77,7 +77,7 @@ private void openInPortal() {
         this.openResourcesInPortal(this.subscriptionId, this.server.entity().getId());
     }
 
-    @AzureOperation(name = ActionConstants.MySQL.SHOW_PROPERTIES, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = ActionConstants.SqlServer.SHOW_PROPERTIES, type = AzureOperation.Type.ACTION)
     private void showProperties() {
         DefaultLoader.getUIHelper().openSqlServerPropertyView(SqlServerNode.this);
     }
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java b/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java
@@ -441,6 +441,7 @@ public WebApp createWebAppWithPrivateRegistryImage(@NotNull WebAppOnLinuxDeployM
     public IWebApp createAzureWebAppWithPrivateRegistryImage(@NotNull WebAppOnLinuxDeployModel model) {
         final ResourceGroup resourceGroup = getOrCreateResourceGroup(model.getSubscriptionId(), model.getResourceGroupName(), model.getLocationName());
         final AppServicePlanEntity servicePlanEntity = AppServicePlanEntity.builder()
+                .id(model.getAppServicePlanId())
                 .subscriptionId(model.getSubscriptionId())
                 .name(model.getAppServicePlanName())
                 .resourceGroup(model.getResourceGroupName())
@@ -1002,6 +1003,7 @@ public IWebApp createWebAppFromSettingModel(@NotNull WebAppSettingModel model) {
         final ResourceGroup resourceGroup = getOrCreateResourceGroup(model.getSubscriptionId(), model.getResourceGroup(), model.getRegion());
         final String[] tierSize = model.getPricing().split("_");
         final AppServicePlanEntity servicePlanEntity = AppServicePlanEntity.builder()
+                .id(model.getAppServicePlanId())
                 .subscriptionId(model.getSubscriptionId())
                 .name(model.getAppServicePlanName())
                 .resourceGroup(model.getResourceGroup())
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/WebAppSettingModel.java b/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/WebAppSettingModel.java
@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 @Data
 public class WebAppSettingModel {
@@ -123,8 +124,13 @@ public Map<String, String> getTelemetryProperties(Map<String, String> properties
             if (properties != null) {
                 result.putAll(properties);
             }
-            result.put(TelemetryConstants.RUNTIME, os == OperatingSystem.LINUX ?
-                    "linux-" + getLinuxRuntime().toString() : "windows-" + getWebContainer() + (jdkVersion == null ? "" : "-" + jdkVersion.toString()));
+            final Runtime runtime = getRuntime();
+            final String osValue = Optional.ofNullable(runtime.getOperatingSystem())
+                    .map(com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem::toString).orElse(StringUtils.EMPTY);
+            final String webContainerValue = Optional.ofNullable(runtime.getWebContainer()).map(WebContainer::getValue).orElse(StringUtils.EMPTY);
+            final String javaVersionValue = Optional.ofNullable(runtime.getJavaVersion())
+                    .map(com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion::getValue).orElse(StringUtils.EMPTY);
+            result.put(TelemetryConstants.RUNTIME, String.format("%s-%s-%s", osValue, webContainerValue, javaVersionValue));
             result.put(TelemetryConstants.WEBAPP_DEPLOY_TO_SLOT, String.valueOf(isDeployToSlot()));
             result.put(TelemetryConstants.SUBSCRIPTIONID, getSubscriptionId());
             result.put(TelemetryConstants.CREATE_NEWWEBAPP, String.valueOf(isCreatingNew()));

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public boolean isApplicableFor(@NotNull RunConfigurationBase<?> configuration) {`
`96`	`96`	`final MyBeforeRunTask task = new MyBeforeRunTask();`
`97`	`97`	`task.setEnabled(true);`
`98`	`98`	`this.addTask(configuration, task);`
`99`		`- } else if (!myTasks.isEmpty()) {`
	`99`	`+ } else if (!applicable && !myTasks.isEmpty()) {`
`100`	`100`	`tasks.removeAll(myTasks);`
`101`	`101`	`}`
`102`	`102`	`return applicable;`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,12 @@ protected String getItemText(Object item) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
`71`		`- public void setSelectedItem(Object value) {`
`72`		`- if (!Objects.equals(value, getSelectedItem())) {`
`73`		`- super.setSelectedItem(value);`
	`71`	`+ public void setValue(Region value) {`
	`72`	`+ if (!Objects.equals(value, getValue())) {`
	`73`	`+ super.setValue(value);`
`74`	`74`	`validateRequired = true;`
`75`	`75`	`} else {`
`76`		`- super.setSelectedItem(value);`
	`76`	`+ super.setValue(value);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private void openInPortal() {`
`77`	`77`	`this.openResourcesInPortal(this.subscriptionId, this.server.entity().getId());`
`78`	`78`	`}`
`79`	`79`
`80`		`- @AzureOperation(name = ActionConstants.MySQL.SHOW_PROPERTIES, type = AzureOperation.Type.ACTION)`
	`80`	`+ @AzureOperation(name = ActionConstants.SqlServer.SHOW_PROPERTIES, type = AzureOperation.Type.ACTION)`
`81`	`81`	`private void showProperties() {`
`82`	`82`	`DefaultLoader.getUIHelper().openSqlServerPropertyView(SqlServerNode.this);`
`83`	`83`	`}`