diff --git a/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py b/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py index 4cdbbb62..d5d91f1c 100755 --- a/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py +++ b/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py @@ -37,7 +37,7 @@ def get_base_image(self, matching_image): client = docker.from_env() image_details = client.api.inspect_image(matching_image.id) labels = image_details.get("Config", {}).get("Labels", {}) - source_image = labels.get("source-image") + source_image = labels.get("x86.image.name") if source_image: logger.info(f"Base image for '{matching_image}' from source-image label: {source_image}") return source_image diff --git a/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py b/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py index 66440a51..78b5ade6 100755 --- a/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py +++ b/tools/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py @@ -89,7 +89,7 @@ def _write_image_base(self, result_file, base_image, exclusions_data): for exclusion in prisma_exclusions: if ( vulnerability.get("id") == exclusion.get("id") and - any(image.startswith(base_image) for image in exclusion.get("source_images", [])) + any(image.startswith(base_image) for image in exclusion.get("x86.image.name", [])) ): vulnerability["baseImage"] = base_image modified = True diff --git a/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/docker/test_docker_images.py b/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/docker/test_docker_images.py index eb730696..b7c15c26 100755 --- a/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/docker/test_docker_images.py +++ b/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/docker/test_docker_images.py @@ -120,7 +120,7 @@ def test_get_base_image_source_label(mock_docker_client): matching_image.id = "image_id" mock_client.api.inspect_image.return_value = { - "Config": {"Labels": {"source-image": "source_image:1.0"}}, + "Config": {"Labels": {"x86.image.name": "source_image:1.0"}}, } result = docker_images.get_base_image(matching_image) diff --git a/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/prisma_cloud/test_prisma_cloud_manager_scan.py b/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/prisma_cloud/test_prisma_cloud_manager_scan.py index 52e97c22..450a5691 100755 --- a/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/prisma_cloud/test_prisma_cloud_manager_scan.py +++ b/tools/devsecops_engine_tools/engine_sca/engine_container/test/infrastructure/driven_adapters/prisma_cloud/test_prisma_cloud_manager_scan.py @@ -239,7 +239,7 @@ def test_write_image_base_success(): "PRISMA": [ { "id": "CVE-1234-5678", - "source_images": ["python:3.9"] + "x86.image.name": ["python:3.9"] } ] } diff --git a/tools/devsecops_engine_tools/engine_utilities/sonarqube/src/domain/usecases/report_sonar.py b/tools/devsecops_engine_tools/engine_utilities/sonarqube/src/domain/usecases/report_sonar.py index 0e36ae4b..943e649b 100644 --- a/tools/devsecops_engine_tools/engine_utilities/sonarqube/src/domain/usecases/report_sonar.py +++ b/tools/devsecops_engine_tools/engine_utilities/sonarqube/src/domain/usecases/report_sonar.py @@ -42,7 +42,7 @@ def __init__( def process(self, args): pipeline_name = self.devops_platform_gateway.get_variable("pipeline_name") - branch = self.devops_platform_gateway.get_variable("branch_name") + branch = self.devops_platform_gateway.get_variable("branch_tag").replace("refs/heads/", "") input_core = InputCore( [], {}, diff --git a/tools/devsecops_engine_tools/version.py b/tools/devsecops_engine_tools/version.py index 6bef6b3e..ec27ea7b 100644 --- a/tools/devsecops_engine_tools/version.py +++ b/tools/devsecops_engine_tools/version.py @@ -1 +1 @@ -version = '1.26.0' +version = '1.26.3'