qontract-reconcile 0.10.2.dev253__py3-none-any.whl → 0.10.2.dev255__py3-none-any.whl

{qontract_reconcile-0.10.2.dev253.dist-info → qontract_reconcile-0.10.2.dev255.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev253
+Version: 0.10.2.dev255
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev253.dist-info → qontract_reconcile-0.10.2.dev255.dist-info}/RECORD

@@ -117,11 +117,11 @@ reconcile/vpc_peerings_validator.py,sha256=aESqrhm1tpkc2iqSL1UV5to_HjNgjRSffD0cr
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=lt684trHbKvVDLwwuNVz3Wu_MnytFSbS_7MZTIITh9k,23969
 reconcile/aus/aus_label_source.py,sha256=o0S2f0qwcII_8nzhHZhRQ83gEZ1DrSXyO4xzSwLebuU,4382
-reconcile/aus/base.py,sha256=Kicj39qfAlINywfk0Legu7RUcUxI4AuoBhA8vJ1gWag,51343
+reconcile/aus/base.py,sha256=bMbMJ0KS5J0A9jJky3ZCeU5XHL8jT4UE4X-X_H_rMM4,51465
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
 reconcile/aus/metrics.py,sha256=qh3-oWL8-Hbj1uXgAKonw7sVXGBlPpCyHtVYJusZ9n8,4271
-reconcile/aus/models.py,sha256=qLjWLDJe5PGXPPtJ5PI01IVEYaSGweu9dkAgf0ZM2hk,8297
+reconcile/aus/models.py,sha256=flK15hzE2wX67yUmNtQsnjOkipQazuV67emeQNyZ1Zo,8591
 reconcile/aus/node_pool_spec.py,sha256=FkMggklG-4BgQwud2Swp2m3AAAKzZmeaXgohl9uwxZ8,1138
 reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=PL8QdzWh8lhGneMwSbIYxOp002mJd5gHf_T0Q2cWQho,10350
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=WPIUUr3n3j-ZtyE3DgsPKzBJ3Dm9i1PSHBRepAf6CF4,3783
@@ -608,7 +608,7 @@ reconcile/utils/git.py,sha256=o4p9m8jlzCJDcutl2HErvGLhL6sZ1NB4Aw3zGcQIzso,2427
 reconcile/utils/github_api.py,sha256=S1vO-hvYPzm5BIychVIHSYibMns0HBmLgS78MkPfunE,3402
 reconcile/utils/gitlab_api.py,sha256=0wJObojbXXk8Cgh8ymNWlwD1CdENmpsMo1zDSTddnoE,28335
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
-reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
+reconcile/utils/gql.py,sha256=a1SXvhqqfmFpf9dNwGxnp_6ryvhOwm_kIaFwzJmQQDQ,14683
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
 reconcile/utils/helm.py,sha256=wC1h0GylhDFeZ6hZEtYy2giAGIIQroaQhkAtURoSlI8,3893
 reconcile/utils/helpers.py,sha256=koyAtYnxsUVx-HIn6GpedcUE-ekz_VtoYDkiZ0iv8ik,1795
@@ -736,7 +736,7 @@ reconcile/utils/ocm/sre_capability_labels.py,sha256=nqh0imrYczNeeeC7ZNX3pEwuAIVk
 reconcile/utils/ocm/status_board.py,sha256=8DYeIrOsW8Bh5PCtKdvGGpaxb9Wugcc5rLxZJ8Z7b_s,4181
 reconcile/utils/ocm/subscriptions.py,sha256=hehKXsDXIhnhqvWOuiYvx6y2FGq3zt0APGYj7WiBIdI,2765
 reconcile/utils/ocm/syncsets.py,sha256=9IQm1l5BodOVZa2OFbQmow3afmh4nXe5pn-CCJ5LxTI,1169
-reconcile/utils/ocm/upgrades.py,sha256=Hs3R9pkl5GoFgSyF7ZYhqG1gXOBCSGPL_ymDYAT3jXA,4804
+reconcile/utils/ocm/upgrades.py,sha256=UEgfSJuC8nH6jW9JjEx91_9QeeHR1UJ_9FVOX_PlvTU,4712
 reconcile/utils/rosa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/rosa/rosa_cli.py,sha256=bdr0fK8ARUxipLVTHehnCTxc6Kcgr8fV6k5I8FsDIhM,11335
 reconcile/utils/rosa/session.py,sha256=FkhB2vS2Ke6WhZlzm-DWXd6pqD_PgrUJujdO9Nt4vJI,6869
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev253.dist-info/METADATA,sha256=ghSbJj_ZdorkczmUZ05_9XdRhcny42vKQTZG9syekoM,23820
-qontract_reconcile-0.10.2.dev253.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev253.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev253.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev255.dist-info/METADATA,sha256=o_zpsOZUysndjUn1lN3Sv7LKSNdPT0CVKbWcdLPy6gY,23820
+qontract_reconcile-0.10.2.dev255.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev255.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev255.dist-info/RECORD,,

reconcile/aus/base.py

@@ -606,21 +606,27 @@ def fetch_current_state(
                 ocm_api, spec.cluster.id
             )
             for upgrade_policy in upgrade_policies:
-                upgrade_policy["cluster"] = spec.cluster
-                current_state.append(ControlPlaneUpgradePolicy(**upgrade_policy))
+                policy = upgrade_policy | {
+                    "cluster": spec.cluster,
+                }
+                current_state.append(ControlPlaneUpgradePolicy(**policy))
             for node_pool in spec.node_pools:
                 node_upgrade_policies = get_node_pool_upgrade_policies(
                     ocm_api, spec.cluster.id, node_pool.id
                 )
                 for upgrade_policy in node_upgrade_policies:
-                    upgrade_policy["cluster"] = spec.cluster
-                    upgrade_policy["node_pool"] = node_pool.id
-                    current_state.append(NodePoolUpgradePolicy(**upgrade_policy))
+                    policy = upgrade_policy | {
+                        "cluster": spec.cluster,
+                        "node_pool": node_pool.id,
+                    }
+                    current_state.append(NodePoolUpgradePolicy(**policy))
         else:
             upgrade_policies = get_upgrade_policies(ocm_api, spec.cluster.id)
             for upgrade_policy in upgrade_policies:
-                upgrade_policy["cluster"] = spec.cluster
-                current_state.append(ClusterUpgradePolicy(**upgrade_policy))
+                policy = upgrade_policy | {
+                    "cluster": spec.cluster,
+                }
+                current_state.append(ClusterUpgradePolicy(**policy))
 
     return current_state
 

reconcile/aus/models.py

@@ -68,7 +68,13 @@ class ClusterUpgradeSpec(BaseModel):
         return any(re.search(b, version) for b in self.blocked_versions)
 
     def get_available_upgrades(self) -> list[str]:
-        return self.cluster.available_upgrades()
+        cluster_available_upgrades = self.cluster.available_upgrades()
+        if (
+            self.oldest_current_version != self.current_version
+            and self.current_version not in cluster_available_upgrades
+        ):
+            return [self.current_version, *cluster_available_upgrades]
+        return cluster_available_upgrades
 
     @property
     def effective_mutexes(self) -> set[str]:

reconcile/utils/gql.py

@@ -7,7 +7,7 @@ from datetime import (
     datetime,
 )
 from typing import Any
-from urllib.parse import urlparse
+from urllib.parse import ParseResult, urlparse
 
 import requests
 from gql import (
@@ -38,7 +38,7 @@ INTEGRATIONS_QUERY = """
 requests_logger.setLevel(logging.WARNING)
 
 
-def capture_and_forget(error):
+def capture_and_forget(error: BaseException) -> None:
     """fire-and-forget an exception to sentry
 
     :param error: exception to be captured and sent to sentry
@@ -54,7 +54,7 @@ class GqlApiError(Exception):
 
 
 class GqlApiIntegrationNotFound(Exception):
-    def __init__(self, integration):
+    def __init__(self, integration: str):
         msg = f"""
         Integration not found: {integration}
 
@@ -65,7 +65,7 @@ class GqlApiIntegrationNotFound(Exception):
 
 
 class GqlApiErrorForbiddenSchema(Exception):
-    def __init__(self, schemas):
+    def __init__(self, schemas: list):
         msg = f"""
         Forbidden schemas: {schemas}
 
@@ -76,7 +76,7 @@ class GqlApiErrorForbiddenSchema(Exception):
 
 
 class GqlGetResourceError(Exception):
-    def __init__(self, path, msg):
+    def __init__(self, path: str, msg: str):
         super().__init__(f"Error getting resource from path {path}: {msg!s}")
 
 
@@ -88,8 +88,8 @@ class GqlApi:
         self,
         url: str,
         token: str | None = None,
-        int_name=None,
-        validate_schemas=False,
+        int_name: str | None = None,
+        validate_schemas: bool = False,
         commit: str | None = None,
         commit_timestamp: str | None = None,
     ) -> None:
@@ -127,14 +127,21 @@ class GqlApi:
         )
         return Client(transport=transport)
 
-    def close(self):
+    def close(self) -> None:
         logging.debug("Closing GqlApi client")
-        if self.client.transport.session:
+        if (
+            self.client.transport is not None
+            and hasattr(self.client.transport, "session")
+            and self.client.transport.session
+        ):
             self.client.transport.session.close()
 
     @retry(exceptions=GqlApiError, max_attempts=5, hook=capture_and_forget)
     def query(
-        self, query: str, variables=None, skip_validation=False
+        self,
+        query: str,
+        variables: dict[str, Any] | None = None,
+        skip_validation: bool = False,
     ) -> dict[str, Any] | None:
         try:
             result = self.client.execute(
@@ -237,7 +244,7 @@ class GqlApi:
         resources = self.query(query, {"schema": schema}, skip_validation=True)
         return resources["resources"]
 
-    def get_queried_schemas(self):
+    def get_queried_schemas(self) -> list:
         return list(self._queried_schemas)
 
     @property
@@ -252,7 +259,7 @@ class GqlApiSingleton:
     gqlapi_lock = threading.Lock()
 
     @classmethod
-    def create(cls, *args, **kwargs) -> GqlApi:
+    def create(cls, *args: Any, **kwargs: Any) -> GqlApi:
         with cls.gqlapi_lock:
             if cls.gql_api:
                 logging.debug("Resestting GqlApi instance")
@@ -261,8 +268,9 @@ class GqlApiSingleton:
         return cls.gql_api
 
     @classmethod
-    def close_gqlapi(cls):
-        cls.gql_api.close()
+    def close_gqlapi(cls) -> None:
+        if cls.gql_api is not None:
+            cls.gql_api.close()
 
     @classmethod
     def instance(cls) -> GqlApi:
@@ -281,11 +289,11 @@ class GqlApiSingleton:
 def init(
     url: str,
     token: str | None = None,
-    integration=None,
-    validate_schemas=False,
+    integration: str | None = None,
+    validate_schemas: bool = False,
     commit: str | None = None,
     commit_timestamp: str | None = None,
-):
+) -> GqlApi:
     return GqlApiSingleton.create(
         url,
         token,
@@ -336,7 +344,7 @@ class PersistentRequestsHTTPTransport(RequestsHTTPTransport):
         # can't directly assign, due to mypy type checking
         self.session = session  # type: ignore
 
-    def connect(self):
+    def connect(self) -> None:
         pass
 
     def close(self) -> None:
@@ -344,7 +352,7 @@ class PersistentRequestsHTTPTransport(RequestsHTTPTransport):
 
 
 @retry(exceptions=requests.exceptions.HTTPError, max_attempts=5)
-def get_sha(server, token=None):
+def get_sha(server: ParseResult, token: str | None = None) -> str:
     sha_endpoint = server._replace(path="/sha256")
     headers = {"Authorization": token} if token else None
     response = requests.get(sha_endpoint.geturl(), headers=headers, timeout=60)
@@ -354,7 +362,9 @@ def get_sha(server, token=None):
 
 
 @retry(exceptions=requests.exceptions.HTTPError, max_attempts=5)
-def get_git_commit_info(sha, server, token=None):
+def get_git_commit_info(
+    sha: str, server: ParseResult, token: str | None = None
+) -> dict:
     git_commit_info_endpoint = server._replace(path=f"/git-commit-info/{sha}")
     headers = {"Authorization": token} if token else None
     response = requests.get(
@@ -367,12 +377,12 @@ def get_git_commit_info(sha, server, token=None):
 
 @retry(exceptions=requests.exceptions.ConnectionError, max_attempts=5)
 def init_from_config(
-    autodetect_sha=True,
-    sha=None,
-    integration=None,
-    validate_schemas=False,
-    print_url=True,
-):
+    autodetect_sha: bool = True,
+    sha: str | None = None,
+    integration: str | None = None,
+    validate_schemas: bool = False,
+    print_url: bool = True,
+) -> GqlApi:
     server, token, commit, timestamp = _get_gql_server_and_token(
         autodetect_sha=autodetect_sha, sha=sha
     )

reconcile/utils/ocm/upgrades.py

@@ -1,9 +1,30 @@
-from typing import Any
+from typing import Any, TypedDict
 
 from reconcile.utils.ocm.base import OCMVersionGate
 from reconcile.utils.ocm_base_client import OCMBaseClient
 
-UPGRADE_POLICY_DESIRED_KEYS = {"id", "schedule_type", "schedule", "next_run", "version"}
+
+class UpgradePolicy(TypedDict):
+    id: str | None
+    next_run: str | None
+    schedule: str | None
+    schedule_type: str
+    state: str | None
+    version: str
+
+
+def _build_upgrade_policy(
+    response: dict,
+    state: str | None,
+) -> UpgradePolicy:
+    return UpgradePolicy(
+        id=response.get("id"),
+        schedule_type=response["schedule_type"],
+        schedule=response.get("schedule"),
+        next_run=response.get("next_run"),
+        version=response["version"],
+        state=state,
+    )
 
 
 def build_cluster_url(cluster_id: str) -> str:
@@ -16,30 +37,25 @@ def build_cluster_url(cluster_id: str) -> str:
 
 
 def get_upgrade_policies(
-    ocm_api: OCMBaseClient, cluster_id: str, schedule_type: str | None = None
-) -> list[dict[str, Any]]:
+    ocm_api: OCMBaseClient,
+    cluster_id: str,
+) -> list[UpgradePolicy]:
     """Returns a list of details of Upgrade Policies
 
-    :param cluster: cluster name
+    :param ocm_api: OCM API client
+    :param cluster_id: cluster id
 
-    :type cluster: string
+    :return: list of UpgradePolicy
     """
-    results: list[dict[str, Any]] = []
-
-    for policy in ocm_api.get_paginated(
-        f"{build_cluster_url(cluster_id)}/upgrade_policies"
-    ):
-        if schedule_type and policy["schedule_type"] != schedule_type:
-            continue
-        policy_data = {
-            k: v for k, v in policy.items() if k in UPGRADE_POLICY_DESIRED_KEYS
-        }
-        policy_data["state"] = get_upgrade_policy_state(
-            ocm_api, cluster_id, policy["id"]
+    return [
+        _build_upgrade_policy(
+            policy,
+            state=get_upgrade_policy_state(ocm_api, cluster_id, policy["id"]),
         )
-        results.append(policy_data)
-
-    return results
+        for policy in ocm_api.get_paginated(
+            f"{build_cluster_url(cluster_id)}/upgrade_policies"
+        )
+    ]
 
 
 def get_upgrade_policy_state(
@@ -76,23 +92,21 @@ def delete_upgrade_policy(
 
 
 def get_control_plane_upgrade_policies(
-    ocm_api: OCMBaseClient, cluster_id: str, schedule_type: str | None = None
-) -> list[dict[str, Any]]:
+    ocm_api: OCMBaseClient,
+    cluster_id: str,
+) -> list[UpgradePolicy]:
     """
     Returns a list of details of Upgrade Policies
     """
-    results: list[dict[str, Any]] = []
-    for policy in ocm_api.get_paginated(
-        f"{build_cluster_url(cluster_id)}/control_plane/upgrade_policies"
-    ):
-        if schedule_type and policy["schedule_type"] != schedule_type:
-            continue
-        policy_data = {
-            k: v for k, v in policy.items() if k in UPGRADE_POLICY_DESIRED_KEYS
-        }
-        policy_data["state"] = policy.get("state", {}).get("value")
-        results.append(policy_data)
-    return results
+    return [
+        _build_upgrade_policy(
+            policy,
+            state=policy.get("state", {}).get("value"),
+        )
+        for policy in ocm_api.get_paginated(
+            f"{build_cluster_url(cluster_id)}/control_plane/upgrade_policies"
+        )
+    ]
 
 
 def create_control_plane_upgrade_policy(
@@ -124,18 +138,19 @@ def delete_control_plane_upgrade_policy(
 
 def get_node_pool_upgrade_policies(
     ocm_api: OCMBaseClient, cluster_id: str, node_pool: str
-) -> list[dict[str, Any]]:
+) -> list[UpgradePolicy]:
     """
     Returns a list of details of Upgrade Policies
     """
-    results: list[dict[str, Any]] = []
-    for policy in ocm_api.get_paginated(
-        f"{build_cluster_url(cluster_id)}/node_pools/{node_pool}/upgrade_policies"
-    ):
-        results.append({  # noqa: PERF401
-            k: v for k, v in policy.items() if k in UPGRADE_POLICY_DESIRED_KEYS
-        })
-    return results
+    return [
+        _build_upgrade_policy(
+            policy,
+            state=policy.get("state", {}).get("value"),
+        )
+        for policy in ocm_api.get_paginated(
+            f"{build_cluster_url(cluster_id)}/node_pools/{node_pool}/upgrade_policies"
+        )
+    ]
 
 
 def create_node_pool_upgrade_policy(