qontract-reconcile 0.10.1rc712__py3-none-any.whl → 0.10.1rc714__py3-none-any.whl

{qontract_reconcile-0.10.1rc712.dist-info → qontract_reconcile-0.10.1rc714.dist-info}/METADATA

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

@@ -678,7 +678,7 @@ reconcile/utils/internal_groups/models.py,sha256=jlkH_hyyyuwS0J1IpuS7W1AyQSKQ2Qp
 reconcile/utils/jinja2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jinja2/extensions.py,sha256=zV_x8MhSHAynKhFnG3fULXrwsm5fUG_88IygZHSnN0o,1284
 reconcile/utils/jinja2/filters.py,sha256=_kJjdMsY3lGS5PUn4NnpXUQDNrL1IwiKsB-0MhTMGYM,4521
-reconcile/utils/jinja2/utils.py,sha256=OxpzvN5nUIm0juwqHzg4JwNRDF-dygrIwSx_pvvLxX0,6624
+reconcile/utils/jinja2/utils.py,sha256=ywoHM4hr1vGjfd37C9LS1QDscg0unF3jo2xT7gZqMZ4,6701
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jobcontroller/controller.py,sha256=J_Usf3B4hmQmIseWqnAzam3oku8z7EUP0KCwdSTy9Lw,14514
 reconcile/utils/jobcontroller/models.py,sha256=z0gRJy8Ow1leYS-GrvTUv-t-mQDPHTJVDoHb1nVcZ_8,6349
@@ -729,7 +729,7 @@ reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XL
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=XXY35h8VWQ66z3LBPxaoUAMkIW50264DQiecrzyV6oA,9076
 reconcile/utils/saasherder/models.py,sha256=1DKXUmiTS_MejUfSpFCeuBLMTgR4ldv2N1tAz8qHAwc,5547
-reconcile/utils/saasherder/saasherder.py,sha256=4IQL-r2uo1iejv0krdaPXaW9CnqBKF6t9Skjs2m263I,86170
+reconcile/utils/saasherder/saasherder.py,sha256=yjfOU9CwVSbEIAm99KsmTpeEQBUoucXzcz1odqzNYoo,86734
 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=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
@@ -764,8 +764,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 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.1rc712.dist-info/METADATA,sha256=MeTu0tcuNA_jlvS3yM5lz9s0oR5AQtaXj5SbIG8_qjk,2382
-qontract_reconcile-0.10.1rc712.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc712.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc712.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc712.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc714.dist-info/METADATA,sha256=CUPtaFqb8JqY-WCO6qonRwfFiq7OMqe5t5NOrfMHAuo,2382
+qontract_reconcile-0.10.1rc714.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc714.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc714.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc714.dist-info/RECORD,,

reconcile/utils/jinja2/utils.py

@@ -22,6 +22,7 @@ from reconcile.utils.jinja2.filters import (
     urlunescape,
 )
 from reconcile.utils.secret_reader import SecretNotFound, SecretReader, SecretReaderBase
+from reconcile.utils.vault import SecretFieldNotFound
 
 
 class Jinja2TemplateError(Exception):
@@ -138,7 +139,7 @@ def lookup_secret(
         if not secret_reader:
             secret_reader = SecretReader(settings)
         return secret_reader.read(secret)
-    except SecretNotFound as e:
+    except (SecretNotFound, SecretFieldNotFound) as e:
         if allow_not_found:
             return None
         raise FetchSecretError(e)

reconcile/utils/saasherder/saasherder.py

@@ -329,6 +329,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     )
                     self._validate_target_in_app(saas_file, target)
 
+                    self._warn_deployment_and_clowder_overlap(saas_file)
+
                     if target.promotion:
                         rt_ref = (
                             saas_file.path,
@@ -626,6 +628,20 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     f"Please remove promotion_data for channel {prom_data.channel}."
                 )
 
+    @staticmethod
+    def _warn_deployment_and_clowder_overlap(
+        saas_file: SaasFile,
+    ) -> None:
+        if (
+            "Deployment" in saas_file.managed_resource_types
+            and "ClowdApp" in saas_file.managed_resource_types
+        ):
+            logging.warning(
+                f"[{saas_file.name}] "
+                "Deployment and Clowdapp resources are used together. "
+                "This is not recommended as it may cause unexpected behavior."
+            )
+
     @staticmethod
     def _get_upstream_jobs(
         jjb: JJB,