DEV-74217: Modified: Implementing the review comments and changing the README

Author: choudharypooja

README.md

@@ -34,6 +34,7 @@ The runtime stack should be set to Java version 11. The function uses the follow
 * `LogicMonitorCompanyName` - Company in the target URL '{company}.logicmonitor.com'
 * `LogicMonitorAccessId` - LogicMonitor access ID
 * `LogicMonitorAccessKey` - LogicMonitor access key
+* `AzureClientID` - Azure Application Client ID
 * `LogApiClientConnectTimeout` (optional) - Connection timeout in milliseconds (default 10000)
 * `LogApiClientReadTimeout` (optional) - Read timeout in milliseconds (default 10000)
 * `LogApiClientDebugging` (optional) - HTTP client debugging: true/false (default false)

package/lm-logs-azure.zip

@@ -15,7 +15,9 @@
 package com.logicmonitor.logs.azure;
 
 import java.time.Instant;
-import java.util.*;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -58,7 +60,7 @@ public class LogEventAdapter implements Function<String, List<LogEntry>> {
     /**
      * Categories of Azure activity logs generated
      */
-    public static final Set AUDIT_LOG_CATEGORIES = new HashSet(Arrays.asList("administrative","serviceHealth","resourcehealth","alert","autoscale","security","policy","recommendation"));
+    public static final Set AUDIT_LOG_CATEGORIES = Set.of("administrative","serviceHealth","resourcehealth","alert","autoscale","security","policy","recommendation");
 
     /**
      * GSON instance.
@@ -118,12 +120,12 @@ public List<LogEntry> apply(String jsonString) {
     protected LogEntry createEntry(JsonObject json) {
         LogEventMessage event = GSON.fromJson(json, LogEventMessage.class);
         LogEntry entry = new LogEntry();
-        if(event.getCategory() != null && AUDIT_LOG_CATEGORIES.contains(event.getCategory().toLowerCase()))
+        if((event.getCategory() != null && AUDIT_LOG_CATEGORIES.contains(event.getCategory().toLowerCase())))
         {
             //client ID for activity logs
             entry.putLmResourceIdItem(LM_CLIENT_ID,azureClientId);
             entry.putLmResourceIdItem(LM_SYSTEM_CATEGORIES,"Azure/LMAccount");
-        }else {
+        } else {
             // resource ID
             entry.putLmResourceIdItem(LM_RESOURCE_PROPERTY, event.getResourceId());
         }

src/main/java/com/logicmonitor/logs/azure/LogEventAdapter.java

@@ -43,7 +43,7 @@
  * <li>{@value #PARAMETER_READ_TIMEOUT} Read timeout in milliseconds (default 10000)
  * <li>{@value #PARAMETER_DEBUGGING} HTTP client debugging
  * <li>{@value #PARAMETER_REGEX_SCRUB} Regex to scrub text from logs
- *  <li>{@value #PARAMETER_AZURE_CLIENT_ID} Azure Application Client ID
+ * <li>{@value #PARAMETER_AZURE_CLIENT_ID} Azure Application Client ID
  * </ul>
  */
 public class LogEventForwarder {

src/main/java/com/logicmonitor/logs/azure/LogEventForwarder.java

@@ -47,7 +47,7 @@ public void testApply(String resourceName, int expectedEntriesCount) {
 
     @ParameterizedTest
     @CsvSource({
-        "activity_storage_account.json, ,                                              ,xyz",
+        "activity_storage_account.json, ,                                              , xyz",
         "activity_webapp.json,          ,            [\\w-.#]+@[\\w-.]+                , abc",
         "resource_db_account.json,      ,            \\d+\\.\\d+\\.\\d+\\.\\d+         ,    ",
         "resource_sql.json,             ,            '\"SubscriptionId\":\"[^\"]+\",'  ,    ",

src/test/java/com/logicmonitor/logs/azure/LogEventAdapterTest.java

@@ -17,15 +17,11 @@
 import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.logicmonitor.logs.invoker.ServerConfiguration;
-import org.junit.Before;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import com.logicmonitor.logs.LMLogsApi;
@@ -115,11 +111,12 @@ public void testProcessEvents(String resourceName, int expectedEntriesCount) thr
             () -> assertEquals(expectedEntriesCount, entries.size()),
             () -> entries.forEach(entry -> assertNotNull(entry.getMessage())),
             () -> entries.forEach(entry -> assertNotNull(entry.getTimestamp())),
-            () -> entries.forEach((entry) ->{
+            () -> entries.forEach((entry) -> {
                 if (entry.getLmResourceId().containsKey(LogEventAdapter.LM_CLIENT_ID))
                     assertNotNull(entry.getLmResourceId().get(LogEventAdapter.LM_CLIENT_ID));
                 else assertNotNull(
-                    entry.getLmResourceId().get(LogEventAdapter.LM_RESOURCE_PROPERTY));})
+                    entry.getLmResourceId().get(LogEventAdapter.LM_RESOURCE_PROPERTY));
+            })
         );
     });
     }