qontract-reconcile 0.10.1rc1171__py3-none-any.whl → 0.10.1rc1173__py3-none-any.whl

{qontract_reconcile-0.10.1rc1171.dist-info → qontract_reconcile-0.10.1rc1173.dist-info}/METADATA

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

@@ -196,13 +196,13 @@ reconcile/external_resources/aws.py,sha256=309Zui7rE8XFJA1ZBLupl55Vp8Y5KKgXdsKQW
 reconcile/external_resources/factories.py,sha256=KrJDh52_8PeCEVjwfeVr1jwAJDdhMXRQ_XcBETfnKY4,4988
 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=tgHOFvP-dcPLLIhcjMn6EIELTBCycbXFNAuS-NX7l2s,17929
+reconcile/external_resources/manager.py,sha256=fXUm09w-9FRWYfJAwtV4_td1UHNLzdoGhWYpw5VR9jg,17757
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
 reconcile/external_resources/metrics.py,sha256=nMbyonGZEJDD1lYzpQY2eR9TNwvxYC4ZCcpi6wrExcM,1037
 reconcile/external_resources/model.py,sha256=H3elpiqehg_jACy28fGV5_77n8gKclVO77-7cfbaMNA,9178
 reconcile/external_resources/reconciler.py,sha256=Lhzg0O9Sw65KrCae-J14g9PV82xdp29O4jS_T5YNgEY,9661
 reconcile/external_resources/secrets_sync.py,sha256=6n0oDPLjd9Ql0lf6zsr1AZw8A6EEe3yCzl20XodtgkE,16229
-reconcile/external_resources/state.py,sha256=UupSa6tl4-73_J6Fhisn-qHal3v3uAUS5s5sk85LGDs,9343
+reconcile/external_resources/state.py,sha256=z086bnIUTOkzFmQvS9rSAhFsM3Aw_9PLKHBACJ-0tQc,9690
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip/integration.py,sha256=XtewM9nfTPLnPSpYebP50GrveYOnhTvKNq3seSvL6u8,8343
 reconcile/glitchtip/reconciler.py,sha256=nUvDv7qG1ly0cA16MmlL6NV71yl1mJYLT2mui7lmi0Y,12402
@@ -880,8 +880,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.1rc1171.dist-info/METADATA,sha256=GxrtQ-z9G_ZC9ukO5-h9-1qjrqcK-lkkr8bjunKNfjQ,2213
-qontract_reconcile-0.10.1rc1171.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1171.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1171.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1171.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1173.dist-info/METADATA,sha256=UAjgR0lD9syc08q6s2PuH2Q3_cOi0HN8W2Q7fqJcLh8,2213
+qontract_reconcile-0.10.1rc1173.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+qontract_reconcile-0.10.1rc1173.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1173.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1173.dist-info/RECORD,,

{qontract_reconcile-0.10.1rc1171.dist-info → qontract_reconcile-0.10.1rc1173.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

reconcile/external_resources/manager.py

@@ -93,14 +93,6 @@ class ReconciliationStatus(BaseModel):
     reconcile_time: int = 0
     resource_status: ResourceStatus
 
-    @property
-    def has_errors(self) -> bool:
-        return self.resource_status == ResourceStatus.ERROR
-
-    @property
-    def needs_secret_sync(self) -> bool:
-        return self.resource_status == ResourceStatus.PENDING_SECRET_SYNC
-
     def publish_metrics(self, r: Reconciliation, spec: ExternalResourceSpec) -> None:
         job_name = ReconciliationK8sJob(reconciliation=r).name()
 
@@ -133,7 +125,7 @@ class ReconciliationStatus(BaseModel):
             self.reconcile_time,
         )
 
-        if self.has_errors:
+        if self.resource_status.has_errors:
             metrics.inc_counter(
                 ExternalResourcesReconcileErrorsCounter(
                     app=spec.namespace["app"]["name"],
@@ -277,21 +269,15 @@ class ExternalResourcesManager:
         r: Reconciliation,
         state: ExternalResourceState,
     ) -> ReconciliationStatus:
-        """Gets the resource reconciliation state from the Job and updates the
-        Resource state accordingly. It also returns if the target outputs secret needs
-        to be reconciled.
-
+        """Gets the reconciliation job status and returns a ReconciliationStatus object with the new
+        resource status and other reconciliation data.
         :param r: Reconciliation object
         :param state: State object
         :return: ReconciliationStatus
         """
 
         status = ReconciliationStatus(resource_status=state.resource_status)
-
-        if state.resource_status not in {
-            ResourceStatus.DELETE_IN_PROGRESS,
-            ResourceStatus.IN_PROGRESS,
-        }:
+        if not state.resource_status.is_in_progress:
             return status
 
         logging.info(
@@ -339,20 +325,21 @@ class ExternalResourcesManager:
         self,
         r: Reconciliation,
         state: ExternalResourceState,
-        status: ReconciliationStatus,
+        reconciliation_status: ReconciliationStatus,
     ) -> None:
-        # There is no need to update the state
-        # if it's marked in progress
-        if state.resource_status in {
-            ResourceStatus.DELETE_IN_PROGRESS,
-            ResourceStatus.IN_PROGRESS,
-        }:
+        if (
+            state.resource_status.is_in_progress
+            and reconciliation_status.resource_status.is_in_progress
+        ):
+            logging.debug(
+                "Reconciliation is still in progress. There is no need to update the state"
+            )
             return
         state.ts = datetime.now(UTC)
-        if status.resource_status == ResourceStatus.DELETED:
+        if reconciliation_status.resource_status == ResourceStatus.DELETED:
             self.state_mgr.del_external_resource_state(r.key)
         else:
-            state.resource_status = status.resource_status
+            state.resource_status = reconciliation_status.resource_status
             self.state_mgr.set_external_resource_state(state)
 
     def _set_resource_reconciliation_in_progress(
@@ -416,10 +403,10 @@ class ExternalResourcesManager:
         to_sync_keys: set[ExternalResourceKey] = set()
         for r in desired_r.union(deleted_r):
             state = self.state_mgr.get_external_resource_state(r.key)
-            status = self._get_reconciliation_status(r, state)
-            self._update_resource_state(r, state, status)
+            reconciliation_status = self._get_reconciliation_status(r, state)
+            self._update_resource_state(r, state, reconciliation_status)
 
-            if status.needs_secret_sync:
+            if reconciliation_status.resource_status.needs_secret_sync:
                 to_sync_keys.add(r.key)
 
             if self._resource_needs_reconciliation(reconciliation=r, state=state):
@@ -427,7 +414,7 @@ class ExternalResourcesManager:
                 self._set_resource_reconciliation_in_progress(r, state)
 
             if spec := self.er_inventory.get(r.key):
-                status.publish_metrics(r, spec)
+                reconciliation_status.publish_metrics(r, spec)
 
         pending_sync_keys = self.state_mgr.get_keys_by_status(
             ResourceStatus.PENDING_SECRET_SYNC

reconcile/external_resources/state.py

@@ -38,6 +38,18 @@ class ResourceStatus(StrEnum):
     PENDING_SECRET_SYNC: str = "PENDING_SECRET_SYNC"
     RECONCILIATION_REQUESTED: str = "RECONCILIATION_REQUESTED"
 
+    @property
+    def is_in_progress(self) -> bool:
+        return self in {ResourceStatus.IN_PROGRESS, ResourceStatus.DELETE_IN_PROGRESS}
+
+    @property
+    def needs_secret_sync(self) -> bool:
+        return self == ResourceStatus.PENDING_SECRET_SYNC
+
+    @property
+    def has_errors(self) -> bool:
+        return self == ResourceStatus.ERROR
+
 
 class ExternalResourceState(BaseModel):
     key: ExternalResourceKey