Merge pull request #179 from freenowtech/read_properties_files_independently

Read the properties files independently. Fail in reading file or if f…

Author: adeelahmadch

plugins/kubernetesapi-report/src/main/java/com/freenow/sauron/plugins/readers/KubernetesPropertiesFilesReader.java

@@ -9,10 +9,12 @@
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -40,50 +42,41 @@ public void read(DataSet input, String serviceLabel, Map<String, Map<String, Str
     {
         new RetryCommand<Void>(retryConfig).run(() ->
         {
-            boolean foundAll = kubernetesGetObjectMetaCommand.get(serviceLabel, POD, input.getServiceName(), apiClient)
+            kubernetesGetObjectMetaCommand.get(serviceLabel, POD, input.getServiceName(), apiClient)
                 .map(V1ObjectMeta::getName)
-                .map(podName -> exec(podName, input, propertiesFilesCheck, apiClient))
-                .orElse(false);
-
-            if (!foundAll)
-            {
-                throw new NoSuchElementException(String.format("Properties %s not found.", propertiesFilesCheck));
-            }
+                .ifPresent(podName -> exec(podName, input, propertiesFilesCheck, apiClient));
             return null;
         });
     }
 
 
-    private Boolean exec(final String podName, DataSet input, final Map<String, Map<String, String>> propertiesFilesCheck, final ApiClient apiClient)
+    private void exec(final String podName, DataSet input, final Map<String, Map<String, String>> propertiesFilesCheck, final ApiClient apiClient)
     {
-        return propertiesFilesCheck.entrySet().stream().allMatch(it -> {
-            Optional<String> podFileProps = kubernetesExecCommand.exec(podName, String.format(ENV_COMMAND, it.getKey()), apiClient);
+        propertiesFilesCheck.forEach((propFilePath, propKeys) -> {
+            Optional<String> podFileProps = kubernetesExecCommand.exec(podName, String.format(ENV_COMMAND, propFilePath), apiClient);
             if (podFileProps.isPresent())
             {
                 Properties props = parse(podFileProps.get());
-                return matchProps(input, it.getKey(), it.getValue(), props);
+                matchProps(input, propFilePath, propKeys, props);
             }
             else
             {
-                log.info("Properties not found in {} at POD {}", it.getKey(), podName);
-                return false;
+                log.info("Properties file {} not found in POD {}. Properties: {} will be skipped", propFilePath, podName, String.join(",", propKeys.keySet()));
             }
         });
     }
 
 
-    private boolean matchProps(DataSet input, String propFilePath, Map<String, String> propKeys, Properties props)
+    private void matchProps(DataSet input, String propFilePath, Map<String, String> propKeys, Properties props)
     {
-        return propKeys.entrySet().stream().allMatch(prop -> {
-            if (props.containsKey(prop.getValue()))
+        propKeys.forEach((key, value) -> {
+            if (props.containsKey(value))
             {
-                input.setAdditionalInformation(prop.getKey(), props.get(prop.getValue()));
-                return true;
+                input.setAdditionalInformation(key, props.get(value));
             }
             else
             {
-                log.info("Property Key {}, not found at {}", prop.getValue(), propFilePath);
-                return false;
+                log.info("Property Key {}, not found at {}", value, propFilePath);
             }
         });
     }

plugins/kubernetesapi-report/src/test/java/com/freenow/sauron/plugins/KubernetesPropertiesFilesReaderTest.java

@@ -34,6 +34,7 @@ public class KubernetesPropertiesFilesReaderTest
     private static final String PROP_FILE_ENV_VERSION = "dummy.env";
     private static final String ENV_ENABLED = "ENV_ENABLED";
     private static final String ENV_VERSION = "ENV_VERSION";
+    private static final String ENV_ANOTHER = "ENV_ANOTHER";
     private static final String PROPERTIES_FILES_CHECK = "propertiesFilesCheck";
 
     @Mock
@@ -61,6 +62,23 @@ public void read()
         assertNotNull(input);
         assertEquals("true", input.getStringAdditionalInformation(ENV_ENABLED).get());
         assertEquals("8080", input.getStringAdditionalInformation(ENV_VERSION).get());
+        assertFalse(input.getStringAdditionalInformation(ENV_ANOTHER).isPresent());
+    }
+
+    @Test
+    public void twoPropertiesFilesRequestedToCheckButOneIsNotFound()
+    {
+        final var objMetaData = createObjMetaData();
+        final var input = dummyDataSet();
+        when(kubernetesGetObjectMetaCommand.get(SERVICE_LABEL, POD, SERVICE_NAME, apiClient)).thenReturn(objMetaData);
+        when(kubernetesExecCommand.exec(objMetaData.get().getName(), String.format(ENV_COMMAND, PROP_FILE_ENV_ENABLED), apiClient)).thenReturn(envProps());
+        when(kubernetesExecCommand.exec(objMetaData.get().getName(), String.format(ENV_COMMAND, PROP_FILE_ENV_VERSION), apiClient)).thenReturn(Optional.empty());
+
+        kubernetesPropertiesFilesReader.read(input, SERVICE_LABEL, getPropertyFilesConfig(), apiClient);
+        assertNotNull(input);
+        assertEquals("true", input.getStringAdditionalInformation(ENV_ENABLED).get());
+        assertFalse(input.getStringAdditionalInformation(ENV_VERSION).isPresent());
+        assertFalse(input.getStringAdditionalInformation(ENV_ANOTHER).isPresent());
     }
 
 
@@ -75,6 +93,7 @@ public void noPropertyFileFoundOnPOD()
         assertNotNull(input);
         assertFalse(input.getStringAdditionalInformation(ENV_ENABLED).isPresent());
         assertFalse(input.getStringAdditionalInformation(ENV_VERSION).isPresent());
+        assertFalse(input.getStringAdditionalInformation(ENV_ANOTHER).isPresent());
     }
 
 
@@ -106,7 +125,8 @@ private PluginsConfigurationProperties dummyPluginConfig()
             Map.of(
                 "dummy.properties",
                 Map.of(
-                    "ENV_ENABLED", "env.is.enabled"
+                    "ENV_ENABLED", "env.is.enabled",
+                    "ENV_ANOTHER", "env.is.not.found"
                 ),
                 "dummy.env", Map.of(
                     "ENV_VERSION", "ENV_VERSION"