devsecops-engine-tools 1.8.6__tar.gz → 1.8.8__tar.gz

{devsecops_engine_tools-1.8.6 → devsecops_engine_tools-1.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.8.6
+Version: 1.8.8
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

{devsecops_engine_tools-1.8.6 → devsecops_engine_tools-1.8.8}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py

@@ -204,14 +204,26 @@ class XrayScan(ToolGateway):
         result = subprocess.run(
             command, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
         )
-        if result.stdout:
-            scan_result = json.loads(result.stdout)
-            file_result = os.path.join(os.getcwd(), "scan_result.json")
-            with open(file_result, "w") as file:
-                json.dump(scan_result, file, indent=4)
+        if result.stdout or all(
+            word in result.stderr
+            for word in ["Technology", "WorkingDirectory", "Descriptors"]
+        ):
+            if result.stdout:
+                scan_result = json.loads(result.stdout)
+            else:
+                scan_result = {}
+                if any(
+                    word in result.stderr
+                    for word in ["What went wrong", "Caused by"]
+                ):
+                    logger.error(f"Error executing Xray scan: {result.stderr}")
+                    return None
             if result.stdout == "null\n":
                 logger.warning(f"Xray scan returned null: {result.stderr}")
                 return None
+            file_result = os.path.join(os.getcwd(), "scan_result.json")
+            with open(file_result, "w") as file:
+                json.dump(scan_result, file, indent=4)
             return file_result
         else:
             logger.error(f"Error executing Xray scan: {result.stderr}")

devsecops_engine_tools-1.8.8/devsecops_engine_tools/version.py

@@ -0,0 +1 @@
+version = '1.8.8'

{devsecops_engine_tools-1.8.6 → devsecops_engine_tools-1.8.8}/devsecops_engine_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.8.6
+Version: 1.8.8
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

devsecops_engine_tools-1.8.6/devsecops_engine_tools/version.py

@@ -1 +0,0 @@
-version = '1.8.6'