fixed issue with host_id; fixed issue with cert paths

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2023-12-27
+### Changed
+
+- Fixed issue with defining host_id
+- Fixed issue with certificate paths
+
 ## [1.4.0] - 2023-12-13
 ### Changed
 

support_bundle.py

@@ -399,10 +399,8 @@ def run_identify():
     for file in minion_files:
         if os.path.exists(file):
             host_id = extract_minion_id(file)
-
-    if host_id:
-        identity_info["host_id"] = host_id
-    else:
+            identity_info["host_id"] = host_id
+            break
         logging.debug("Minion file not found")
 
     # identify controller name or IP
@@ -431,11 +429,14 @@ def run_identify():
         logging.debug("Controller Config not found")
 
     # identity Router id from certificate
-    router_certificate = "/opt/netfoundry/ziti/ziti-router/certs/client.cert.pem"
-    if os.path.exists(router_certificate):
-        ziti_router_id = extract_common_name(router_certificate)
-        identity_info['ziti_router_id'] = ziti_router_id
-        logging.debug("ZitiRouterId: %s", ziti_router_id)
+    certificate_files =["/opt/netfoundry/ziti/ziti-router/certs/client.cert.pem",
+                        "/opt/netfoundry/ziti/ziti-router/certs/cert.pem"]
+
+    for certificate in certificate_files:
+        if os.path.exists(certificate):
+            ziti_router_id = extract_common_name(certificate)
+            identity_info['ziti_router_id'] = ziti_router_id
+            logging.debug("ZitiRouterId: %s", ziti_router_id)
 
     return identity_info
 
@@ -722,7 +723,7 @@ def main():
 # main
 if __name__ == '__main__':
     try:
-        __version__ = '1.4.0'
+        __version__ = '1.4.1'
         # change log
         # https://github.com/netfoundry/edge-router-support-bundle/blob/main/CHANGELOG.md