qontract-reconcile 0.10.1rc932__py3-none-any.whl → 0.10.1rc933__py3-none-any.whl

{qontract_reconcile-0.10.1rc932.dist-info → qontract_reconcile-0.10.1rc933.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc932
+Version: 0.10.1rc933
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc932.dist-info → qontract_reconcile-0.10.1rc933.dist-info}/RECORD

@@ -537,7 +537,7 @@ reconcile/test/test_quay_repos.py,sha256=TdkcRF_a8PLp01Kti9eZZN-vGup2yPBT4Iba3k0
 reconcile/test/test_queries.py,sha256=SpH3RmNpBjEr_ne3VjAMCgKK8RE1z1zo7bypkT5uoO4,1946
 reconcile/test/test_repo_owners.py,sha256=uRYMLbMmh-9usF0TerabZTZV-Z1CS4I6ybT-LQqCLe8,1423
 reconcile/test/test_requests_sender.py,sha256=7fd9C2kEFS0-CYtlsif66N1kO9c44pzuBPAJKR9igqU,5385
-reconcile/test/test_saasherder.py,sha256=jUn8d1DtdXq1pfDrThqIwx37Lgxa7mou3aZ-m3UrWdc,57129
+reconcile/test/test_saasherder.py,sha256=VOVSltKFYXuNFSZLsACn8_ATsZruX1g0UokJg36TkTM,57102
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=pTUGvJ2S2wF3PhJyGWmiNXG52QtXKy2cbu-G8Ymrv6I,5019
@@ -792,8 +792,8 @@ reconcile/utils/runtime/runner.py,sha256=PBfE_M4hTZKtyubg29AkMWlLi2KKyA74yItREtT
 reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
-reconcile/utils/saasherder/models.py,sha256=-HVTHFKXsLOew-sObHeA-6DEEyq9bQwZVXEU3MUNd4Q,9746
-reconcile/utils/saasherder/saasherder.py,sha256=HDa095P6BImq4tytHW8ypdykvrEm6Ugoc36z-0RPpPM,85594
+reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
+reconcile/utils/saasherder/saasherder.py,sha256=N7cDHs6lkY9Lejw2HDGPLA-onfcASIWn5Lj18IO-FO8,84413
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=3gUIIIEv52Vx7-VgQ2FZYfCCrfqUv_5gw_TQ3mbLcTs,4666
@@ -844,8 +844,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc932.dist-info/METADATA,sha256=qndH_EuGSDit7z9H8LMeSLXI2LQY7r6DW0HATTlvO7E,2262
-qontract_reconcile-0.10.1rc932.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc932.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc932.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc932.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc933.dist-info/METADATA,sha256=g1Et8aAb9vUomuEd6ZdF6INhXma7-0Q5qqXBR6U8IG0,2262
+qontract_reconcile-0.10.1rc933.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc933.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc933.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc933.dist-info/RECORD,,

reconcile/test/test_saasherder.py

@@ -847,11 +847,11 @@ class TestPopulateDesiredState(TestCase):
 
     def fake_get_file_contents(
         self, url: str, path: str, ref: str, github: Github
-    ) -> tuple[Any, str, str]:
+    ) -> tuple[Any, str]:
         self.assertEqual("https://github.com/rhobs/configuration", url)
 
         content = self.fxts.get(ref + (path.replace("/", "_")))
-        return yaml.safe_load(content), "yolo", ref
+        return yaml.safe_load(content), ref
 
     def tearDown(self) -> None:
         for p in (
@@ -1040,7 +1040,7 @@ class TestConfigHashPromotionsValidation(TestCase):
 
         self.gfc_patcher = patch.object(SaasHerder, "_get_file_contents", autospec=True)
         gfc_mock = self.gfc_patcher.start()
-        gfc_mock.return_value = (self.template, "url", "ahash")
+        gfc_mock.return_value = (self.template, "ahash")
 
         self.deploy_current_state_fxt = self.fxt.get_anymarkup("saas_deploy.state.json")
 
@@ -1242,7 +1242,7 @@ class TestSoakDays(TestCase):
 
         self.gfc_patcher = patch.object(SaasHerder, "_get_file_contents", autospec=True)
         gfc_mock = self.gfc_patcher.start()
-        gfc_mock.return_value = (self.template, "url", "ahash")
+        gfc_mock.return_value = (self.template, "ahash")
 
         self.deploy_current_state_fxt = self.fxt.get_anymarkup("saas_deploy.state.json")
 

reconcile/utils/saasherder/models.py

@@ -256,6 +256,10 @@ class TargetSpec:
     def path(self) -> str:
         return self.resource_template.path
 
+    @property
+    def ref(self) -> str:
+        return self.target.ref
+
     @property
     def provider(self) -> str:
         return self.resource_template.provider or "openshift-template"
@@ -272,6 +276,15 @@ class TargetSpec:
     def delete(self) -> bool:
         return bool(self.target.delete)
 
+    @property
+    def html_url(self) -> str:
+        git_object = "blob" if self.provider == "openshift-template" else "tree"
+        return f"{self.url}/{git_object}/{self.ref}{self.path}"
+
+    @property
+    def error_prefix(self) -> str:
+        return f"[{self.saas_file_name}/{self.resource_template_name}] {self.html_url}:"
+
     def parameters(self, adjust: bool = True) -> dict[str, Any]:
         environment_parameters = self._collect_parameters(
             self.target.namespace.environment, adjust=adjust

reconcile/utils/saasherder/saasherder.py

@@ -746,8 +746,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
     @retry(max_attempts=20)
     def _get_file_contents(
         self, url: str, path: str, ref: str, github: Github
-    ) -> tuple[Any, str, str]:
-        html_url = f"{url}/blob/{ref}{path}"
+    ) -> tuple[Any, str]:
         commit_sha = self._get_commit_sha(url, ref, github)
 
         if "github" in url:
@@ -763,13 +762,12 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         else:
             raise Exception(f"Only GitHub and GitLab are supported: {url}")
 
-        return yaml.safe_load(content), html_url, commit_sha
+        return yaml.safe_load(content), commit_sha
 
     @retry()
     def _get_directory_contents(
         self, url: str, path: str, ref: str, github: Github
-    ) -> tuple[list[Any], str, str]:
-        html_url = f"{url}/tree/{ref}{path}"
+    ) -> tuple[list[Any], str]:
         commit_sha = self._get_commit_sha(url, ref, github)
         resources = []
         if "github" in url:
@@ -800,7 +798,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         else:
             raise Exception(f"Only GitHub and GitLab are supported: {url}")
 
-        return resources, html_url, commit_sha
+        return resources, commit_sha
 
     @retry()
     def _get_commit_sha(self, url: str, ref: str, github: Github) -> str:
@@ -863,31 +861,27 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 return True
         return False
 
-    def _process_template(
-        self, spec: TargetSpec
-    ) -> tuple[list[Any], str, Promotion | None]:
+    def _process_template(self, spec: TargetSpec) -> tuple[list[Any], Promotion | None]:
         saas_file_name = spec.saas_file_name
         resource_template_name = spec.resource_template_name
-        image_auth = spec.image_auth
         url = spec.url
         path = spec.path
+        ref = spec.ref
         provider = spec.provider
         hash_length = spec.hash_length
         target = spec.target
         github = spec.github
         target_config_hash = spec.target_config_hash
+        error_prefix = spec.error_prefix
 
         if provider == "openshift-template":
             consolidated_parameters = spec.parameters()
             try:
-                template, html_url, commit_sha = self._get_file_contents(
-                    url=url, path=path, ref=target.ref, github=github
+                template, commit_sha = self._get_file_contents(
+                    url=url, path=path, ref=ref, github=github
                 )
             except Exception as e:
-                logging.error(
-                    f"[{url}/blob/{target.ref}{path}] "
-                    + f"error fetching template: {str(e)}"
-                )
+                logging.error(f"{error_prefix} error fetching template: {str(e)}")
                 raise
 
             # add COMMIT_SHA only if it is unspecified
@@ -905,8 +899,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                         channel = consolidated_parameters["CHANNEL"]
                     except KeyError:
                         logging.error(
-                            f"[{saas_file_name}/{resource_template_name}] "
-                            + f"{html_url}: CHANNEL is required when "
+                            f"{error_prefix} CHANNEL is required when "
                             + "'use_channel_in_image_tag' is true."
                         )
                         raise
@@ -928,21 +921,17 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     registry_image = consolidated_parameters["REGISTRY_IMG"]
                 except KeyError as e:
                     logging.error(
-                        f"[{saas_file_name}/{resource_template_name}] "
-                        + f"{html_url}: error generating REPO_DIGEST. "
+                        f"{error_prefix} error generating REPO_DIGEST. "
                         + "Is REGISTRY_IMG missing? "
                         + f"{str(e)}"
                     )
                     raise
 
                 image_uri = f"{registry_image}:{image_tag}"
-                error_prefix = (
-                    f"[{saas_file_name}/{resource_template_name}] {html_url}:"
-                )
                 img = self._get_image(
                     image=image_uri,
                     image_patterns=spec.image_patterns,
-                    image_auth=image_auth,
+                    image_auth=spec.image_auth,
                     error_prefix=error_prefix,
                 )
                 if not img:
@@ -959,20 +948,16 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             try:
                 resources = oc.process(template, consolidated_parameters)
             except StatusCodeError as e:
-                logging.error(
-                    f"[{saas_file_name}/{resource_template_name}] "
-                    + f"{html_url}: error processing template: {str(e)}"
-                )
+                logging.error(f"{error_prefix} error processing template: {str(e)}")
 
         elif provider == "directory":
             try:
-                resources, html_url, commit_sha = self._get_directory_contents(
-                    url=url, path=path, ref=target.ref, github=github
+                resources, commit_sha = self._get_directory_contents(
+                    url=url, path=path, ref=ref, github=github
                 )
             except Exception as e:
                 logging.error(
-                    f"[{url}/tree/{target.ref}{path}] "
-                    + f"error fetching directory: {str(e)} "
+                    f"{error_prefix} error fetching directory: {str(e)} "
                     + "(We do not support nested directories. Do you by chance have subdirectories?)"
                 )
                 raise
@@ -983,10 +968,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 if self.gitlab and url.startswith(self.gitlab.server)
                 else True
             )
-            html_url = f"{url}/tree/{target.ref}{path}"
             consolidated_parameters = spec.parameters(adjust=False)
             if not consolidated_parameters.get("image", {}).get("tag"):
-                commit_sha = self._get_commit_sha(url, target.ref, github)
+                commit_sha = self._get_commit_sha(url, ref, github)
                 image_tag = commit_sha[:hash_length]
                 consolidated_parameters.setdefault("image", {})["tag"] = image_tag
             resources = helm.template_all(
@@ -998,10 +982,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             )
 
         else:
-            logging.error(
-                f"[{saas_file_name}/{resource_template_name}] "
-                + f"unknown provider: {provider}"
-            )
+            logging.error(f"{error_prefix} unknown provider: {provider}")
 
         target_promotion = None
         if target.promotion:
@@ -1023,7 +1004,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 ),
                 soak_days=target.promotion.soak_days or 0,
             )
-        return resources, html_url, target_promotion
+        return resources, target_promotion
 
     def _assemble_channels(
         self, saas_files: Iterable[SaasFile] | None
@@ -1154,14 +1135,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
 
     def _check_images(
         self,
-        saas_file_name: str,
-        resource_template_name: str,
-        image_auth: ImageAuth,
-        image_patterns: list[str],
-        html_url: str,
+        spec: TargetSpec,
         resources: Resources,
     ) -> bool:
-        error_prefix = f"[{saas_file_name}/{resource_template_name}] {html_url}:"
         images_list = threaded.run(
             self._collect_images, resources, self.available_thread_pool_size
         )
@@ -1173,9 +1149,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             self._get_image,
             images,
             self.available_thread_pool_size,
-            image_patterns=image_patterns,
-            image_auth=image_auth,
-            error_prefix=error_prefix,
+            image_patterns=spec.image_patterns,
+            image_auth=spec.image_auth,
+            error_prefix=spec.error_prefix,
         )
         return None in images
 
@@ -1299,8 +1275,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             # to delete resources, we avoid adding them to the desired state
             return None
 
+        html_url = spec.html_url
         try:
-            resources, html_url, promotion = self._process_template(spec)
+            resources, promotion = self._process_template(spec)
         except Exception as e:
             # error log message send in _process_template. We cannot just
             # register an error without logging as inventory errors don't have details.
@@ -1334,11 +1311,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         self._additional_resource_process(resources, html_url)
         # check images
         image_error = self._check_images(
-            saas_file_name=spec.saas_file_name,
-            resource_template_name=spec.resource_template_name,
-            image_auth=spec.image_auth,
-            image_patterns=spec.image_patterns,
-            html_url=html_url,
+            spec=spec,
             resources=resources,
         )
         if image_error: