qontract-reconcile 0.10.1rc1198__py3-none-any.whl → 0.10.1rc1200__py3-none-any.whl

{qontract_reconcile-0.10.1rc1198.dist-info → qontract_reconcile-0.10.1rc1200.dist-info}/METADATA

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

@@ -192,16 +192,16 @@ reconcile/endpoints_discovery/integration.py,sha256=znfnlm8bZesfcNbQnaR2aaVM-DTB
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
 reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRattax4HfoRlhtVzmgro3GiJJ1C4Vc,6392
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/external_resources/aws.py,sha256=EN2Vz6IRp6TNWX5vwGAGESrD09_8sTFzKgZjdDR6cmg,7072
-reconcile/external_resources/factories.py,sha256=KrJDh52_8PeCEVjwfeVr1jwAJDdhMXRQ_XcBETfnKY4,4988
+reconcile/external_resources/aws.py,sha256=NSaOeHqFEcMaMxNjJwuQZosolgsJ8XRVvwkEEBj9vrw,7730
+reconcile/external_resources/factories.py,sha256=TyJMaijDfPIFYks9i6dhKN7nSR1BoCkoBs1iPExKpcE,5493
 reconcile/external_resources/integration.py,sha256=gBVO5dE8JyZ3xYcYik-MTIp_18oU7_hpYc_oztyfElQ,6753
 reconcile/external_resources/integration_secrets_sync.py,sha256=dX09O3r6KURziUYYfiki10orNjOGVma-XojhVqd0ww4,1667
-reconcile/external_resources/manager.py,sha256=M_duB1JjQ3xRghvErbmAAbb3mWCo4bFf_2LHqAJVK7E,14991
+reconcile/external_resources/manager.py,sha256=HATI3oWDyxIt7k_SynXqk4CYQzCJHGPmig1XEJoNOA0,15832
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
 reconcile/external_resources/metrics.py,sha256=8MZgNtNZzIRSYTX97KEUIUTETZBhitULzWxbShGyMO8,3193
-reconcile/external_resources/model.py,sha256=HVbt2dUJSoIj4MTNlAJeweKp4L0Af0XaNZXoCER7nVw,10571
+reconcile/external_resources/model.py,sha256=YJylbAhetN9szpLUFd9jFqxCRMvSWXVxSC9OMQNV-wg,11316
 reconcile/external_resources/reconciler.py,sha256=K9QvbQCIOCuOHnPIxQE_P_jFtrkF3dGo8d_cCCh08Ys,8973
-reconcile/external_resources/secrets_sync.py,sha256=fxzrNreggWJvASonIPUr3CB5M637M1ljZLZr6dct9xU,16329
+reconcile/external_resources/secrets_sync.py,sha256=H8JfI3JW1XEau1jqv15AhYg49mCZeHwZmqMzMv_6tFc,16344
 reconcile/external_resources/state.py,sha256=7DBzVhIvYqeZWrWapmU_bXXftTQa_m-EOwJFVlIFnDw,9583
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip/integration.py,sha256=XtewM9nfTPLnPSpYebP50GrveYOnhTvKNq3seSvL6u8,8343
@@ -882,8 +882,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 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.1rc1198.dist-info/METADATA,sha256=Cm6U5Z2jCGWiZmnTJGDeU-yaw7dCIkonvABx3Wf_6KA,2213
-qontract_reconcile-0.10.1rc1198.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-qontract_reconcile-0.10.1rc1198.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1198.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1198.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1200.dist-info/METADATA,sha256=TsJMZagQbxyhlVsDImDJTdadVxpB3agV14BYdeZkSo4,2213
+qontract_reconcile-0.10.1rc1200.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+qontract_reconcile-0.10.1rc1200.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1200.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1200.dist-info/RECORD,,

reconcile/external_resources/aws.py

@@ -3,6 +3,7 @@ from typing import Any
 
 from reconcile.external_resources.model import (
     ExternalResource,
+    ExternalResourceKey,
     ExternalResourcesInventory,
 )
 from reconcile.utils.external_resource_spec import (
@@ -25,6 +26,13 @@ class AWSResourceFactory(ABC):
     @abstractmethod
     def validate(self, resource: ExternalResource) -> None: ...
 
+    def find_linked_resources(
+        self, spec: ExternalResourceSpec
+    ) -> set[ExternalResourceKey]:
+        """Method to find dependant resources. Resources in this list
+        will be reconciled every time the parent resource finishes its reconciliation."""
+        return set()
+
 
 class AWSDefaultResourceFactory(AWSResourceFactory):
     def resolve(self, spec: ExternalResourceSpec) -> dict[str, Any]:
@@ -136,6 +144,17 @@ class AWSRdsFactory(AWSDefaultResourceFactory):
 
     def validate(self, resource: ExternalResource) -> None: ...
 
+    def find_linked_resources(
+        self, spec: ExternalResourceSpec
+    ) -> set[ExternalResourceKey]:
+        return {
+            k
+            for k, s in self.er_inventory.items()
+            if s.provision_provider == "aws"
+            and s.provider == "rds"
+            and s.resource["replica_source"] == spec.identifier
+        }
+
 
 class AWSMskFactory(AWSDefaultResourceFactory):
     def _get_source_db_spec(

reconcile/external_resources/factories.py

@@ -60,6 +60,13 @@ class ExternalResourceFactory(ABC):
     def validate_external_resource(self, resource: ExternalResource) -> None:
         pass
 
+    def find_linked_resources(
+        self, spec: ExternalResourceSpec
+    ) -> set[ExternalResourceKey]:
+        """Method to find dependant resources. Resources in this list
+        will be reconciled every time the parent resource finishes its reconciliation."""
+        return set()
+
 
 class ModuleProvisionDataFactory(ABC):
     @abstractmethod
@@ -148,3 +155,9 @@ class AWSExternalResourceFactory(ExternalResourceFactory):
     def validate_external_resource(self, resource: ExternalResource) -> None:
         f = self.resource_factories.get_factory(resource.provision.provider)
         f.validate(resource)
+
+    def find_linked_resources(
+        self, spec: ExternalResourceSpec
+    ) -> set[ExternalResourceKey]:
+        f = self.resource_factories.get_factory(spec.provider)
+        return f.find_linked_resources(spec)

reconcile/external_resources/manager.py

@@ -18,6 +18,7 @@ from reconcile.external_resources.model import (
     ExternalResource,
     ExternalResourceKey,
     ExternalResourceModuleConfiguration,
+    ExternalResourceOrphanedResourcesError,
     ExternalResourcesInventory,
     ExternalResourceValidationError,
     ModuleInventory,
@@ -161,7 +162,7 @@ class ExternalResourcesManager:
                 continue
             module = self.module_inventory.get_from_spec(spec)
             try:
-                resource = self._build_external_resource(spec, self.er_inventory)
+                resource = self._build_external_resource(spec)
             except ExternalResourceValidationError as e:
                 self.errors[key] = e
                 continue
@@ -169,11 +170,12 @@ class ExternalResourcesManager:
             reconciliation = Reconciliation(
                 key=key,
                 resource_hash=resource.hash(),
-                input=self._serialize_resource_input(resource),
+                input=resource.json(),
                 action=Action.APPLY,
                 module_configuration=ExternalResourceModuleConfiguration.resolve_configuration(
                     module, spec, self.settings
                 ),
+                linked_resources=self._find_linked_resources(spec),
             )
             r.add(reconciliation)
         return r
@@ -197,6 +199,13 @@ class ExternalResourcesManager:
             to_reconcile.add(r)
         return to_reconcile
 
+    def _check_orphaned_objects(self) -> None:
+        state_keys = self.state_mgr.get_all_resource_keys()
+        inventory_keys = set(self.er_inventory.keys())
+        orphans = state_keys - inventory_keys
+        if len(orphans) > 0:
+            raise ExternalResourceOrphanedResourcesError(orphans)
+
     def _get_reconciliation_status(
         self,
         r: Reconciliation,
@@ -273,6 +282,13 @@ class ExternalResourcesManager:
             state.update_resource_status(reconciliation_status)
             self.state_mgr.set_external_resource_state(state)
 
+            if r.linked_resources:
+                for lr in r.linked_resources:
+                    lrs = self.state_mgr.get_external_resource_state(lr)
+                    if not lrs.resource_status.is_in_progress:
+                        lrs.resource_status = ResourceStatus.RECONCILIATION_REQUESTED
+                        self.state_mgr.set_external_resource_state(lrs)
+
     def _set_resource_reconciliation_in_progress(
         self, r: Reconciliation, state: ExternalResourceState
     ) -> None:
@@ -317,16 +333,17 @@ class ExternalResourcesManager:
                 )
                 self.state_mgr.update_resource_status(key, ResourceStatus.CREATED)
 
-    def _build_external_resource(
-        self, spec: ExternalResourceSpec, er_inventory: ExternalResourcesInventory
-    ) -> ExternalResource:
+    def _build_external_resource(self, spec: ExternalResourceSpec) -> ExternalResource:
         f = self.factories.get_factory(spec.provision_provider)
         resource = f.create_external_resource(spec)
         f.validate_external_resource(resource)
         return resource
 
-    def _serialize_resource_input(self, resource: ExternalResource) -> str:
-        return resource.json()
+    def _find_linked_resources(
+        self, spec: ExternalResourceSpec
+    ) -> set[ExternalResourceKey]:
+        f = self.factories.get_factory(spec.provision_provider)
+        return f.find_linked_resources(spec)
 
     def handle_resources(self) -> None:
         desired_r = self._get_desired_objects_reconciliations()
@@ -355,6 +372,7 @@ class ExternalResourcesManager:
             self._sync_secrets(to_sync_keys=to_sync_keys | pending_sync_keys)
 
     def handle_dry_run_resources(self) -> None:
+        self._check_orphaned_objects()
         desired_r = self._get_desired_objects_reconciliations()
         deleted_r = self._get_deleted_objects_reconciliations()
         reconciliations = desired_r.union(deleted_r)

reconcile/external_resources/model.py

@@ -3,11 +3,7 @@ import json
 from abc import (
     ABC,
 )
-from collections.abc import (
-    Iterable,
-    Iterator,
-    MutableMapping,
-)
+from collections.abc import ItemsView, Iterable, Iterator, MutableMapping
 from enum import StrEnum
 from typing import Any
 
@@ -38,6 +34,17 @@ from reconcile.utils.external_resource_spec import (
 )
 
 
+class ExternalResourceOrphanedResourcesError(Exception):
+    def __init__(self, orphans: Iterable["ExternalResourceKey"]) -> None:
+        msg = [
+            "There are orphaned resources in the configuration. ",
+            "To delete ERv2 managed external resources, set the 'delete: true' attribute.\n",
+            "Orphans:\n",
+            "\n".join(map(str, orphans)),
+        ]
+        super().__init__("".join(msg))
+
+
 class ExternalResourceValidationError(Exception):
     errors: list[str] = []
 
@@ -82,17 +89,17 @@ class ExternalResourcesInventory(MutableMapping):
     def __init__(self, namespaces: Iterable[NamespaceV1]) -> None:
         self._inventory: dict[ExternalResourceKey, ExternalResourceSpec] = {}
 
-        desired_providers = [
-            (p, ns)
+        resource_providers = [
+            (rp, ns)
             for ns in namespaces
-            for p in ns.external_resources or []
-            if isinstance(p, SUPPORTED_RESOURCE_PROVIDERS) and p.resources
+            for rp in ns.external_resources or []
+            if isinstance(rp, SUPPORTED_RESOURCE_PROVIDERS) and rp.resources
         ]
 
         desired_specs = [
-            self._build_external_resource_spec(ns, p, r)
-            for (p, ns) in desired_providers
-            for r in p.resources
+            self._build_external_resource_spec(ns, rp, r)
+            for (rp, ns) in resource_providers
+            for r in rp.resources
             if isinstance(r, SUPPORTED_RESOURCE_TYPES) and r.managed_by_erv2
         ]
 
@@ -136,6 +143,9 @@ class ExternalResourcesInventory(MutableMapping):
     def __len__(self) -> int:
         return len(self._inventory)
 
+    def items(self) -> ItemsView[ExternalResourceKey, ExternalResourceSpec]:
+        return self._inventory.items()
+
     def get_inventory_spec(
         self, provision_provider: str, provisioner: str, provider: str, identifier: str
     ) -> ExternalResourceSpec:
@@ -281,6 +291,9 @@ class Reconciliation(BaseModel, frozen=True):
     module_configuration: ExternalResourceModuleConfiguration = (
         ExternalResourceModuleConfiguration()
     )
+    # linked_resources store dependants resources. They will get reconciled
+    # every time the parent resource reconciliation finishes.
+    linked_resources: frozenset[ExternalResourceKey] | None
 
 
 class ReconcileAction(StrEnum):

reconcile/external_resources/secrets_sync.py

@@ -20,7 +20,9 @@ from reconcile.external_resources.meta import (
     SECRET_UPDATED_AT,
     SECRET_UPDATED_AT_TIMEFORMAT,
 )
-from reconcile.external_resources.model import ExternalResourceKey
+from reconcile.external_resources.model import (
+    ExternalResourceKey,
+)
 from reconcile.openshift_base import ApplyOptions, apply_action
 from reconcile.typed_queries.clusters_minimal import get_clusters_minimal
 from reconcile.utils.differ import diff_mappings
@@ -207,7 +209,7 @@ class SecretsReconciler:
             If current is newer; don't apply.
             If other changes; apply and Recycle Pods
             Desired can not be newer than current.
-        External reosurce to Cluster (last reconciliation):
+        External resource to Cluster (last reconciliation):
             If updated_at annotation is the only change; Don't update
             If other changes; Update Secret and Recycle Pods
             Current can not be newer then Desired
@@ -233,7 +235,7 @@ class SecretsReconciler:
 
         if self.ri.has_error_registered():
             # Return all specs as error if there are errors.
-            # There is no a clear way to kwno which specs failed.
+            # There is not a clear way to know which specs have failed.
             return list(specs)
         else:
             return []