chore: fix integration test related issues

Signed-off-by: Ben Selwyn-Smith <[email protected]>

Author: benmss

src/macaron/repo_finder/provenance_finder.py

@@ -54,6 +54,8 @@ def find_provenance(self, purl: PackageURL) -> InTotoPayload | None:
         InTotoPayload | None
             The provenance payload if found, or None.
         """
+        logger.debug("Seeking provenance of: %s", purl)
+
         if determine_abstract_purl_type(purl) == AbstractPurlType.REPOSITORY:
             # Do not perform this function for repository type targets.
             return None
@@ -282,7 +284,7 @@ def find_provenance_from_ci(self, analyze_ctx: AnalyzeContext, git_obj: Git | No
                         return None
                     tags = git_obj.repo.tags
                     for _tag in tags:
-                        if _tag.commit and _tag.commit == digest:
+                        if _tag.commit and str(_tag.commit) == digest:
                             tag = str(_tag)
                             break
 

src/macaron/slsa_analyzer/analyzer.py

@@ -1045,6 +1045,9 @@ def _determine_build_tools(self, analyze_ctx: AnalyzeContext, git_service: BaseG
             if isinstance(git_service, NoneGitService):
                 continue
 
+            if not analyze_ctx.component.repository:
+                continue
+
             logger.info(
                 "Checking if the repo %s uses build tool %s",
                 analyze_ctx.component.repository.complete_name,
@@ -1056,10 +1059,13 @@ def _determine_build_tools(self, analyze_ctx: AnalyzeContext, git_service: BaseG
                 analyze_ctx.dynamic_data["build_spec"]["tools"].append(build_tool)
 
         if not analyze_ctx.dynamic_data["build_spec"]["tools"]:
-            logger.info(
-                "Unable to discover any build tools for repository %s or the build tools are not supported.",
-                analyze_ctx.component.repository.complete_name,
-            )
+            if analyze_ctx.component.repository:
+                logger.info(
+                    "Unable to discover any build tools for repository %s or the build tools are not supported.",
+                    analyze_ctx.component.repository.complete_name,
+                )
+            else:
+                logger.info("Unable to discover build tools because repository is None.")
 
     def _determine_ci_services(self, analyze_ctx: AnalyzeContext, git_service: BaseGitService) -> None:
         """Determine the CI services used by the software component."""

tests/integration/cases/micronaut-projects_micronaut-test/micronaut-test.dl

@@ -7,9 +7,9 @@ Policy("test_policy", component_id, "") :-
     check_passed(component_id, "mcn_build_as_code_1"),
     check_passed(component_id, "mcn_build_script_1"),
     check_passed(component_id, "mcn_build_service_1"),
-    check_passed(component_id, "mcn_provenance_available_1"),
-    check_passed(component_id, "mcn_provenance_level_three_1"),
     check_passed(component_id, "mcn_version_control_system_1"),
+    check_failed(component_id, "mcn_provenance_available_1"),
+    check_failed(component_id, "mcn_provenance_level_three_1"),
     check_failed(component_id, "mcn_infer_artifact_pipeline_1"),
     check_failed(component_id, "mcn_provenance_derived_commit_1"),
     check_failed(component_id, "mcn_provenance_derived_repo_1"),

tests/integration/cases/sigstore_mock/policy.dl

@@ -9,9 +9,9 @@ Policy("test_policy", component_id, "") :-
     check_passed(component_id, "mcn_build_service_1"),
     check_passed(component_id, "mcn_provenance_available_1"),
     check_passed(component_id, "mcn_version_control_system_1"),
+    check_passed(component_id, "mcn_provenance_derived_commit_1"),
+    check_passed(component_id, "mcn_provenance_derived_repo_1"),
     check_failed(component_id, "mcn_infer_artifact_pipeline_1"),
-    check_failed(component_id, "mcn_provenance_derived_commit_1"),
-    check_failed(component_id, "mcn_provenance_derived_repo_1"),
     check_failed(component_id, "mcn_provenance_level_three_1"),
     check_failed(component_id, "mcn_provenance_witness_level_one_1"),
     check_failed(component_id, "mcn_trusted_builder_level_three_1"),

tests/integration/cases/urllib3_expectation_dir/policy.dl

@@ -7,10 +7,10 @@ Policy("test_policy", component_id, "") :-
     check_passed(component_id, "mcn_build_as_code_1"),
     check_passed(component_id, "mcn_build_script_1"),
     check_passed(component_id, "mcn_build_service_1"),
-    check_passed(component_id, "mcn_provenance_available_1"),
-    check_passed(component_id, "mcn_provenance_expectation_1"),
-    check_passed(component_id, "mcn_provenance_level_three_1"),
     check_passed(component_id, "mcn_version_control_system_1"),
+    check_failed(component_id, "mcn_provenance_available_1"),
+    check_failed(component_id, "mcn_provenance_expectation_1"),
+    check_failed(component_id, "mcn_provenance_level_three_1"),
     check_failed(component_id, "mcn_infer_artifact_pipeline_1"),
     check_failed(component_id, "mcn_provenance_derived_commit_1"),
     check_failed(component_id, "mcn_provenance_derived_repo_1"),

tests/integration/cases/urllib3_expectation_file/policy.dl

@@ -7,10 +7,10 @@ Policy("test_policy", component_id, "") :-
     check_passed(component_id, "mcn_build_as_code_1"),
     check_passed(component_id, "mcn_build_script_1"),
     check_passed(component_id, "mcn_build_service_1"),
-    check_passed(component_id, "mcn_provenance_available_1"),
-    check_passed(component_id, "mcn_provenance_expectation_1"),
-    check_passed(component_id, "mcn_provenance_level_three_1"),
     check_passed(component_id, "mcn_version_control_system_1"),
+    check_failed(component_id, "mcn_provenance_available_1"),
+    check_failed(component_id, "mcn_provenance_expectation_1"),
+    check_failed(component_id, "mcn_provenance_level_three_1"),
     check_failed(component_id, "mcn_infer_artifact_pipeline_1"),
     check_failed(component_id, "mcn_provenance_derived_commit_1"),
     check_failed(component_id, "mcn_provenance_derived_repo_1"),

tests/integration/cases/urllib3_invalid_expectation/policy.dl

@@ -7,9 +7,9 @@ Policy("test_policy", component_id, "") :-
     check_passed(component_id, "mcn_build_as_code_1"),
     check_passed(component_id, "mcn_build_script_1"),
     check_passed(component_id, "mcn_build_service_1"),
-    check_passed(component_id, "mcn_provenance_available_1"),
-    check_passed(component_id, "mcn_provenance_level_three_1"),
     check_passed(component_id, "mcn_version_control_system_1"),
+    check_failed(component_id, "mcn_provenance_available_1"),
+    check_failed(component_id, "mcn_provenance_level_three_1"),
     check_failed(component_id, "mcn_infer_artifact_pipeline_1"),
     check_failed(component_id, "mcn_provenance_derived_commit_1"),
     check_failed(component_id, "mcn_provenance_derived_repo_1"),