qontract-reconcile 0.10.1rc747__py3-none-any.whl → 0.10.1rc749__py3-none-any.whl

{qontract_reconcile-0.10.1rc747.dist-info → qontract_reconcile-0.10.1rc749.dist-info}/METADATA

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

@@ -122,7 +122,7 @@ reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPtt
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=MPqcWpq1QeYzBsB8rtTlo102h_cR_q83oOYtWAncuAk,22391
 reconcile/aus/aus_label_source.py,sha256=qoP8Fgxuu1tCuhG6ixCWve7Ll-KD6a79E2uLAmC0ifw,4184
-reconcile/aus/base.py,sha256=4VTHqc22IW1xyLCgxhUrSBDRsaF99RW3uzoQafTQDN4,49410
+reconcile/aus/base.py,sha256=RqFUwH2xiWFN1U6plp-UG77iFkK60b8YKODsD4YWWyc,49880
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/healthchecks.py,sha256=S8_KPn_zFiOo_wf5XlVmz-I3tUDYAim3EGSqiSPMvLQ,2707
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
@@ -664,7 +664,7 @@ reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
 reconcile/utils/vault.py,sha256=S0eHqvZ9N3fya1E8YDaUffEvLk_fdtpzL4rvWn6f828,14991
 reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO608Bo,931
-reconcile/utils/vcs.py,sha256=uHFyYSHGpsdtiY76XVquq_5IzJTkkghBwWESeCJIeAw,8416
+reconcile/utils/vcs.py,sha256=iiAWQXNftKIRoakXEOPT6ubB_ybSuInIQ6jcMxa_NKk,8558
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=kjcxLGIMe8oLNFOxZ_bDcClFqGCL7Auwug5is0yNGbw,2555
 reconcile/utils/acs/notifiers.py,sha256=2n5blP9N1FdGLZuy3do9bpjd8NKg88kmLNNqhAGn8w4,5013
@@ -715,8 +715,8 @@ reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnY
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=RzEKRT_BhvB2ud9pyNFZ1cNZFmDGBUah9vjpP0y9f9w,2810
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
-reconcile/utils/ocm/addons.py,sha256=swWSOPbLprbxhmt8jd4hH5y3xeWF78y8hk9o4rfIXms,6890
-reconcile/utils/ocm/base.py,sha256=GclZtCrPkPJmGP9HHvqIlV-8VXSKuaQTQJkA2pklN60,13817
+reconcile/utils/ocm/addons.py,sha256=IHlqOO12TAdYwwU6Oedz3ussF1kELj9EI5GxPP6LKi8,7376
+reconcile/utils/ocm/base.py,sha256=sdcINGBy1FlotY0MZuVC--Yn3zcYDn_N33ownMD8SQE,14030
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Nw9m-jgN3GHHCh6w9UOBbMV4rtS24_-Ep09jAWQ-_fE,7653
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
@@ -778,8 +778,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc747.dist-info/METADATA,sha256=faEGscy4hQmj3OUFAXW7ImzUqwGYG--n1IM8fNXYPns,2382
-qontract_reconcile-0.10.1rc747.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc747.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc747.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc747.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc749.dist-info/METADATA,sha256=GRynYliT4W9vldAPG4g1WPRh010gG9Zk7BAX643Wico,2382
+qontract_reconcile-0.10.1rc749.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc749.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc749.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc749.dist-info/RECORD,,

reconcile/aus/base.py

@@ -587,13 +587,22 @@ def fetch_current_state(
     for spec in org_upgrade_spec.specs:
         if addons and isinstance(spec, ClusterAddonUpgradeSpec):
             addon_spec = cast(ClusterAddonUpgradeSpec, spec)
-            upgrade_policies = addon_service.get_addon_upgrade_policies(
+            addon_upgrade_policies = addon_service.get_addon_upgrade_policies(
                 ocm_api, spec.cluster.id, addon_id=addon_spec.addon.addon.id
             )
-            for upgrade_policy in upgrade_policies:
-                upgrade_policy["cluster"] = spec.cluster
+            for addon_upgrade_policy in addon_upgrade_policies:
                 current_state.append(
-                    AddonUpgradePolicy(**upgrade_policy, addon_service=addon_service)
+                    AddonUpgradePolicy(
+                        id=addon_upgrade_policy.id,
+                        addon_id=addon_spec.addon.addon.id,
+                        cluster=spec.cluster,
+                        next_run=addon_upgrade_policy.next_run,
+                        schedule=addon_upgrade_policy.schedule,
+                        schedule_type=addon_upgrade_policy.schedule_type,
+                        version=addon_upgrade_policy.version,
+                        state=addon_upgrade_policy.state,
+                        addon_service=addon_service,
+                    )
                 )
         elif spec.cluster.is_rosa_hypershift():
             upgrade_policies = get_control_plane_upgrade_policies(

reconcile/utils/ocm/addons.py

@@ -3,18 +3,12 @@ from typing import (
     Optional,
 )
 
-from reconcile.utils.ocm.base import OCMAddonInstallation
+from reconcile.utils.ocm.base import (
+    OCMAddonInstallation,
+    OCMAddonUpgradePolicy,
+)
 from reconcile.utils.ocm_base_client import OCMBaseClient
 
-ADDON_UPGRADE_POLICY_DESIRED_KEYS = {
-    "id",
-    "addon_id",
-    "schedule_type",
-    "schedule",
-    "next_run",
-    "version",
-}
-
 
 class AddonService:
     def get_addon_latest_versions(self, ocm_api: OCMBaseClient) -> dict[str, str]:
@@ -65,7 +59,7 @@ class AddonService:
 
     def get_addon_upgrade_policies(
         self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
-    ) -> list[dict[str, Any]]:
+    ) -> list[OCMAddonUpgradePolicy]:
         raise NotImplementedError()
 
     def create_addon_upgrade_policy(
@@ -95,23 +89,30 @@ class AddonServiceV1(AddonService):
 
     def get_addon_upgrade_policies(
         self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
-    ) -> list[dict[str, Any]]:
-        results: list[dict[str, Any]] = []
+    ) -> list[OCMAddonUpgradePolicy]:
+        results: list[OCMAddonUpgradePolicy] = []
 
         for policy in ocm_api.get_paginated(
             f"{self.addon_base_api_path()}/clusters/{cluster_id}/addon_upgrade_policies"
         ):
             if addon_id and policy["addon_id"] != addon_id:
                 continue
-            policy_data = {
-                k: v
-                for k, v in policy.items()
-                if k in ADDON_UPGRADE_POLICY_DESIRED_KEYS
-            }
-            policy_data["state"] = self._get_addon_upgrade_policy_state(
+
+            state = self._get_addon_upgrade_policy_state(
                 ocm_api, cluster_id, policy["id"]
             )
-            results.append(policy_data)
+            results.append(
+                OCMAddonUpgradePolicy(
+                    id=policy["id"],
+                    addon_id=addon_id,
+                    cluster_id=cluster_id,
+                    schedule_type=policy["schedule_type"],
+                    schedule=policy.get("schedule"),
+                    next_run=policy.get("next_run"),
+                    version=policy["version"],
+                    state=state,
+                )
+            )
 
         return results
 
@@ -171,20 +172,28 @@ class AddonServiceV2(AddonService):
 
     def get_addon_upgrade_policies(
         self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
-    ) -> list[dict[str, Any]]:
-        results: list[dict[str, Any]] = []
+    ) -> list[OCMAddonUpgradePolicy]:
+        results: list[OCMAddonUpgradePolicy] = []
 
         for policy in ocm_api.get_paginated(
             f"{self.addon_base_api_path()}/clusters/{cluster_id}/upgrade_plans"
         ):
             if addon_id and policy["addon_id"] != addon_id:
                 continue
-            policy_data = {
-                k: v
-                for k, v in policy.items()
-                if k in ADDON_UPGRADE_POLICY_DESIRED_KEYS
-            }
-            results.append(policy_data)
+
+            results.append(
+                OCMAddonUpgradePolicy(
+                    id=policy["id"],
+                    addon_id=addon_id,
+                    cluster_id=cluster_id,
+                    schedule_type=policy["type"],
+                    schedule=policy.get("schedule"),
+                    next_run=policy.get("next_run"),
+                    version=policy["version"],
+                    state=policy.get("state"),
+                    addon_service=self,
+                )
+            )
 
         return results
 

reconcile/utils/ocm/base.py

@@ -575,6 +575,17 @@ class OCMOIdentityProviderOidc(OCMOIdentityProvider):
         return self.name == other.name and self.open_id == other.open_id
 
 
+class OCMAddonUpgradePolicy(BaseModel):
+    id: str
+    addon_id: str
+    cluster_id: str
+    next_run: Optional[str]
+    schedule: Optional[str]
+    schedule_type: str
+    version: str
+    state: Optional[str]
+
+
 def build_label_container(
     *label_iterables: Optional[Iterable[OCMLabel]],
 ) -> LabelContainer:

reconcile/utils/vcs.py

@@ -216,8 +216,13 @@ class VCS:
             self._app_interface_api.close(mr)
 
     def get_file_content_from_app_interface_master(self, file_path: str) -> str:
+        file_path = (
+            f"data/{file_path.lstrip('/')}"
+            if not file_path.startswith("data")
+            else file_path
+        )
         return self._app_interface_api.project.files.get(
-            file_path=f"data{file_path}", ref="master"
+            file_path=file_path, ref="master"
         ).decode()
 
     def get_open_app_interface_merge_requests(self) -> list[ProjectMergeRequest]: