From aec719627d1b129b8d74a126d125a4f011b31617 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 11 Feb 2025 09:04:38 +1000 Subject: [PATCH] chore: pass build tool names to super class Signed-off-by: Ben Selwyn-Smith --- .../slsa_analyzer/package_registry/jfrog_maven_registry.py | 3 +-- .../package_registry/maven_central_registry.py | 3 +-- src/macaron/slsa_analyzer/package_registry/npm_registry.py | 3 +-- .../slsa_analyzer/package_registry/package_registry.py | 7 +++++-- .../slsa_analyzer/package_registry/pypi_registry.py | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/macaron/slsa_analyzer/package_registry/jfrog_maven_registry.py b/src/macaron/slsa_analyzer/package_registry/jfrog_maven_registry.py index 881b374d7..aaac195c8 100644 --- a/src/macaron/slsa_analyzer/package_registry/jfrog_maven_registry.py +++ b/src/macaron/slsa_analyzer/package_registry/jfrog_maven_registry.py @@ -123,8 +123,7 @@ def __init__( self.request_timeout = request_timeout or 10 self.download_timeout = download_timeout or 120 self.enabled = enabled or False - self.build_tool_names = {"maven", "gradle"} - super().__init__("JFrog Maven Registry") + super().__init__("JFrog Maven Registry", {"maven", "gradle"}) def load_defaults(self) -> None: """Load the .ini configuration for the current package registry. diff --git a/src/macaron/slsa_analyzer/package_registry/maven_central_registry.py b/src/macaron/slsa_analyzer/package_registry/maven_central_registry.py index 8372fb8e3..238087a88 100644 --- a/src/macaron/slsa_analyzer/package_registry/maven_central_registry.py +++ b/src/macaron/slsa_analyzer/package_registry/maven_central_registry.py @@ -105,8 +105,7 @@ def __init__( self.registry_url_scheme = registry_url_scheme or "" self.registry_url = "" # Created from the registry_url_scheme and registry_url_netloc. self.request_timeout = request_timeout or 10 - self.build_tool_names = {"maven", "gradle"} - super().__init__("Maven Central Registry") + super().__init__("Maven Central Registry", {"maven", "gradle"}) def load_defaults(self) -> None: """Load the .ini configuration for the current package registry. diff --git a/src/macaron/slsa_analyzer/package_registry/npm_registry.py b/src/macaron/slsa_analyzer/package_registry/npm_registry.py index d90fdb062..6f5063e89 100644 --- a/src/macaron/slsa_analyzer/package_registry/npm_registry.py +++ b/src/macaron/slsa_analyzer/package_registry/npm_registry.py @@ -50,8 +50,7 @@ def __init__( self.attestation_endpoint = attestation_endpoint or "" self.request_timeout = request_timeout or 10 self.enabled = enabled - self.build_tool_names = {"npm", "yarn"} - super().__init__("npm Registry") + super().__init__("npm Registry", {"npm", "yarn"}) def load_defaults(self) -> None: """Load the .ini configuration for the current package registry. diff --git a/src/macaron/slsa_analyzer/package_registry/package_registry.py b/src/macaron/slsa_analyzer/package_registry/package_registry.py index fd943fb3d..7fbbf4258 100644 --- a/src/macaron/slsa_analyzer/package_registry/package_registry.py +++ b/src/macaron/slsa_analyzer/package_registry/package_registry.py @@ -17,9 +17,9 @@ class PackageRegistry(ABC): """Base package registry class.""" - def __init__(self, name: str) -> None: + def __init__(self, name: str, build_tool_names: set[str]) -> None: self.name = name - self.build_tool_names: set[str] = set() + self.build_tool_names = build_tool_names self.enabled: bool = True @abstractmethod @@ -44,6 +44,9 @@ def is_detected(self, build_tool_name: str) -> bool: ``True`` if the repo under analysis can be published to this package registry, based on the given build tool. """ + print() + print(f"{build_tool_name} in {self.build_tool_names} ?") + print() if not self.enabled: return False return build_tool_name in self.build_tool_names diff --git a/src/macaron/slsa_analyzer/package_registry/pypi_registry.py b/src/macaron/slsa_analyzer/package_registry/pypi_registry.py index 18daeb0ee..95429acb0 100644 --- a/src/macaron/slsa_analyzer/package_registry/pypi_registry.py +++ b/src/macaron/slsa_analyzer/package_registry/pypi_registry.py @@ -73,8 +73,7 @@ def __init__( self.request_timeout = request_timeout or 10 self.enabled = enabled self.registry_url = "" - self.build_tool_names = {"pip", "poetry"} - super().__init__("PyPI Registry") + super().__init__("PyPI Registry", {"pip", "poetry"}) def load_defaults(self) -> None: """Load the .ini configuration for the current package registry.