#1955378: [Test] NPE when start streaming log for an un-deployed function app

Author: wangmingliang-ms

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

@@ -98,17 +98,18 @@ private static String getApplicationInsightLiveMetricsUrl(ApplicationInsight tar
     }
 
     private static boolean isLogStreamingEnabled(FunctionAppBase<?, ?, ?> functionApp) {
-        return functionApp.getRuntime().getOperatingSystem() == OperatingSystem.LINUX || 
-                Optional.ofNullable(functionApp.getDiagnosticConfig()).map(DiagnosticConfig::isEnableWebServerLogging).orElse(false);
+        final OperatingSystem operatingSystem = Optional.ofNullable(functionApp.getRuntime())
+                .map(r -> r.getOperatingSystem()).orElse(null);
+        final boolean isEnableApplicationLog = Optional.ofNullable(functionApp.getDiagnosticConfig())
+                .map(DiagnosticConfig::isEnableApplicationLog).orElse(false);
+        return operatingSystem == OperatingSystem.LINUX || isEnableApplicationLog;
     }
 
     private static void enableLogStreaming(FunctionAppBase<?, ?, ?> functionApp) {
-        final DiagnosticConfig diagnosticConfig = functionApp.getDiagnosticConfig();
+        final DiagnosticConfig diagnosticConfig = Optional.ofNullable(functionApp.getDiagnosticConfig()).orElseGet(DiagnosticConfig::new);
         diagnosticConfig.setEnableApplicationLog(true);
-        if (functionApp instanceof FunctionApp) {
-            final FunctionAppDraft draft = (FunctionAppDraft) ((FunctionApp) functionApp).update();
-            draft.setDiagnosticConfig(diagnosticConfig);
-            draft.updateIfExist();
-        }
+        final FunctionAppDraft draft = (FunctionAppDraft) functionApp.update();
+        draft.setDiagnosticConfig(diagnosticConfig);
+        draft.commit();
     }
 }

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/webapp/handlers/WebAppLogStreamingHandler.java

@@ -54,7 +54,7 @@ private static boolean isLogStreamingEnabled(WebAppBase<?, ?, ?> webApp) {
     }
 
     private static void enableLogStreaming(WebAppBase<?, ?, ?> webApp) {
-        final DiagnosticConfig diagnosticConfig = webApp.getDiagnosticConfig();
+        final DiagnosticConfig diagnosticConfig = Optional.ofNullable(webApp.getDiagnosticConfig()).orElseGet(DiagnosticConfig::new);
         diagnosticConfig.setEnableWebServerLogging(true);
         diagnosticConfig.setWebServerLogQuota(35);
         diagnosticConfig.setWebServerRetentionPeriod(0);

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

@@ -161,7 +161,7 @@ public boolean isLogStreamingEnabled() {
             final OperatingSystem operatingSystem = Optional.ofNullable(functionApp.getRuntime()).map(Runtime::getOperatingSystem).orElse(null);
             final boolean isEnableApplicationLog = Optional.ofNullable(functionApp.getDiagnosticConfig())
                     .map(DiagnosticConfig::isEnableApplicationLog).orElse(false);
-            return operatingSystem == OperatingSystem.LINUX || functionApp.getDiagnosticConfig().isEnableApplicationLog();
+            return operatingSystem == OperatingSystem.LINUX || isEnableApplicationLog;
         }
 
         @Override