qontract-reconcile 0.9.1rc298__py3-none-any.whl → 0.10.1.dev1203__py3-none-any.whl

reconcile/ocm/types.py

@@ -1,10 +1,5 @@
 from __future__ import annotations
 
-from typing import (
-    Optional,
-    Union,
-)
-
 from pydantic import (
     BaseModel,
     Extra,
@@ -18,29 +13,29 @@ class OCMClusterAutoscale(BaseModel):
 
 
 class OCMClusterNetwork(BaseModel):
-    type: Optional[str]
+    type: str | None
     vpc: str
     service: str
     pod: str
 
 
 class OCMClusterSpec(BaseModel):
-    autoscale: Optional[OCMClusterAutoscale]
+    autoscale: OCMClusterAutoscale | None
     channel: str
-    disable_user_workload_monitoring: Optional[bool]
-    external_id: Optional[str]
-    id: Optional[str]
-    instance_type: str
-    multi_az: bool
-    nodes: Optional[int]
+    disable_user_workload_monitoring: bool | None
+    external_id: str | None
+    id: str | None
+    instance_type: str | None
+    multi_az: bool | None
+    nodes: int | None
     private: bool
     product: str
     provider: str
-    provision_shard_id: Optional[str]
+    provision_shard_id: str | None
     region: str
-    initial_version: Optional[str]
+    initial_version: str | None
     version: str
-    hypershift: Optional[bool]
+    hypershift: bool | None
 
     class Config:
         extra = Extra.forbid
@@ -54,20 +49,28 @@ class OSDClusterSpec(OCMClusterSpec):
         extra = Extra.forbid
 
 
-class ROSAOcmAwsAttrs(BaseModel):
-    creator_role_arn: str
+class ROSAOcmAwsStsAttrs(BaseModel):
     installer_role_arn: str
     support_role_arn: str
-    controlplane_role_arn: str
+    controlplane_role_arn: str | None
     worker_role_arn: str
 
     class Config:
         extra = Extra.forbid
 
 
+class ROSAOcmAwsAttrs(BaseModel):
+    creator_role_arn: str
+    sts: ROSAOcmAwsStsAttrs | None
+
+    class Config:
+        extra = Extra.forbid
+
+
 class ROSAClusterAWSAccount(BaseModel):
     uid: str
-    rosa: ROSAOcmAwsAttrs
+    rosa: ROSAOcmAwsAttrs | None
+    billing_account_id: str | None
 
     class Config:
         extra = Extra.forbid
@@ -75,18 +78,29 @@ class ROSAClusterAWSAccount(BaseModel):
 
 class ROSAClusterSpec(OCMClusterSpec):
     account: ROSAClusterAWSAccount
-    subnet_ids: Optional[list[str]]
-    availability_zones: Optional[list[str]]
+    subnet_ids: list[str] | None
+    availability_zones: list[str] | None
+    oidc_endpoint_url: str | None
 
     class Config:
         extra = Extra.forbid
 
 
+class ClusterMachinePool(BaseModel):
+    id: str
+    instance_type: str
+    replicas: int | None
+    autoscale: OCMClusterAutoscale | None
+
+
 class OCMSpec(BaseModel):
-    path: Optional[str]
-    spec: Union[OSDClusterSpec, ROSAClusterSpec, OCMClusterSpec]
+    path: str | None
+    spec: OSDClusterSpec | ROSAClusterSpec | OCMClusterSpec
+    machine_pools: list[ClusterMachinePool] = Field(
+        default_factory=list, alias="machinePools"
+    )
     network: OCMClusterNetwork
-    domain: Optional[str]
+    domain: str | None
     server_url: str = Field("", alias="serverUrl")
     console_url: str = Field("", alias="consoleUrl")
     elb_fqdn: str = Field("", alias="elbFQDN")
@@ -95,37 +109,3 @@ class OCMSpec(BaseModel):
         smart_union = True
         # This is need to populate by either console_url or consoleUrl, for instance
         allow_population_by_field_name = True
-
-
-class OCMOidcIdp(BaseModel):
-    id: Optional[str] = None
-    cluster: str
-    name: str
-    client_id: str
-    client_secret: Optional[str] = None
-    issuer: str
-    email_claims: list[str]
-    name_claims: list[str]
-    username_claims: list[str]
-    groups_claims: list[str]
-
-    def __lt__(self, other: OCMOidcIdp) -> bool:
-        return self.cluster < other.cluster
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, OCMOidcIdp):
-            raise NotImplementedError("Cannot compare to non OCMOidcIdp objects.")
-        return self.cluster == other.cluster and self.name == other.name
-
-    def __hash__(self) -> int:
-        return hash(self.cluster + self.name + self.client_id)
-
-    def differ(self, other: OCMOidcIdp) -> bool:
-        return (
-            self.client_id != other.client_id
-            or self.issuer != other.issuer
-            or self.email_claims != other.email_claims
-            or self.username_claims != other.username_claims
-            or self.name_claims != other.name_claims
-            or self.groups_claims != other.groups_claims
-        )

reconcile/ocm_additional_routers.py

@@ -89,7 +89,6 @@ def act(dry_run, diffs, ocm_map):
 
 
 def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
-
     return (
         cluster.get("ocm") is not None
         and cluster["spec"]["product"] in SUPPORTED_OCM_PRODUCTS

reconcile/ocm_addons_upgrade_tests_trigger.py

@@ -1,8 +1,5 @@
 import logging
-from typing import (
-    Callable,
-    Optional,
-)
+from collections.abc import Callable
 
 from reconcile import queries
 from reconcile.typed_queries.app_interface_vault_settings import (
@@ -18,7 +15,7 @@ QONTRACT_INTEGRATION = "ocm-addons-upgrade-tests-trigger"
 
 
 @defer
-def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     settings = queries.get_app_interface_settings()
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
@@ -40,7 +37,7 @@ def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
         )
 
         ocm = ocm_map[ocm_name]
-        state_updates: dict[str, Optional[str]] = {}
+        state_updates: dict[str, str | None] = {}
         for aut in addon_upgrade_tests:
             addon_name = aut["addon"]["name"]
             addon_org_version = None
@@ -79,15 +76,13 @@ def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
                 # now trigger the job already, people are waiting!
                 instance = aut["instance"]
                 job_name = aut["name"]
-                logging.info(
-                    [
-                        "trigger_job",
-                        instance["name"],
-                        job_name,
-                        addon_name,
-                        addon_org_version,
-                    ]
-                )
+                logging.info([
+                    "trigger_job",
+                    instance["name"],
+                    job_name,
+                    addon_name,
+                    addon_org_version,
+                ])
                 if not dry_run:
                     jenkins = JenkinsApi.init_jenkins_from_secret(
                         secret_reader, instance["token"]

reconcile/ocm_aws_infrastructure_access.py

@@ -52,17 +52,9 @@ def fetch_current_state(clusters):
     return ocm_map, current_state, current_failed, current_deleting
 
 
-def fetch_desired_state():
+def fetch_desired_state(clusters):
     desired_state = []
 
-    # get desired state defined in awsInfrastructureAccess
-    # or awsInfrastructureManagementAccounts
-    # sections of cluster files
-    clusters = [
-        c
-        for c in queries.get_clusters()
-        if c.get("ocm") is not None and c["spec"]["product"] in SUPPORTED_OCM_PRODUCTS
-    ]
     for cluster_info in clusters:
         cluster = cluster_info["name"]
         aws_infra_access_items = cluster_info.get("awsInfrastructureAccess") or []
@@ -119,9 +111,11 @@ def fetch_desired_state():
             )
             if aws_infrastructure_access is None:
                 continue
-            aws_account_uid = [
+            if aws_infrastructure_access.get("assume_role"):
+                continue
+            aws_account_uid = next(
                 a["uid"] for a in aws_accounts if a["name"] == spec.provisioner_name
-            ][0]
+            )
             cluster = aws_infrastructure_access["cluster"]["name"]
             access_level = aws_infrastructure_access["access_level"]
             item = {
@@ -138,19 +132,17 @@ def act(
     dry_run, ocm_map, current_state, current_failed, desired_state, current_deleting
 ):
     to_delete = [c for c in current_state if c not in desired_state]
-    to_delete = to_delete + current_failed
+    to_delete += current_failed
     for item in to_delete:
         cluster = item["cluster"]
         user_arn = item["user_arn"]
         access_level = item["access_level"]
-        logging.info(
-            [
-                "del_user_from_aws_infrastructure_access_role_grants",
-                cluster,
-                user_arn,
-                access_level,
-            ]
-        )
+        logging.info([
+            "del_user_from_aws_infrastructure_access_role_grants",
+            cluster,
+            user_arn,
+            access_level,
+        ])
         if not dry_run:
             ocm = ocm_map.get(cluster)
             ocm.del_user_from_aws_infrastructure_access_role_grants(
@@ -161,14 +153,12 @@ def act(
         cluster = item["cluster"]
         user_arn = item["user_arn"]
         access_level = item["access_level"]
-        logging.info(
-            [
-                "add_user_to_aws_infrastructure_access_role_grants",
-                cluster,
-                user_arn,
-                access_level,
-            ]
-        )
+        logging.info([
+            "add_user_to_aws_infrastructure_access_role_grants",
+            cluster,
+            user_arn,
+            access_level,
+        ])
         if not dry_run:
             ocm = ocm_map.get(cluster)
             ocm.add_user_to_aws_infrastructure_access_role_grants(
@@ -183,12 +173,16 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
     )
 
 
-def run(dry_run):
-    clusters = [
+def get_clusters():
+    return [
         c
-        for c in queries.get_clusters()
+        for c in queries.get_clusters(aws_infrastructure_access=True)
         if integration_is_enabled(QONTRACT_INTEGRATION, c) and _cluster_is_compatible(c)
     ]
+
+
+def run(dry_run):
+    clusters = get_clusters()
     if not clusters:
         logging.debug(
             "No OCM Aws infrastructure access definitions found in app-interface"
@@ -198,7 +192,11 @@ def run(dry_run):
     ocm_map, current_state, current_failed, current_deleting = fetch_current_state(
         clusters
     )
-    desired_state = fetch_desired_state()
+    desired_state = fetch_desired_state(clusters)
     act(
         dry_run, ocm_map, current_state, current_failed, desired_state, current_deleting
     )
+
+
+def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
+    return {"state": fetch_desired_state(clusters=get_clusters())}