feat: update console ui and handle errors

Signed-off-by: Demolus13 <[email protected]>

Author: Demolus13

src/macaron/build_spec_generator/reproducible_central/reproducible_central.py

@@ -355,10 +355,10 @@ def gen_reproducible_central_build_spec(
     group = purl.namespace
     artifact = purl.name
     version = purl.version
+    rich_handler = access_handler.get_handler()
+    rich_handler.update_gen_build_spec("Package URL:", purl.to_string())
     if group is None or version is None:
         logger.error("Missing group and/or version for purl %s.", purl.to_string())
-        rich_handler = access_handler.get_handler()
-        rich_handler.update_gen_build_spec("Repository PURL:", "[red]FAILED[/]")
         rich_handler.update_gen_build_spec("Repository URL:", "[red]FAILED[/]")
         rich_handler.update_gen_build_spec("Commit Hash:", "[red]FAILED[/]")
         rich_handler.update_gen_build_spec("Build Tools:", "[red]FAILED[/]")
@@ -382,6 +382,9 @@ def gen_reproducible_central_build_spec(
             + "Please check if an analysis for it exists in the database.",
             purl.to_string(),
         )
+        rich_handler.update_gen_build_spec("Repository URL:", "[red]FAILED[/]")
+        rich_handler.update_gen_build_spec("Commit Hash:", "[red]FAILED[/]")
+        rich_handler.update_gen_build_spec("Build Tools:", "[red]FAILED[/]")
         return None
 
     latest_component_repository = latest_component.repository
@@ -397,8 +400,6 @@ def gen_reproducible_central_build_spec(
         latest_component_repository.remote_path,
         latest_component_repository.commit_sha,
     )
-    rich_handler = access_handler.get_handler()
-    rich_handler.update_gen_build_spec("Repository PURL:", purl.to_string())
     rich_handler.update_gen_build_spec("Repository URL:", latest_component_repository.remote_path)
     rich_handler.update_gen_build_spec("Commit Hash:", latest_component_repository.commit_sha)
 

src/macaron/console.py

@@ -43,7 +43,7 @@ def __init__(self, *args: Any, verbose: bool = False, **kwargs: Any) -> None:
         self.logs: list[str] = []
         self.description_table = Table(show_header=False, box=None)
         self.description_table_content: dict[str, str | Status] = {
-            "Full Name:": Status("[green]Processing[/]"),
+            "Package URL:": Status("[green]Processing[/]"),
             "Local Cloned Path:": Status("[green]Processing[/]"),
             "Remote Path:": Status("[green]Processing[/]"),
             "Branch:": Status("[green]Processing[/]"),
@@ -81,15 +81,15 @@ def __init__(self, *args: Any, verbose: bool = False, **kwargs: Any) -> None:
         self.verification_summary_attestation: str | None = None
         self.find_source_table = Table(show_header=False, box=None)
         self.find_source_content: dict[str, str | Status] = {
-            "Repository PURL:": Status("[green]Processing[/]"),
+            "Repository URL:": Status("[green]Processing[/]"),
             "Commit Hash:": Status("[green]Processing[/]"),
             "JSON Report:": "Not Generated",
         }
         for key, value in self.find_source_content.items():
             self.find_source_table.add_row(key, value)
         self.dump_defaults: str | Status = Status("[green]Generating[/]")
         self.gen_build_spec: dict[str, str | Status] = {
-            "Repository PURL:": Status("[green]Processing[/]"),
+            "Package URL:": Status("[green]Processing[/]"),
             "Repository URL:": Status("[green]Processing[/]"),
             "Commit Hash:": Status("[green]Processing[/]"),
             "Build Tools:": Status("[green]Processing[/]"),

src/macaron/repo_finder/repo_finder.py

@@ -123,20 +123,26 @@ def find_repo(
 
     # Try to find the latest version repo.
     logger.debug("Could not find repo for PURL: %s", purl)
+    rich_handler = access_handler.get_handler()
     latest_version_purl = get_latest_purl_if_different(purl)
     if not latest_version_purl:
         logger.debug("Could not find newer PURL than provided: %s", purl)
+        rich_handler.add_description_table_content("Local Cloned Path:", "[red]Not Found[/]")
+        rich_handler.add_description_table_content("Remote Path:", "[red]Not Found[/]")
         return "", RepoFinderInfo.NO_NEWER_VERSION
-
     found_repo, outcome = DepsDevRepoFinder().find_repo(latest_version_purl)
     if found_repo:
+        rich_handler.add_description_table_content("Local Cloned Path:", found_repo)
+        rich_handler.add_description_table_content("Remote Path:", found_repo)
         return found_repo, outcome
 
     if not found_repo:
         found_repo, outcome = find_repo_alternative(latest_version_purl, outcome, package_registries_info)
 
     if not found_repo:
         logger.debug("Could not find repo from latest version of PURL: %s", latest_version_purl)
+        rich_handler.add_description_table_content("Local Cloned Path:", "[red]Not Found[/]")
+        rich_handler.add_description_table_content("Remote Path:", "[red]Not Found[/]")
         return "", RepoFinderInfo.LATEST_VERSION_INVALID
 
     return found_repo, outcome
@@ -327,9 +333,9 @@ def find_source(purl_string: str, input_repo: str | None, latest_version_fallbac
     rich_handler = access_handler.get_handler()
     if not input_repo:
         logger.info("Found repository for PURL: %s", found_repo)
-        rich_handler.update_find_source_table("Repository PURL:", found_repo)
+        rich_handler.update_find_source_table("Repository URL:", found_repo)
     else:
-        rich_handler.update_find_source_table("Repository PURL:", input_repo)
+        rich_handler.update_find_source_table("Repository URL:", input_repo)
 
     logger.info("Found commit for PURL: %s", digest)
     rich_handler.update_find_source_table("Commit Hash:", digest)

src/macaron/slsa_analyzer/analyzer.py

@@ -501,7 +501,7 @@ def run_single(
         logger.info("Analyzing %s", repo_id)
         logger.info("With PURL: %s", component.purl)
         logger.info("=====================================")
-        self.rich_handler.add_description_table_content("Full Name:", component.purl)
+        self.rich_handler.add_description_table_content("Package URL:", component.purl)
 
         analyze_ctx = self.create_analyze_ctx(component)
         analyze_ctx.dynamic_data["expectation"] = self.expectations.get_expectation_for_target(