Merge pull request #6654 from microsoft/hanli-fixes-202205

Fix miscellaneous bugs in end game

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/functionapp/logstreaming/FunctionAppLogStreamingHandler.java

@@ -46,10 +46,8 @@ public static void stopLogStreaming(final FunctionAppBase<?, ?, ?> functionApp)
 
     public static void startLogStreaming(final FunctionAppBase<?, ?, ?> functionApp) {
         if (!isLogStreamingEnabled(functionApp)) {
-            final boolean enableLogging = AzureTaskManager.getInstance()
-                    .runAndWaitAsObservable(new AzureTask<>(() -> AzureMessager.getMessager()
-                            .confirm(AzureString.format(ENABLE_FILE_LOGGING, functionApp.name()), ENABLE_LOGGING)))
-                    .toBlocking().single();
+            final boolean enableLogging = AzureMessager.getMessager()
+                            .confirm(AzureString.format(ENABLE_FILE_LOGGING, functionApp.getName()), ENABLE_LOGGING);
             if (enableLogging) {
                 enableLogStreaming(functionApp);
             } else {

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

@@ -30,7 +30,7 @@
 import java.util.Optional;
 
 public class ApplicationInsightsCreationDialog extends AzureDialog<ApplicationInsightDraft> implements AzureForm<ApplicationInsightDraft> {
-    private static final String DIALOG_TITLE = "Create Application Insight";
+    private static final String DIALOG_TITLE = "Create Application Insights";
 
     private JPanel pnlRoot;
     private SubscriptionComboBox subscriptionComboBox;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureArtifact.java

@@ -13,9 +13,11 @@
 import com.microsoft.intellij.util.MavenUtils;
 import icons.GradleIcons;
 import icons.MavenIcons;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.project.MavenProject;
 
+import javax.annotation.Nullable;
 import javax.swing.*;
 import java.nio.file.Paths;
 import java.util.Objects;
@@ -31,7 +33,11 @@ private AzureArtifact(final AzureArtifactType type, final String name, Object ob
         this.referencedObject = obj;
     }
 
-    public static AzureArtifact createFromFile(@NotNull String path) {
+    @Nullable
+    public static AzureArtifact createFromFile(@Nullable String path) {
+        if (StringUtils.isEmpty(path)) {
+            return null;
+        }
         final VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(path);
         return createFromFile(virtualFile);
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureArtifactManager.java

@@ -89,15 +89,15 @@ public String getFileForDeployment(AzureArtifact artifact) {
         }
     }
 
+    @Nullable
     public AzureArtifact getAzureArtifactById(String artifactId) {
         return getAllSupportedAzureArtifacts().stream().filter(artifact -> StringUtils.equals(getArtifactIdentifier(
                 artifact), artifactId)).findFirst().orElse(null);
     }
 
+    @Nullable
     public AzureArtifact getAzureArtifactById(AzureArtifactType azureArtifactType, String artifactId) {
-        return azureArtifactType == File ? AzureArtifact.createFromFile(artifactId) :
-               getAllSupportedAzureArtifacts().stream().filter(artifact -> StringUtils.equals(getArtifactIdentifier(
-                artifact), artifactId)).findFirst().orElse(null);
+        return azureArtifactType == File ? AzureArtifact.createFromFile(artifactId) : getAzureArtifactById(artifactId);
     }
 
     public String getPackaging(AzureArtifact artifact) {

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/message.properties

@@ -35,4 +35,7 @@ springcloud.deploy_app.no_artifact=nothing to deploy
 springcloud.deploy_app.no_artifact.tips=You can add a BeforeRunTask to build the artifact automatically or build it manually by yourself beforehand
 
 vm.publicIpAddress.create.title=Create new public ip
-vm.publicIpAddress.description=Use a public IP address if you want to communicate with the virtual machine from outside the virtual network.
+vm.publicIpAddress.description=Use a public IP address if you want to communicate with the virtual machine from outside the virtual network.
+
+appService.logStreaming.error.noApplicationInsights=You must configure Application Insights to enable streaming logs on Linux Function Apps.
+appService.logStreaming.error.aiNotFound=Application Insights instance defined in app settings cannot be found in current subscription {0}