qontract-reconcile 0.10.1rc994__py3-none-any.whl → 0.10.1rc996__py3-none-any.whl

{qontract_reconcile-0.10.1rc994.dist-info → qontract_reconcile-0.10.1rc996.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=7-GNgB05b5MGrnEuD0resVNL3hOsQNSYcAAHrR68sS0,105755
+reconcile/cli.py,sha256=lLVw-FxEUR8zU6UAKZzJk7XwRbjsXPaGUAQqXuBYSaU,105825
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -187,9 +187,9 @@ reconcile/dynatrace_token_provider/ocm.py,sha256=iHMsgbsLs-dlrB9UXmWNDF7E4UDe49J
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=JvjKaABy2Pg8u8Lq82Acv4zMvpE3_qGKes7OG-zlHOM,2956
 reconcile/external_resources/factories.py,sha256=DXgaLxoO87zZ76VOpRpu2GeYGhsbfOnOx5mrzgo4Gf4,4767
-reconcile/external_resources/integration.py,sha256=PJOpz-wUf7NzWvqCDalRWu5OxKjgi5RwiiB6HZfJs0k,5122
+reconcile/external_resources/integration.py,sha256=y1gJ16woMBC3J9qniMmS5y3lCkAs7V_ETZRUwjKqaO0,6628
 reconcile/external_resources/integration_secrets_sync.py,sha256=cMEZhgCvABAMf-DWF051L6CRnJQdfbsISA_b1xuS940,1670
-reconcile/external_resources/manager.py,sha256=5X9HjANMUGkZgC5RUA0r2TvZIbHw0UID1odn2QWrND4,14675
+reconcile/external_resources/manager.py,sha256=8lHOFyA_xF8thQXbmJp8zzA2-oJ0MUhfnCcFpkexwjU,15089
 reconcile/external_resources/meta.py,sha256=cMT9OsKcUY26qwEjlQ02EkorvOBNqWj0JVMwfJa3Mg0,634
 reconcile/external_resources/metrics.py,sha256=m2TIOao2N7pD6k45driFbBGVCC_N7ai44m-lLPfa5qk,454
 reconcile/external_resources/model.py,sha256=oXxJkjhV53lwwAuxUCBrjJ8aCJmQdgcKWv68ugJPK4k,7229
@@ -823,7 +823,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=1ZP58LYV6ww3XOLVxgy8NKasMb1jQmp4BNqzTEB0VBE,17723
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=hFrZeJCpZJFe634kJaGC4EfaLhVr_HoQjMUi2T7rCts,126044
+tools/qontract_cli.py,sha256=w_z2WAfPxXRXm8jbrg-Vc95sIYbPxVu3lCR14lEK3J4,125855
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -854,8 +854,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.1rc994.dist-info/METADATA,sha256=NDNNmj_EkStdXwWIxSksfHHzEU6G17bZRB_G3z5DxO4,2262
-qontract_reconcile-0.10.1rc994.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc994.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc994.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc994.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc996.dist-info/METADATA,sha256=1yk8ORxJ5XgceH637jz-GGaURn1NIRcEEF228Yd0_UM,2262
+qontract_reconcile-0.10.1rc996.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc996.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc996.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc996.dist-info/RECORD,,

reconcile/cli.py

@@ -3714,20 +3714,20 @@ def deadmanssnitch(ctx):
 )
 def external_resources(
     ctx,
-    workers_cluster: str,
-    workers_namespace: str,
     dry_run_job_suffix: str,
     thread_pool_size: int,
+    workers_cluster: str,
+    workers_namespace: str,
 ):
     import reconcile.external_resources.integration
 
     run_integration(
         reconcile.external_resources.integration,
         ctx.obj,
-        dry_run_job_suffix,
-        thread_pool_size,
-        workers_cluster,
-        workers_namespace,
+        dry_run_job_suffix=dry_run_job_suffix,
+        thread_pool_size=thread_pool_size,
+        workers_cluster=workers_cluster,
+        workers_namespace=workers_namespace,
     )
 
 

reconcile/external_resources/integration.py

@@ -1,5 +1,6 @@
 import logging
 from collections.abc import Callable
+from typing import Any
 
 from reconcile.external_resources.manager import (
     ExternalResourcesInventory,
@@ -73,6 +74,62 @@ def get_aws_api(
     return AWSApi(aws_credentials)
 
 
+def create_er_manager(
+    aws_api: AWSApi,
+    workers_cluster: str | None,
+    workers_namespace: str | None,
+    thread_pool_size: int,
+    dry_run: bool,
+    dry_run_job_suffix: str,
+) -> ExternalResourcesManager:
+    vault_settings = get_app_interface_vault_settings()
+    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+    er_settings = get_settings()[0]
+    m_inventory = load_module_inventory(get_modules())
+    namespaces = [ns for ns in get_namespaces() if ns.external_resources]
+    er_inventory = ExternalResourcesInventory(namespaces)
+
+    if not workers_cluster:
+        workers_cluster = er_settings.workers_cluster.name
+    if not workers_namespace:
+        workers_namespace = er_settings.workers_namespace.name
+
+    return ExternalResourcesManager(
+        thread_pool_size=thread_pool_size,
+        settings=er_settings,
+        secret_reader=secret_reader,
+        factories=setup_factories(
+            er_settings, m_inventory, er_inventory, secret_reader
+        ),
+        er_inventory=er_inventory,
+        module_inventory=m_inventory,
+        state_manager=ExternalResourcesStateDynamoDB(
+            aws_api=aws_api,
+            table_name=er_settings.state_dynamodb_table,
+        ),
+        reconciler=K8sExternalResourcesReconciler(
+            controller=build_job_controller(
+                integration=QONTRACT_INTEGRATION,
+                integration_version=QONTRACT_INTEGRATION_VERSION,
+                cluster=workers_cluster,
+                namespace=workers_namespace,
+                secret_reader=secret_reader,
+                dry_run=dry_run,
+            ),
+            dry_run=dry_run,
+            dry_run_job_suffix=dry_run_job_suffix,
+        ),
+        secrets_reconciler=build_incluster_secrets_reconciler(
+            workers_cluster,
+            workers_namespace,
+            secret_reader,
+            vault_path=er_settings.vault_secrets_path,
+            thread_pool_size=thread_pool_size,
+            dry_run=dry_run,
+        ),
+    )
+
+
 def run(
     dry_run: bool,
     dry_run_job_suffix: str,
@@ -83,9 +140,6 @@ def run(
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     er_settings = get_settings()[0]
-    m_inventory = load_module_inventory(get_modules())
-    namespaces = [ns for ns in get_namespaces() if ns.external_resources]
-    er_inventory = ExternalResourcesInventory(namespaces)
 
     if not workers_cluster:
         workers_cluster = er_settings.workers_cluster.name
@@ -98,41 +152,14 @@ def run(
         region=er_settings.state_dynamodb_region,
         secret_reader=secret_reader,
     ) as aws_api:
-        er_mgr = ExternalResourcesManager(
-            thread_pool_size=thread_pool_size,
-            settings=er_settings,
-            secret_reader=secret_reader,
-            factories=setup_factories(
-                er_settings, m_inventory, er_inventory, secret_reader
-            ),
-            er_inventory=er_inventory,
-            module_inventory=m_inventory,
-            state_manager=ExternalResourcesStateDynamoDB(
-                aws_api=aws_api,
-                table_name=er_settings.state_dynamodb_table,
-            ),
-            reconciler=K8sExternalResourcesReconciler(
-                controller=build_job_controller(
-                    integration=QONTRACT_INTEGRATION,
-                    integration_version=QONTRACT_INTEGRATION_VERSION,
-                    cluster=workers_cluster,
-                    namespace=workers_namespace,
-                    secret_reader=secret_reader,
-                    dry_run=dry_run,
-                ),
-                dry_run=dry_run,
-                dry_run_job_suffix=dry_run_job_suffix,
-            ),
-            secrets_reconciler=build_incluster_secrets_reconciler(
-                workers_cluster,
-                workers_namespace,
-                secret_reader,
-                vault_path=er_settings.vault_secrets_path,
-                thread_pool_size=thread_pool_size,
-                dry_run=dry_run,
-            ),
+        er_mgr = create_er_manager(
+            aws_api,
+            workers_cluster,
+            workers_namespace,
+            thread_pool_size,
+            dry_run,
+            dry_run_job_suffix,
         )
-
         if dry_run:
             er_mgr.handle_dry_run_resources()
             if er_mgr.errors:
@@ -141,3 +168,25 @@ def run(
                     logging.error("ExternalResourceKey: %s, Error: %s" % (k, e))
         else:
             er_mgr.handle_resources()
+
+
+def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
+    vault_settings = get_app_interface_vault_settings()
+    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+    er_settings = get_settings()[0]
+
+    with get_aws_api(
+        query_func=gql.get_api().query,
+        account_name=er_settings.state_dynamodb_account.name,
+        region=er_settings.state_dynamodb_region,
+        secret_reader=secret_reader,
+    ) as aws_api:
+        er_mgr = create_er_manager(
+            aws_api,
+            workers_cluster=kwargs["workers_cluster"],
+            workers_namespace=kwargs["workers_namespace"],
+            thread_pool_size=kwargs["thread_pool_size"],
+            dry_run=True,
+            dry_run_job_suffix=kwargs["dry_run_job_suffix"],
+        )
+        return er_mgr.get_all_reconciliations()

reconcile/external_resources/manager.py

@@ -116,7 +116,7 @@ class ExternalResourcesManager:
                     return ReconcileAction.APPLY_NOT_EXISTS
                 case ResourceStatus.ERROR:
                     return ReconcileAction.APPLY_ERROR
-                case ResourceStatus.CREATED:
+                case ResourceStatus.CREATED | ResourceStatus.PENDING_SECRET_SYNC:
                     if (
                         reconciliation.resource_hash
                         != state.reconciliation.resource_hash
@@ -154,6 +154,14 @@ class ExternalResourcesManager:
             )
         return reconcile
 
+    def get_all_reconciliations(self) -> dict[str, set[Reconciliation]]:
+        """Returns all reconciliations in a dict. Useful to return all data
+        from app-interface to make comparisions (early-exit)"""
+        return {
+            "desired": self._get_desired_objects_reconciliations(),
+            "deleted": self._get_deleted_objects_reconciliations(),
+        }
+
     def _get_desired_objects_reconciliations(self) -> set[Reconciliation]:
         r: set[Reconciliation] = set()
         for key, spec in self.er_inventory.items():

tools/qontract_cli.py

@@ -139,6 +139,7 @@ from reconcile.utils.oc_map import init_oc_map_from_clusters
 from reconcile.utils.ocm import OCM_PRODUCT_ROSA, OCMMap
 from reconcile.utils.ocm_base_client import init_ocm_base_client
 from reconcile.utils.output import print_output
+from reconcile.utils.saasherder.models import TargetSpec
 from reconcile.utils.saasherder.saasherder import SaasHerder
 from reconcile.utils.secret_reader import (
     SecretReader,
@@ -3497,21 +3498,17 @@ def saas_dev(ctx, app_name=None, saas_file_name=None, env_name=None) -> None:
                 if target.namespace.environment.name != env_name:
                     continue
 
-                parameters: dict[str, Any] = {}
-                parameters.update(target.namespace.environment.parameters or {})
-                parameters.update(saas_file.parameters or {})
-                parameters.update(rt.parameters or {})
-                parameters.update(target.parameters or {})
-
-                for replace_key, replace_value in parameters.items():
-                    if not isinstance(replace_value, str):
-                        continue
-                    replace_pattern = "${" + replace_key + "}"
-                    for k, v in parameters.items():
-                        if not isinstance(v, str):
-                            continue
-                        if replace_pattern in v:
-                            parameters[k] = v.replace(replace_pattern, replace_value)
+                parameters = TargetSpec(
+                    saas_file=saas_file,
+                    resource_template=rt,
+                    target=target,
+                    # process_template options
+                    image_auth=None,  # type: ignore[arg-type]
+                    hash_length=None,  # type: ignore[arg-type]
+                    github=None,  # type: ignore[arg-type]
+                    target_config_hash=None,  # type: ignore[arg-type]
+                    secret_reader=None,  # type: ignore[arg-type]
+                ).parameters()
 
                 parameters_cmd = ""
                 for k, v in parameters.items():