Helm Charts are skipped (and issue a warning) if Helm is not installed (#419)

* Helm Charts are skipped (and issue a warning) if Helm is not installed

* linting fixed

* small fix

* linting...

Author: shmfr

nca/FileScanners/DirScanner.py

@@ -48,6 +48,9 @@ def _scan_dir_for_yamls(self, dir_path, recursive):
             for file in files:
                 try:
                     if self.is_helm_chart(file):
+                        if not self.helm_path:
+                            print(f'HELM is not installed - Skipping {os.path.abspath(os.path.join(root, file))}', file=stderr)
+                            continue
                         file_name, file_content = self.parse_chart(root)
                         file_stream = io.StringIO(file_content)
                         yield from self._yield_yaml_file(file_name, file_stream)

nca/FileScanners/HelmScanner.py

@@ -9,6 +9,7 @@
 
 import os
 import re
+import shutil
 from nca.Utils.CmdlineRunner import CmdlineRunner
 
 
@@ -19,6 +20,7 @@ class HelmScanner:
 
     def __init__(self):
         self.template_files = []
+        self.helm_path = shutil.which('helm')
 
     def parse_chart(self, chart_dir):
         """

nca/NetworkConfig/ResourcesHandler.py

@@ -101,6 +101,9 @@ def analyze_livesim(policy_finder):
         """
         livesim_configuration_addons = []
 
+        # stop collecting messages when pre-processing and analyzing livesim yaml files.
+        NcaLogger().dont_collect_msgs()
+
         # find kube-dns reference
         dns_added_resources = ResourcesHandler.get_relevant_livesim_resources_paths_by_labels_matching(
             LiveSimPaths.DnsCfgPath, policy_finder.missing_dns_pods_with_labels)
@@ -121,6 +124,7 @@ def analyze_livesim(policy_finder):
             livesim_configuration_addons += istio_gateway_added_resources
             ResourcesHandler.livesim_information_message('Istio-ingress-gateway')
 
+        NcaLogger().collect_msgs()
         return livesim_configuration_addons
 
     def parse_elements(self, ns_list, pod_list, resource_list, config_name, save_flag, np_list):
@@ -169,9 +173,9 @@ def get_network_config(self, np_list, ns_list, pod_list, resource_list, config_n
                                                                     save_flag,
                                                                     np_list
                                                                     )
-        NcaLogger().unmute()
         # check if LiveSim can add anything.
         livesim_addons = self.analyze_livesim(resources_parser.policies_finder)
+        NcaLogger().unmute()
         if livesim_addons:
             NcaLogger().flush_messages(silent=True)
             if ns_list:

nca/NetworkConfig/TopologyObjectsFinder.py

@@ -9,6 +9,7 @@
 from nca.CoreDS.Peer import PeerSet, Pod, IpBlock, HostEP
 from nca.Resources.K8sNamespace import K8sNamespace
 from nca.Parsers.K8sServiceYamlParser import K8sServiceYamlParser
+from nca.Utils.NcaLogger import NcaLogger
 
 
 class PodsFinder:
@@ -301,7 +302,7 @@ def get_or_update_namespace(self, ns_name):
         :rtype: K8sNamespace
         """
         if ns_name not in self.namespaces:
-            print('Namespace', ns_name, 'is missing from the peer container', file=stderr)
+            NcaLogger().log_message(msg=f'Namespace {ns_name} is missing from the peer container', file=stderr)
             namespace = K8sNamespace(ns_name)
             self.namespaces[ns_name] = namespace
         return self.namespaces[ns_name]

nca/Utils/NcaLogger.py

@@ -43,6 +43,7 @@ class NcaLogger(metaclass=Singleton):
     def __init__(self):
         self._is_mute = False
         self._collected_messages = []
+        self._is_collecting_msgs = True
 
     def mute(self):
         """
@@ -63,6 +64,25 @@ def is_mute(self):
         """
         return self._is_mute
 
+    def collect_msgs(self):
+        """
+        collect muted messages
+        """
+        self._is_collecting_msgs = True
+
+    def dont_collect_msgs(self):
+        """
+        dont collect muted messages
+        """
+        self._is_collecting_msgs = False
+
+    def is_collecting_msgs(self):
+        """
+        Return are muted messages being collected?
+        :return: bool: True for collecting messages, False for not collecting messages.
+        """
+        return self._is_collecting_msgs
+
     def log_message(self, msg, file=None, level=None):
         """
         Log a message
@@ -78,7 +98,8 @@ def log_message(self, msg, file=None, level=None):
                 file = sys.stderr
 
         if self.is_mute():
-            self._collected_messages.append(msg)
+            if self._is_collecting_msgs:
+                self._collected_messages.append(msg)
         else:
             print(msg, file=file)