devsecops-engine-tools 1.8.7__py3-none-any.whl → 1.8.8__py3-none-any.whl

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/version.py

@@ -1 +1 @@
-version = '1.8.7'
+version = '1.8.8'

{devsecops_engine_tools-1.8.7.dist-info → devsecops_engine_tools-1.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.8.7
+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.7.dist-info → devsecops_engine_tools-1.8.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=CSY3U1mG4ZdGkeFALSRBoT3T-otyCaGlpwqlMkcKaLc,18
+devsecops_engine_tools/version.py,sha256=-i1sCaYHo9pMcwJvNHR93Bry-2hAvFKP2p6rM5wsnzM,17
 devsecops_engine_tools/engine_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -181,7 +181,7 @@ devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/__init_
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_deserialize_output.py,sha256=Vm0pj1i6a34xXouXUU95Y04hzR--9tcMQuycR7IMUnQ,2221
-devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py,sha256=1_jT819e8HKH-qirKtqvgyKAi16Pu0YW7OEkEqWoM_M,10052
+devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py,sha256=y3W4gpyAEHZoHEZaMaeFPfJ3zmNBc2TUcYhYCSosi1E,10525
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py,sha256=NBzg9VoGIqHeXuhDR4vBgwPMFnkjzJssBddPo1R23R0,2524
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -249,8 +249,8 @@ devsecops_engine_tools/engine_utilities/utils/logger_info.py,sha256=4Mz8Bwlm9Mku
 devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGaxYSDe0ZRh6VHRf53H4sXPcb-vNP_i81PUn3I,307
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=amYAr9YQfYgR6jK9a2l26z3oovFPQ3FAKmhq6BKhEBA,623
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=yNtlT-8Legz1sHbGPH8LNYjL-LgDUE0zXG2rYjiab7U,290
-devsecops_engine_tools-1.8.7.dist-info/METADATA,sha256=_n4iDlB6FQUsRY4jARO-Fv6r0BRq0Q64IwbkLUKzCSM,10221
-devsecops_engine_tools-1.8.7.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.8.7.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
-devsecops_engine_tools-1.8.7.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.8.7.dist-info/RECORD,,
+devsecops_engine_tools-1.8.8.dist-info/METADATA,sha256=Bh1iw2ux8Ljaqf8PrZD5TQlfYctyKvt-gigi37okOiQ,10221
+devsecops_engine_tools-1.8.8.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.8.8.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
+devsecops_engine_tools-1.8.8.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.8.8.dist-info/RECORD,,