devsecops-engine-tools 1.45.1__py3-none-any.whl → 1.45.2__py3-none-any.whl

devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py

@@ -40,7 +40,7 @@ class DockerImages(ImagesGateway):
                 return None
 
             labels = image_details.get("Config", {}).get("Labels", {})
-            return self.extract_base_image_from_labels(labels, matching_image)
+            return self.extract_base_image_from_labels(labels, matching_image)[0]
         except Exception as e:
             logger.warning(f"Error obtaining base image: {e}")
             return None
@@ -50,17 +50,18 @@ class DockerImages(ImagesGateway):
             logger.error("Error: matching_image ID is None")
             return False
         image_details = self.get_image_details(matching_image.id)
-        if not image_details:
+        if not image_details.get("Config", {}).get("Labels", {}):
             return False
 
         labels = image_details.get("Config", {}).get("Labels", {})
         baseline_date = labels.get("x86.baseline.date")
-
+        date_image = None
         if baseline_date:
             date_image = self.parse_date(baseline_date)
         else:
             base_image = self.extract_base_image_from_labels(labels)
-            date_image = self.extract_date_from_image(base_image)
+            if not base_image[1]:
+                date_image = self.extract_date_from_image(base_image[0])
 
         return self.validate_date(date_image, referenced_date)
 
@@ -74,23 +75,23 @@ class DockerImages(ImagesGateway):
 
     def extract_base_image_from_labels(self, labels, matching_image=None):
         try:
-            if labels.get("repository") == 'evc/uso_especifico':
-                return None
-            source_image = labels.get("x86.image.name") or labels.get(
-                "image.base.ref.name"
-            )
-            if not source_image:
-                source_image = labels.get("source_images") or labels.get("source-image")
-
-            if source_image and matching_image:
-                logger.info(f"Base image for '{matching_image}' found: {source_image}")
-            elif matching_image:
-                logger.warning(f"Base image not found for '{matching_image}'.")
-
-            return source_image
+            if labels:
+                source_image = labels.get("x86.image.name") or labels.get("image.base.ref.name")
+                if not source_image:
+                    source_image = labels.get("source_images") or labels.get("source-image")
+                is_uso_especifico = labels.get("repository") == 'evc/uso_especifico'
+                if source_image and matching_image:
+                    logger.info(f"Base image for '{matching_image}' found: {source_image}")
+                elif matching_image:
+                    logger.warning(f"Base image not found for '{matching_image}'.")
+                return source_image, is_uso_especifico
+            else:
+                logger.warning("No labels found in image.")
+                return None, False
         except Exception as e:
             logger.error(f"Error extracting base image from labels: {e}")
-            return None
+            return None, False
+
 
     def extract_date_from_image(self, image_name):
         if not image_name:

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.45.1'
+version = '1.45.2'

{devsecops_engine_tools-1.45.1.dist-info → devsecops_engine_tools-1.45.2.dist-info}/METADATA

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

{devsecops_engine_tools-1.45.1.dist-info → devsecops_engine_tools-1.45.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=Z57gtp7hcxxamXKeuwtVM8WjA5LfJYzYZzFFtB4qnAo,19
+devsecops_engine_tools/version.py,sha256=antqI6_Sq8TkzGIe35prfxiCyqwaxzBHjt1KV0MuZXQ,19
 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
@@ -207,7 +207,7 @@ devsecops_engine_tools/engine_sca/engine_container/src/domain/usecases/set_input
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py,sha256=JqgWwb2PoJRqWE-bFJvsCuGd1WPzyc8PHJbKtdWW_S4,4731
+devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py,sha256=0yWqo6AoHFKKGg8rbFOx-BWDra448HEOaWSP5G0B1dg,4991
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py,sha256=tf33YFYB47th4Zu0WtWpsrAm5I6_xCON4yOwFacTQLA,6758
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_deserialize_output.py,sha256=oK0NKuPODm38qDgQjf6w40lfNG6NFJS43p5k44wDoMA,2562
@@ -347,8 +347,8 @@ devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGax
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=amYAr9YQfYgR6jK9a2l26z3oovFPQ3FAKmhq6BKhEBA,623
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=Z0fdhB3r-dxU0nGSD9zW_B4r2Qol1rUnUCkhFR0U-HQ,487
 devsecops_engine_tools/engine_utilities/utils/utils.py,sha256=XFap4yOK7ItLWsqbwDhvLd7NpDhs7i-UGJAMD6jjd7w,6687
-devsecops_engine_tools-1.45.1.dist-info/METADATA,sha256=F0iTpz3FI8WumFi_SNe6S6QxgbmSqQxxqWJ_lqxpsO8,11779
-devsecops_engine_tools-1.45.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.45.1.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
-devsecops_engine_tools-1.45.1.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.45.1.dist-info/RECORD,,
+devsecops_engine_tools-1.45.2.dist-info/METADATA,sha256=QPaG6XSZoASFHYTPihEZhhcNmDGFj9etkG45_tulxwc,11779
+devsecops_engine_tools-1.45.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.45.2.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
+devsecops_engine_tools-1.45.2.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.45.2.dist-info/RECORD,,