lennybot 1.0.21__tar.gz → 1.0.26__tar.gz

{lennybot-1.0.21 → lennybot-1.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lennybot
-Version: 1.0.21
+Version: 1.0.26
 Summary: Automatic Updates for Kustomize Resources
 Home-page: http://github.com/raynigon/lennybot
 Author: Simon Schneider

{lennybot-1.0.21 → lennybot-1.0.26}/requirements.txt

@@ -2,4 +2,4 @@ pyyaml
 yamlpath
 requests
 GitPython
-PyGithub
+PyGithub

{lennybot-1.0.21 → lennybot-1.0.26}/setup.py

@@ -5,7 +5,6 @@ https://github.com/pypa/sampleproject
 """
 
 import pkg_resources
-
 # Always prefer setuptools over distutils
 from setuptools import find_packages, setup
 

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/actions/iaction.py

@@ -1,14 +1,14 @@
 class IAction:
     @property
-    def application(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def application(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
     @property
-    def source_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def source_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
     @property
-    def target_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def target_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
     def run(self):

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/check/docker_image_available.py

@@ -103,7 +103,11 @@ class DockerImageAvailableCheck(ICheck):
                 + image_tag
             )
             return DockerImage(match.group(4), match.group(5) + "/" + match.group(6), image_tag)
-        return DockerImage(match.group(7), match.group(8) + "/" + match.group(9) + "/" + match.group(10), image_tag)
+        return DockerImage(
+            match.group(7),
+            match.group(8) + "/" + match.group(9) + "/" + match.group(10),
+            image_tag,
+        )
 
     def _authenticate_on_registry(self, registry: str, authentication_header: WwwAuthenticateHeader) -> str:
         params = {
@@ -118,8 +122,12 @@ class DockerImageAvailableCheck(ICheck):
 
         if registry in self._container_config.registries.keys():
             registry_data = self._container_config.registries[registry]
-            password = registry_data.password
             username = registry_data.username
+            password = registry_data.password
+            if "<REDACTED>" in [username, password]:
+                logging.warning(
+                    "Either username or password contain '<REDACTED>' and probably have not been overwritten"
+                )
             response = requests.get(url, auth=(username, password))
         else:
             logging.debug("Registry not found in config")
@@ -139,15 +147,23 @@ class DockerImageAvailableCheck(ICheck):
             return str(access_token)
 
         if response.status_code == 401:
-            logging.error("Authentication failed:", response.status_code, response.headers)
+            logging.error(
+                "Authentication failed: %d with %s",
+                response.status_code,
+                response.headers,
+            )
             raise Exception("Error occurred: Unauthenticated: ", response.status_code)
 
         if response.status_code == 403:
-            logging.error("Authorization failed:", response.status_code, response.headers)
+            logging.error(
+                "Authorization failed: %d with %s",
+                response.status_code,
+                response.headers,
+            )
             raise Exception("Error occurred: Unauthorization: ", response.status_code)
 
         if response.status_code == 404:
-            logging.error("Nothing Found:", response.status_code, response.headers)
+            logging.error("Nothing Found:  %d with %s", response.status_code, response.headers)
             raise Exception("Error occurred: Nothing Found: ", response.status_code)
 
         raise Exception("Unexpected Status Code", response.status_code)
@@ -176,11 +192,14 @@ class DockerImageAvailableCheck(ICheck):
 
         request_url = f"https://{image._registry}/v2/{image._name}/manifests/{image._tag}"
 
+        # depending on the registry it my helps adding the write accept header :)
+        # https://github.com/goharbor/harbor/issues/16075
+        headers = {
+            "Accept": "application/vnd.oci.image.index.v1+json, application/vnd.docker.distribution.manifest.list.v2+json",
+        }
         if access_token is not None:
-            headers = {"Authorization": f"Bearer {access_token}"}
-            response = requests.get(request_url, headers=headers)
-        else:
-            response = requests.get(request_url)
+            headers["Authorization"] = f"Bearer {access_token}"
+        response = requests.get(request_url, headers=headers)
 
         if response.status_code == 401 and access_token is None:
             registry = image._registry

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/check/icheck.py

@@ -1,15 +1,15 @@
 class ICheck:
     @property
-    def application(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def application(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
     @property
-    def source_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def source_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
     @property
-    def target_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def target_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
-    def check(self) -> bool:  # pyright: ignore [reportGeneralTypeIssues]
+    def check(self) -> bool:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/config/config.py

@@ -26,7 +26,13 @@ CONFIGURATION_OPTIONS = {
     },
     "logging": {
         "type": "object",
-        "properties": {"level": {"type": "string", "required": False, "attribute": "_logging_level"}},
+        "properties": {
+            "level": {
+                "type": "string",
+                "required": False,
+                "attribute": "_logging_level",
+            }
+        },
     },
     "container": {
         "type": "object",
@@ -56,7 +62,11 @@ CONFIGURATION_OPTIONS = {
                 "attribute": "_source",
                 "properties": {
                     "type": {"type": "string", "required": True, "attribute": "_type"},
-                    "repository": {"type": "string", "required": True, "attribute": "_repository"},
+                    "repository": {
+                        "type": "string",
+                        "required": True,
+                        "attribute": "_repository",
+                    },
                     "regex": {"type": "string", "attribute": "_regex"},
                 },
             },
@@ -259,7 +269,10 @@ class LennyBotConfig:
 
     def _configure_logging(self):
         logging_level = logging._nameToLevel.get(self._logging_level, logging.DEBUG)
-        logging.basicConfig(level=logging_level, format="%(asctime)s [%(levelname)s] %(name)s: %(message)s")
+        logging.basicConfig(
+            level=logging_level,
+            format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+        )
         self._log = logging.getLogger(self.__class__.__name__)
         self._log.debug("Logging was configured")
 

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/model/state.py

@@ -13,6 +13,8 @@ class LennyBotState:
         self._hash = self._calculate_hash()
         with open(self._filename, encoding="utf-8") as file_ptr:
             self._data = yaml.safe_load(file_ptr)
+        if self._data is None:
+            self._data = {}
 
     def _init_file(self):
         if not os.path.exists(self._filename):

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/service/github.py

@@ -34,7 +34,7 @@ class GitHubService:
         if self._github is None:
             raise Exception("GitHub is not configured")
         repo = self._github.get_repo(self._config.github_pr.repository)
-        new_pull = repo.create_pull(title, body, repo.default_branch, branch_name)
+        new_pull = repo.create_pull(repo.default_branch, branch_name, title=title, body=body)
         labels = self._get_or_create_labels(repo)
         new_pull.add_to_labels(*labels)
         pulls = self._find_own_pulls()

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/service/plan.py

@@ -31,7 +31,13 @@ class LennyBotApplication:
         self._current_version = state.current_version(self._name)
         self._latest_version = self._source.latest_version()
         for config in self._config._checks:
-            check = create_check(self.name, self._current_version, self._latest_version, config, self._global_config)
+            check = create_check(
+                self.name,
+                self._current_version,
+                self._latest_version,
+                config,
+                self._global_config,
+            )
             self._checks.append(check)
 
     def should_update(self) -> bool:
@@ -47,7 +53,13 @@ class LennyBotApplication:
 
         for check in self._checks:
             if not check.check():
-                self._log.info("Check '%s' failed for application '%s'", check.__class__.__name__, self.name)
+                self._log.warning(
+                    "Check '%s' failed for application '%s' with current version '%s' and latest version '%s'",
+                    check.__class__.__name__,
+                    self.name,
+                    self._current_version,
+                    self._latest_version,
+                )
                 return False
         return True
 

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot/service/source/isource.py

@@ -1,7 +1,7 @@
 class ISource:
     @property
-    def application(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def application(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass
 
-    def latest_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues]
+    def latest_version(self) -> str:  # pyright: ignore [reportGeneralTypeIssues, reportReturnType]
         pass

{lennybot-1.0.21 → lennybot-1.0.26}/src/lennybot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lennybot
-Version: 1.0.21
+Version: 1.0.26
 Summary: Automatic Updates for Kustomize Resources
 Home-page: http://github.com/raynigon/lennybot
 Author: Simon Schneider

{lennybot-1.0.21 → lennybot-1.0.26}/test/test_docker_image_available.py

@@ -54,7 +54,9 @@ class TestAuthenticateImage(unittest.TestCase):
     def test_authenticate_on_registry_returns_access_token(self):
         registry = LennyBotConfigContainerRegistry("hub.docker.io")
         header_value = WwwAuthenticateHeader(
-            "https://docker-auth.elastic.co/auth", "repository:beats/filebeat:pull", "token-service"
+            "https://docker-auth.elastic.co/auth",
+            "repository:beats/filebeat:pull",
+            "token-service",
         )
         access_token = self.docker_image_check._authenticate_on_registry(registry.name, header_value)
         self.assertIsNotNone(access_token)
@@ -62,7 +64,9 @@ class TestAuthenticateImage(unittest.TestCase):
     def test_authenticate_without_credentials_in_config(self):
         self.config._image_pattern = "quay.io/argoproj/argocd:v{{version}}"
         header_value = WwwAuthenticateHeader(
-            "https://quay.io/v2/auth", "repository:argoproj/argocd:pull", "token-service"
+            "https://quay.io/v2/auth",
+            "repository:argoproj/argocd:pull",
+            "token-service",
         )
         access_token = self.docker_image_check._authenticate_on_registry("", header_value)
         self.assertIsNotNone(access_token)
@@ -74,7 +78,9 @@ class TestAuthenticateImage(unittest.TestCase):
         registry._password = "1234"
         self.container_config._registries["ghcr.io"] = registry
         header_value = WwwAuthenticateHeader(
-            "https://ghcr.io/v2/auth", "repository:brose-ebike/postgres-operator:pull", "token-service"
+            "https://ghcr.io/v2/auth",
+            "repository:brose-ebike/postgres-operator:pull",
+            "token-service",
         )
 
         with self.assertRaises(Exception) as context:

lennybot-1.0.26/version.txt

@@ -0,0 +1 @@
+1.0.26

lennybot-1.0.21/version.txt

@@ -1 +0,0 @@
-1.0.21