qontract-reconcile 0.10.1rc919__py3-none-any.whl → 0.10.1rc921__py3-none-any.whl

{qontract_reconcile-0.10.1rc919.dist-info → qontract_reconcile-0.10.1rc921.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc919
+Version: 0.10.1rc921
 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.1rc919.dist-info → qontract_reconcile-0.10.1rc921.dist-info}/RECORD

@@ -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=7YEWw32GMEZFXdeayh7pLW0lO6mpPD8L6c2GZoFpIUE,6477
-reconcile/utils/saasherder/saasherder.py,sha256=sIMC9It_nBiV4tevbaoXygKt_ocuiNGsX2ZaohwfFYY,87534
+reconcile/utils/saasherder/models.py,sha256=6MGie9SqsyP5ySjmk5bO5vPJ0-x53a0uzABxQO-WsB0,9746
+reconcile/utils/saasherder/saasherder.py,sha256=H3pLQAD6EkjwrFpfQN73LKPg8mYRilssIcZ9M3duizU,84555
 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.1rc919.dist-info/METADATA,sha256=1-faoxKb-anVWlJgQgYltAHFUKKsvF0WCwORjQ_H7Es,2273
-qontract_reconcile-0.10.1rc919.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc919.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc919.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc919.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc921.dist-info/METADATA,sha256=SpNBTIDWOYtsmjJ-o-tNFYFAzDMWgKbggJxyukAXWng,2273
+qontract_reconcile-0.10.1rc921.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc921.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc921.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc921.dist-info/RECORD,,

reconcile/utils/saasherder/models.py

@@ -1,4 +1,6 @@
 import base64
+import json
+import logging
 from collections.abc import Iterable, Sequence
 from dataclasses import dataclass
 from enum import Enum
@@ -12,6 +14,8 @@ from pydantic import (
 
 from reconcile.utils.oc_connection_parameters import Cluster
 from reconcile.utils.saasherder.interfaces import (
+    HasParameters,
+    HasSecretParameters,
     ManagedResourceName,
     SaasApp,
     SaasEnvironment,
@@ -20,6 +24,7 @@ from reconcile.utils.saasherder.interfaces import (
     SaasResourceTemplate,
     SaasResourceTemplateTarget,
 )
+from reconcile.utils.secret_reader import SecretReaderBase
 
 
 class Providers(Enum):
@@ -215,9 +220,9 @@ class TargetSpec:
     target: SaasResourceTemplateTarget
     image_auth: ImageAuth
     hash_length: int
-    parameters: dict[str, str]
     github: Github
     target_config_hash: str
+    secret_reader: SecretReaderBase
 
     @property
     def saas_file_name(self) -> str:
@@ -266,3 +271,78 @@ class TargetSpec:
     @property
     def delete(self) -> bool:
         return bool(self.target.delete)
+
+    def parameters(self, adjust: bool = True) -> dict[str, str]:
+        environment_parameters = self._collect_parameters(
+            self.target.namespace.environment, adjust=adjust
+        )
+        saas_file_parameters = self._collect_parameters(self.saas_file, adjust=adjust)
+        resource_template_parameters = self._collect_parameters(
+            self.resource_template, adjust=adjust
+        )
+        target_parameters = self._collect_parameters(self.target, adjust=adjust)
+
+        try:
+            saas_file_secret_parameters = self._collect_secret_parameters(
+                self.saas_file
+            )
+            resource_template_secret_parameters = self._collect_secret_parameters(
+                self.resource_template
+            )
+            environment_secret_parameters = self._collect_secret_parameters(
+                self.target.namespace.environment
+            )
+            target_secret_parameters = self._collect_secret_parameters(self.target)
+        except Exception as e:
+            logging.error(f"Error collecting secrets: {e}")
+            raise
+
+        consolidated_parameters = {}
+        consolidated_parameters.update(environment_parameters)
+        consolidated_parameters.update(environment_secret_parameters)
+        consolidated_parameters.update(saas_file_parameters)
+        consolidated_parameters.update(saas_file_secret_parameters)
+        consolidated_parameters.update(resource_template_parameters)
+        consolidated_parameters.update(resource_template_secret_parameters)
+        consolidated_parameters.update(target_parameters)
+        consolidated_parameters.update(target_secret_parameters)
+
+        for replace_key, replace_value in consolidated_parameters.items():
+            if not isinstance(replace_value, str):
+                continue
+            replace_pattern = "${" + replace_key + "}"
+            for k, v in consolidated_parameters.items():
+                if not isinstance(v, str):
+                    continue
+                if replace_pattern in v:
+                    consolidated_parameters[k] = v.replace(
+                        replace_pattern, replace_value
+                    )
+
+        return consolidated_parameters
+
+    @staticmethod
+    def _collect_parameters(
+        container: HasParameters, adjust: bool = True
+    ) -> dict[str, str]:
+        parameters = container.parameters or {}
+        if isinstance(parameters, str):
+            parameters = json.loads(parameters)
+        if adjust:
+            # adjust Python's True/False
+            for k, v in parameters.items():
+                if v is True:
+                    parameters[k] = "true"
+                elif v is False:
+                    parameters[k] = "false"
+                elif any(isinstance(v, t) for t in [dict, list, tuple]):
+                    parameters[k] = json.dumps(v)
+        return parameters
+
+    def _collect_secret_parameters(
+        self, container: HasSecretParameters
+    ) -> dict[str, str]:
+        return {
+            sp.name: self.secret_reader.read_secret(sp.secret)
+            for sp in container.secret_parameters or []
+        }

reconcile/utils/saasherder/saasherder.py

@@ -59,8 +59,6 @@ from reconcile.utils.promotion_state import (
     PromotionState,
 )
 from reconcile.utils.saasherder.interfaces import (
-    HasParameters,
-    HasSecretParameters,
     SaasFile,
     SaasParentSaasPromotion,
     SaasResourceTemplate,
@@ -706,29 +704,6 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             for rt in saas_file.resource_templates
         )
 
-    @staticmethod
-    def _collect_parameters(container: HasParameters) -> dict[str, str]:
-        parameters = container.parameters or {}
-        if isinstance(parameters, str):
-            parameters = json.loads(parameters)
-        # adjust Python's True/False
-        for k, v in parameters.items():
-            if v is True:
-                parameters[k] = "true"
-            elif v is False:
-                parameters[k] = "false"
-            elif any(isinstance(v, t) for t in [dict, list, tuple]):
-                parameters[k] = json.dumps(v)
-        return parameters
-
-    def _collect_secret_parameters(
-        self, container: HasSecretParameters
-    ) -> dict[str, str]:
-        return {
-            sp.name: self.secret_reader.read_secret(sp.secret)
-            for sp in container.secret_parameters or []
-        }
-
     @staticmethod
     def _get_file_contents_github(repo: Repository, path: str, commit_sha: str) -> str:
         f = repo.get_contents(path, commit_sha)
@@ -899,44 +874,11 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         provider = spec.provider
         hash_length = spec.hash_length
         target = spec.target
-        parameters = spec.parameters
         github = spec.github
         target_config_hash = spec.target_config_hash
 
         if provider == "openshift-template":
-            environment_parameters = self._collect_parameters(
-                target.namespace.environment
-            )
-            target_parameters = self._collect_parameters(target)
-
-            try:
-                environment_secret_parameters = self._collect_secret_parameters(
-                    target.namespace.environment
-                )
-                target_secret_parameters = self._collect_secret_parameters(target)
-            except Exception as e:
-                logging.error(f"Error collecting secrets: {e}")
-                raise
-
-            consolidated_parameters = {}
-            consolidated_parameters.update(environment_parameters)
-            consolidated_parameters.update(environment_secret_parameters)
-            consolidated_parameters.update(parameters)
-            consolidated_parameters.update(target_parameters)
-            consolidated_parameters.update(target_secret_parameters)
-
-            for replace_key, replace_value in consolidated_parameters.items():
-                if not isinstance(replace_value, str):
-                    continue
-                replace_pattern = "${" + replace_key + "}"
-                for k, v in consolidated_parameters.items():
-                    if not isinstance(v, str):
-                        continue
-                    if replace_pattern in v:
-                        consolidated_parameters[k] = v.replace(
-                            replace_pattern, replace_value
-                        )
-
+            consolidated_parameters = spec.parameters()
             try:
                 template, html_url, commit_sha = self._get_file_contents(
                     url=url, path=path, ref=target.ref, github=github
@@ -1046,7 +988,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 url=url,
                 path=path,
                 name=resource_template_name,
-                values=target.parameters or {},
+                values=spec.parameters(adjust=False),
                 ssl_verify=ssl_verify,
             )
 
@@ -1304,22 +1246,10 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         specs = []
         github = self._initiate_github(saas_file)
         image_auth = self._initiate_image_auth(saas_file)
-        saas_file_parameters = self._collect_parameters(saas_file)
-        saas_file_secret_parameters = self._collect_secret_parameters(saas_file)
-
         all_trigger_specs = self.get_saas_targets_config_trigger_specs(saas_file)
         # iterate over resource templates (multiple per saas_file)
         for rt in saas_file.resource_templates:
             hash_length = rt.hash_length or self.hash_length
-            resource_template_parameters = self._collect_parameters(rt)
-            resource_template_secret_parameters = self._collect_secret_parameters(rt)
-
-            consolidated_parameters = {}
-            consolidated_parameters.update(saas_file_parameters)
-            consolidated_parameters.update(saas_file_secret_parameters)
-            consolidated_parameters.update(resource_template_parameters)
-            consolidated_parameters.update(resource_template_secret_parameters)
-
             # Iterate over targets (each target is a namespace).
             for target in rt.targets:
                 if target.disable:
@@ -1349,9 +1279,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                         # process_template options
                         image_auth=image_auth,
                         hash_length=hash_length,
-                        parameters=consolidated_parameters,
                         github=github,
                         target_config_hash=digest,
+                        secret_reader=self.secret_reader,
                     )
                 )