Merge pull request #4988 from microsoft/release-3.50.0

prepare releasing v3.50.0 [release-3.50.0 -> release]

Author: Flanker32

CHANGELOG.md

@@ -68,7 +68,10 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
 ## 3.50.0
 
 ### Added
-- Azure MySQL resource connector feature
+- Development workflow for Azure Database for MySQL
+  - Connect Azure Database for MySQL Server to local project from Azure Explorer or application.properties file
+  - Automatically inject datasource connection properties into runtime environment for local run
+  - Publish Azure Web App with datasource connection properties in application settings
 
 ## 3.49.0
 

PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml

@@ -27,7 +27,13 @@
     <h3>3.50.0</h3>
     <h4>Added</h4>
     <ul>
-      <li>Add Azure MySQL resource connector</li>
+      <li>Development workflow for Azure Database for MySQL
+        <ul>
+          <li>Connect Azure Database for MySQL Server to local project from Azure Explorer or application.properties file</li>
+          <li>Automatically inject datasource connection properties into runtime environment for local run</li>
+          <li>Publish Azure Web App with datasource connection properties in application settings</li>
+        </ul>
+      </li>
     </ul>
     <p>You may get the full change log <a
             href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>

PluginsAndFeatures/azure-toolkit-for-intellij/resources/whatsnew/whatsnew.md

@@ -4,7 +4,12 @@
 ## 3.50.0
 
 ### Added
-- Azure MySQL resource connector
+<img src="https://user-images.githubusercontent.com/19339116/109937625-11666400-7d0a-11eb-9850-82a62d65f3fa.gif" width="840" height="525" />
+
+- Development workflow for Azure Database for MySQL
+  - Connect Azure Database for MySQL Server to local project from Azure Explorer or application.properties file
+  - Automatically inject datasource connection properties into runtime environment for local run
+  - Publish Azure Web App with datasource connection properties in application settings
 
 ## 3.49.0
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceMonitorPanel.java

@@ -92,7 +92,7 @@ public void setWebServerLogVisible(boolean visible) {
     public MonitorConfig getData() {
         MonitorConfig config = MonitorConfig.builder().build();
         final ApplicationInsightsConfig insightsConfig =
-                (rdoEnableApplicationInsights.isSelected() && titleAppServiceLog.isVisible()) ? applicationInsightsComboBox.getValue() : null;
+                (rdoEnableApplicationInsights.isSelected() && titleApplicationInsights.isVisible()) ? applicationInsightsComboBox.getValue() : null;
         config.setApplicationInsightsConfig(insightsConfig);
         config.setEnableWebServerLogging(rdoEnableWebServerLog.isSelected() && lblWebServerLog.isVisible());
         config.setWebServerLogQuota(txtQuota.getValue());

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/link/LinkMySQLToModuleDialog.java

@@ -11,19 +11,27 @@
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
 import com.microsoft.azure.toolkit.intellij.link.mysql.BasicLinkMySQLPanel;
+import com.microsoft.azure.toolkit.intellij.link.mysql.JdbcUrl;
 import com.microsoft.azure.toolkit.intellij.link.mysql.MySQLResourceConfig;
+import com.microsoft.azure.toolkit.intellij.link.po.MySQLResourcePO;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.link.AzureLinkService;
+import com.microsoft.intellij.AzureMySQLStorage;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.azure.mysql.MySQLNode;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.Objects;
 
 public class LinkMySQLToModuleDialog extends AzureDialog<LinkConfig<MySQLResourceConfig, ModuleResourceConfig>> {
+
+    private static final String PROMPT_TITLE = "Azure Explorer";
+    private static final String[] PROMPT_OPTIONS = new String[] {"Yes", "No"};
+    private static final String PROMPT_MESSAGE = "This resource already existed in your local environment. Do you want to override it?";
     private JPanel rootPanel;
     private BasicLinkMySQLPanel basicPanel;
 
@@ -71,12 +79,27 @@ private void createUIComponents() {
 
     private void doLink(LinkConfig<MySQLResourceConfig, ModuleResourceConfig> linkConfig, Project project, LinkMySQLToModuleDialog dialog) {
         dialog.close(0);
+        // check to prompt override existing resource or not
+        MySQLResourceConfig resourceConfig = linkConfig.getResource();
+        JdbcUrl jdbcUrl = JdbcUrl.from(resourceConfig.getUrl());
+        String businessUniqueKey = MySQLResourcePO.getBusinessUniqueKey(resourceConfig.getServer().id(), jdbcUrl.getDatabase());
+        MySQLResourcePO existedResourcePO = AzureMySQLStorage.getStorage().getResourceByBusinessUniqueKey(businessUniqueKey);
+        boolean storageResource = true;
+        if (Objects.nonNull(existedResourcePO)) {
+            if (!StringUtils.equals(resourceConfig.getUrl(), existedResourcePO.getUrl()) ||
+                    !StringUtils.equals(resourceConfig.getUsername(), existedResourcePO.getUsername()) ||
+                    resourceConfig.getPasswordConfig().getPasswordSaveType() != existedResourcePO.getPasswordSave()) {
+                storageResource = DefaultLoader.getUIHelper().showConfirmation(PROMPT_MESSAGE, PROMPT_TITLE, PROMPT_OPTIONS, null);
+            }
+        }
+        // link in background
+        boolean finalStorageResource = storageResource;
         final Runnable runnable = () -> {
             final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
             indicator.setIndeterminate(true);
-            AzureLinkService.getInstance().link(project, linkConfig);
+            AzureLinkService.getInstance().link(project, linkConfig, finalStorageResource);
         };
-        String progressMessage = "Linking Azure Database for MySQL with Module...";
+        String progressMessage = "Connecting Azure Database for MySQL with Module...";
         final AzureTask task = new AzureTask(null, progressMessage, false, runnable);
         AzureTaskManager.getInstance().runInBackground(task);
     }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/streaminglog/SpringCloudStreamingLogConsoleView.java

@@ -9,7 +9,6 @@
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.project.Project;
 import com.microsoft.applicationinsights.internal.util.ThreadPoolUtils;
-import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperationBundle;
 import com.microsoft.azure.toolkit.lib.common.operation.IAzureOperationTitle;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
@@ -31,13 +30,13 @@ public class SpringCloudStreamingLogConsoleView extends ConsoleViewImpl {
     private ConsoleViewStatus status;
     private ExecutorService executorService;
 
-    private String resourceId;
+    private final String resourceName;
     private InputStream logInputStream;
 
-    public SpringCloudStreamingLogConsoleView(@NotNull Project project, String resourceId) {
+    public SpringCloudStreamingLogConsoleView(@NotNull Project project, String resourceName) {
         super(project, true);
         this.status = ConsoleViewStatus.STOPPED;
-        this.resourceId = resourceId;
+        this.resourceName = resourceName;
     }
 
     public ConsoleViewStatus getStatus() {
@@ -95,7 +94,7 @@ public void shutdown() {
             }
             setStatus(ConsoleViewStatus.STOPPING);
         }
-        final IAzureOperationTitle title = AzureOperationBundle.title("springcloud|log_stream.close", ResourceUtils.nameFromResourceId(resourceId));
+        final IAzureOperationTitle title = AzureOperationBundle.title("springcloud|log_stream.close", resourceName);
         AzureTaskManager.getInstance().runInBackground(new AzureTask(getProject(), title, false, () -> {
             try {
                 if (logInputStream != null) {
@@ -118,6 +117,6 @@ public void shutdown() {
     public void dispose() {
         super.dispose();
         shutdown();
-        SpringCloudStreamingLogManager.getInstance().removeConsoleView(resourceId);
+        SpringCloudStreamingLogManager.getInstance().removeConsoleView(resourceName);
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/link/AzureLinkService.java

@@ -18,6 +18,7 @@
 import com.microsoft.azure.toolkit.intellij.link.po.MySQLResourcePO;
 import com.microsoft.intellij.AzureLinkStorage;
 import com.microsoft.intellij.AzureMySQLStorage;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -37,14 +38,16 @@ private AzureLinkService() {
 
     }
 
-    public void link(Project project, LinkConfig<MySQLResourceConfig, ModuleResourceConfig> linkComposite) {
+    public void link(Project project, LinkConfig<MySQLResourceConfig, ModuleResourceConfig> linkComposite, boolean storageResource) {
         ModulePO modulePO = createModulePO(linkComposite.getModule());
         // create resource
         MySQLResourcePO resource = createResourcePO(linkComposite.getResource());
         // create link
         LinkPO linkPO = new LinkPO(resource.getId(), modulePO.getResourceId(), LinkType.SERVICE_WITH_MODULE, linkComposite.getEnvPrefix());
         // storage mysql
-        AzureMySQLStorage.getStorage().addResource(resource);
+        if (storageResource) {
+            AzureMySQLStorage.getStorage().addResource(resource);
+        }
         // storage password
         if (ArrayUtils.isNotEmpty(linkComposite.getResource().getPasswordConfig().getPassword())) {
             String inputPassword = String.valueOf(linkComposite.getResource().getPasswordConfig().getPassword());
@@ -62,7 +65,7 @@ private MySQLResourcePO createResourcePO(MySQLResourceConfig config) {
         JdbcUrl jdbcUrl = JdbcUrl.from(config.getUrl());
         String businessUniqueKey = MySQLResourcePO.getBusinessUniqueKey(config.getServer().id(), jdbcUrl.getDatabase());
         MySQLResourcePO existedResourcePO = AzureMySQLStorage.getStorage().getResourceByBusinessUniqueKey(businessUniqueKey);
-        String id = Objects.nonNull(existedResourcePO) ? existedResourcePO.getId() : UUID.randomUUID().toString().replace("-", StringUtils.EMPTY);
+        String id = Objects.nonNull(existedResourcePO) ? existedResourcePO.getId() : DigestUtils.md5Hex(businessUniqueKey);
         MySQLResourcePO resourcePO = MySQLResourcePO.builder()
                 .id(id)
                 .resourceId(config.getServer().id())

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/SpringDatasourceCompletionContributor.java

@@ -28,13 +28,10 @@
 import com.microsoft.intellij.AzureLinkStorage;
 import com.microsoft.intellij.helpers.AzureIconLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureIconSymbol;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class SpringDatasourceCompletionContributor extends CompletionContributor {
 
@@ -51,7 +48,7 @@ public void addCompletions(@NotNull CompletionParameters parameters,
                                 .withInsertHandler(new MyInsertHandler())
                                 .withBoldness(true)
                                 .withTypeText("String")
-                                .withTailText(" (Link Azure Datasource for MySQL Service)")
+                                .withTailText(" (Connect to Azure Datasource for MySQL)")
                                 .withAutoCompletionPolicy(AutoCompletionPolicy.SETTINGS_DEPENDENT)
                         );
                     }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/SpringDatasourceLineMarkerProvider.java

@@ -59,7 +59,7 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
                 JdbcUrl url = JdbcUrl.from(service.getUrl());
                 LineMarkerInfo lineMarkerInfo = new LineMarkerInfo<>(element, element.getTextRange(),
                         AzureIconLoader.loadIcon(AzureIconSymbol.MySQL.BIND_INTO),
-                        element2 -> String.format("Link to Azure Database for MySQL (%s)", url.getHostname()),
+                        element2 -> String.format("Connect to Azure Database for MySQL (%s)", url.getHostname()),
                         new SpringDatasourceNavigationHandler(service.getResourceId()),
                         GutterIconRenderer.Alignment.LEFT);
                 return lineMarkerInfo;

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/BeforeRunTaskUtils.java

@@ -19,6 +19,7 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifact;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 import lombok.SneakyThrows;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -43,7 +44,9 @@ public class BeforeRunTaskUtils {
     public static void addBeforeRunTask(@Nonnull ConfigurationSettingsEditorWrapper editor, @Nonnull AzureArtifact artifact, @Nonnull RunConfiguration config) {
         final List<? extends BeforeRunTask<?>> tasks = getBuildTasks(editor, artifact);
         final BeforeRunTask<?> task = createBuildTask(artifact, config);
-        addTask(editor, tasks, task, config);
+        if(Objects.nonNull(task)){ // task is null if artifact is File type.
+            addTask(editor, tasks, task, config);
+        }
     }
 
     public static void removeBeforeRunTask(@Nonnull ConfigurationSettingsEditorWrapper editor, @Nonnull AzureArtifact artifact) {
@@ -59,18 +62,22 @@ public static List<? extends BeforeRunTask<?>> getBuildTasks(@Nonnull Configurat
                 return getGradleAssembleTasks(editor, (ExternalProjectPojo) artifact.getReferencedObject());
             case Artifact:
                 return getIntellijBuildTasks(editor, (Artifact) artifact.getReferencedObject());
+            case File:
+                return Collections.emptyList();
         }
         throw new AzureToolkitRuntimeException("unsupported project/artifact type");
     }
 
-    public static BeforeRunTask<?> createBuildTask(@Nonnull AzureArtifact artifact, @Nonnull RunConfiguration config) {
+    public static @Nullable BeforeRunTask<?> createBuildTask(@Nonnull AzureArtifact artifact, @Nonnull RunConfiguration config) {
         switch (artifact.getType()) {
             case Maven:
                 return createMavenPackageTask((MavenProject) artifact.getReferencedObject(), config);
             case Gradle:
                 return createGradleAssembleTask((ExternalProjectPojo) artifact.getReferencedObject(), config);
             case Artifact:
                 return createIntellijBuildTask((Artifact) artifact.getReferencedObject(), config);
+            case File:
+                return null;
         }
         throw new AzureToolkitRuntimeException("unsupported project/artifact type");
     }