qontract-reconcile 0.10.2.dev361__py3-none-any.whl → 0.10.2.dev474__py3-none-any.whl

reconcile/queries.py

@@ -477,6 +477,12 @@ AWS_ACCOUNTS_QUERY = """
       integrations
     }
     deleteKeys
+    organization {
+      payerAccount {
+        organizationAccountTags
+      }
+      tags
+    }
     {% if reset_passwords %}
     resetPasswords {
       user {
@@ -499,6 +505,12 @@ AWS_ACCOUNTS_QUERY = """
         name
         uid
         supportedDeploymentRegions
+        organization {
+          payerAccount {
+            organizationAccountTags
+          }
+          tags
+        }
       }
       ... on AWSAccountSharingOptionAMI_v1 {
         regex
@@ -606,6 +618,12 @@ awsInfrastructureManagementAccounts {
       version
       format
     }
+    organization {
+      payerAccount {
+        organizationAccountTags
+      }
+      tags
+    }
   }
   accessLevel
   default
@@ -636,6 +654,12 @@ awsInfrastructureAccess {
         version
         format
       }
+      organization {
+        payerAccount {
+          organizationAccountTags
+        }
+        tags
+      }
     }
     roles {
       users {
@@ -745,6 +769,12 @@ CLUSTERS_QUERY = """
             version
             format
           }
+          organization {
+            payerAccount {
+                organizationAccountTags
+            }
+            tags
+          }
           rosa {
             ocm_environments {
               ocm {
@@ -773,6 +803,7 @@ CLUSTERS_QUERY = """
       private
       provision_shard_id
       disable_user_workload_monitoring
+      fips
     }
     externalConfiguration {
       labels
@@ -829,6 +860,12 @@ CLUSTERS_QUERY = """
                 version
                 format
               }
+              organization {
+                payerAccount {
+                  organizationAccountTags
+                }
+                tags
+              }
             }
             vpc_id
             cidr_block
@@ -847,6 +884,12 @@ CLUSTERS_QUERY = """
               version
               format
             }
+            organization {
+              payerAccount {
+                organizationAccountTags
+              }
+              tags
+            }
           }
           tags
         }
@@ -861,6 +904,12 @@ CLUSTERS_QUERY = """
               version
               format
             }
+            organization {
+              payerAccount {
+                organizationAccountTags
+              }
+              tags
+            }
           }
           tags
           cidrBlock
@@ -889,6 +938,12 @@ CLUSTERS_QUERY = """
                     version
                     format
                   }
+                  organization {
+                    payerAccount {
+                      organizationAccountTags
+                    }
+                    tags
+                  }
                 }
               }
               accessLevel
@@ -914,6 +969,12 @@ CLUSTERS_QUERY = """
                       version
                       format
                     }
+                    organization {
+                      payerAccount {
+                        organizationAccountTags
+                      }
+                      tags
+                    }
                   }
                 }
               }
@@ -1067,6 +1128,12 @@ CLUSTER_PEERING_QUERY = """
           version
           format
         }
+        organization {
+          payerAccount {
+            organizationAccountTags
+          }
+          tags
+        }
       }
       accessLevel
       default
@@ -1088,6 +1155,12 @@ CLUSTER_PEERING_QUERY = """
             version
             format
           }
+          organization {
+            payerAccount {
+              organizationAccountTags
+            }
+            tags
+          }
         }
       }
     }
@@ -1112,6 +1185,12 @@ CLUSTER_PEERING_QUERY = """
                 version
                 format
               }
+              organization {
+                payerAccount {
+                  organizationAccountTags
+                }
+                tags
+              }
             }
             vpc_id
             cidr_block
@@ -1131,6 +1210,12 @@ CLUSTER_PEERING_QUERY = """
               version
               format
             }
+            organization {
+              payerAccount {
+                organizationAccountTags
+              }
+              tags
+            }
           }
           tags
           assumeRole
@@ -1146,6 +1231,12 @@ CLUSTER_PEERING_QUERY = """
               version
               format
             }
+            organization {
+              payerAccount {
+                organizationAccountTags
+              }
+              tags
+            }
           }
           tags
           cidrBlock
@@ -1175,6 +1266,12 @@ CLUSTER_PEERING_QUERY = """
                     version
                     format
                   }
+                  organization {
+                    payerAccount {
+                      organizationAccountTags
+                    }
+                    tags
+                  }
                 }
               }
             }
@@ -1190,6 +1287,12 @@ CLUSTER_PEERING_QUERY = """
                   version
                   format
                 }
+                organization {
+                  payerAccount {
+                    organizationAccountTags
+                  }
+                  tags
+                }
               }
               accessLevel
               default
@@ -1216,6 +1319,12 @@ CLUSTER_PEERING_QUERY = """
                             version
                             format
                           }
+                          organization {
+                            payerAccount {
+                              organizationAccountTags
+                            }
+                            tags
+                          }
                         }
                       }
                     }
@@ -1231,6 +1340,12 @@ CLUSTER_PEERING_QUERY = """
                       version
                       format
                     }
+                    organization {
+                      payerAccount {
+                        organizationAccountTags
+                      }
+                      tags
+                    }
                   }
                 }
               }
@@ -1700,7 +1815,7 @@ def get_review_repos() -> list[dict[str, str]]:
     return [
         {"url": c["url"], "name": c["name"]}
         for c in code_components
-        if c["showInReviewQueue"] is not None
+        if c.get("showInReviewQueue", False)
     ]
 
 
@@ -2230,6 +2345,12 @@ JIRA_BOARDS_QUICK_QUERY = """
         version
         format
       }
+      email {
+        path
+        field
+        version
+        format
+      }
     }
   }
 }
@@ -2336,6 +2457,12 @@ DNS_ZONES_QUERY = """
         version
         format
       }
+      organization {
+        payerAccount {
+          organizationAccountTags
+        }
+        tags
+      }
     }
     vpc {
       vpc_id
@@ -2697,6 +2824,10 @@ APP_METADATA = """
               path
               field
             }
+            email {
+              path
+              field
+            }
           }
         }
         slackUserGroup {

reconcile/rhidp/common.py

@@ -7,10 +7,7 @@ from enum import StrEnum
 from typing import Any
 from urllib.parse import urlparse
 
-from pydantic import (
-    BaseModel,
-    root_validator,
-)
+from pydantic import BaseModel, model_validator
 
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
@@ -63,7 +60,8 @@ class ClusterAuth(BaseModel):
     issuer: str
     status: str
 
-    @root_validator
+    @model_validator(mode="before")
+    @classmethod
     def name_no_spaces(
         cls, values: MutableMapping[str, Any]
     ) -> MutableMapping[str, Any]:

reconcile/rhidp/sso_client/base.py

@@ -1,3 +1,4 @@
+import http
 import logging
 from collections.abc import (
     Iterable,
@@ -10,6 +11,7 @@ from urllib.parse import (
 )
 
 import jwt
+from requests import HTTPError
 
 from reconcile.rhidp.common import (
     Cluster,
@@ -237,7 +239,7 @@ def create_sso_client(
     secret_reader.vault_client.write(
         secret={
             "path": secret.path,
-            "data": sso_client.dict(),
+            "data": sso_client.model_dump(),
         },
         decode_base64=False,
     )
@@ -256,9 +258,18 @@ def delete_sso_client(
     )
     sso_client = SSOClient(**secret_reader.read_all_secret(secret=secret))
     keycloak_api = keycloak_map.get(sso_client.issuer)
-    keycloak_api.delete_client(
-        registration_client_uri=sso_client.registration_client_uri,
-        registration_access_token=sso_client.registration_access_token,
-    )
+    try:
+        keycloak_api.delete_client(
+            registration_client_uri=sso_client.registration_client_uri,
+            registration_access_token=sso_client.registration_access_token,
+        )
+    except HTTPError as e:
+        if e.response.status_code != http.HTTPStatus.UNAUTHORIZED:
+            logging.error(f"Failed to delete SSO client {sso_client_id}: {e}")
+            raise
+        # something went wrong with the registration token, maybe it expired
+        logging.error(
+            f"Failed to delete SSO client {sso_client_id} due to unauthorized error: {e}. Continuing to delete the vault secret."
+        )
 
     secret_reader.vault_client.delete(path=secret.path)

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -177,7 +177,7 @@ def is_namespace_addressed_by_selector(
     # json representation of namespace to filter on
     # remove all the None values to simplify the jsonpath expressions
     namespace_as_dict = {
-        "namespace": [namespace.dict(by_alias=True, exclude_none=True)]
+        "namespace": [namespace.model_dump(by_alias=True, exclude_none=True)]
     }
 
     do_include = any(

reconcile/saas_auto_promotions_manager/subscriber.py

@@ -2,7 +2,7 @@ import hashlib
 import logging
 from collections.abc import Iterable
 from dataclasses import dataclass
-from datetime import UTC, datetime, timedelta
+from datetime import timedelta
 
 from croniter import croniter
 
@@ -13,6 +13,7 @@ from reconcile.saas_auto_promotions_manager.publisher import (
     DeploymentInfo,
     Publisher,
 )
+from reconcile.utils.datetime_util import utc_now
 from reconcile.utils.slo_document_manager import SLODocumentManager
 
 CONTENT_HASH_LENGTH = 32
@@ -113,7 +114,7 @@ class Subscriber:
         We accumulate the time a ref is running on all publishers for this subscriber.
         We compare that accumulated time with the soak_days setting of the subscriber.
         """
-        now = datetime.now(UTC)
+        now = utc_now()
         delta = timedelta(days=0)
         for channel in self.channels:
             for publisher in channel.publishers:
@@ -136,7 +137,7 @@ class Subscriber:
                 self.schedule,
             )
             return False
-        return croniter.match(self.schedule, datetime.now(UTC), day_or=False)
+        return croniter.match(self.schedule, utc_now(), day_or=False)
 
     def _compute_desired_ref(self) -> None:
         """

reconcile/skupper_network/integration.py

@@ -85,7 +85,7 @@ def compile_skupper_sites(
                 or skupper_network.site_controller_templates
             ):
                 tmpl_vars = tmpl.variables or {}
-                tmpl_vars["resource"] = {"namespace": ns.dict(by_alias=True)}
+                tmpl_vars["resource"] = {"namespace": ns.model_dump(by_alias=True)}
 
                 site_controller_objects.append(
                     load_site_controller_template(tmpl.path, tmpl_vars)
@@ -304,6 +304,6 @@ def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
     skupper_networks = get_skupper_networks(gqlapi.query)
     return {
         "skupper_sites": [
-            site.dict() for site in compile_skupper_sites(skupper_networks)
+            site.model_dump() for site in compile_skupper_sites(skupper_networks)
         ],
     }

reconcile/slack_usergroups.py

@@ -3,18 +3,19 @@ import sys
 from collections.abc import (
     Callable,
     Iterable,
+    MutableMapping,
     Sequence,
 )
 from datetime import datetime
 from typing import (
     Any,
     TypedDict,
+    TypeVar,
 )
 
 from github.GithubException import UnknownObjectException
 from pydantic import BaseModel
-from pydantic.utils import deep_update
-from sretoolbox.utils import retry
+from sretoolbox.utils import datatransformation, retry
 
 from reconcile import (
     openshift_users,
@@ -40,6 +41,7 @@ from reconcile.typed_queries.app_interface_vault_settings import (
 )
 from reconcile.typed_queries.pagerduty_instances import get_pagerduty_instances
 from reconcile.utils import gql
+from reconcile.utils.datetime_util import ensure_utc, utc_now
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.exceptions import (
     AppInterfaceSettingsError,
@@ -74,6 +76,26 @@ INTEGRATION_VERSION = "0.1.0"
 
 error_occurred = False
 
+KeyType = TypeVar("KeyType")
+
+
+def deep_update(
+    mapping: dict[KeyType, Any],
+    *updating_mappings: MutableMapping[KeyType, Any],
+) -> dict[KeyType, Any]:
+    updated_mapping = mapping.copy()
+    for updating_mapping in updating_mappings:
+        for k, v in updating_mapping.items():
+            if (
+                k in updated_mapping
+                and isinstance(updated_mapping[k], dict)
+                and isinstance(v, dict)
+            ):
+                updated_mapping[k] = deep_update(updated_mapping[k], v)
+            else:
+                updated_mapping[k] = v
+    return updated_mapping
+
 
 def get_git_api(url: str) -> GithubRepositoryApi | GitLabApi:
     """Return GitHub/GitLab API based on url."""
@@ -122,15 +144,12 @@ class State(BaseModel):
 SlackState = dict[str, dict[str, State]]
 
 
-class WorkspaceSpec(BaseModel):
+class WorkspaceSpec(BaseModel, arbitrary_types_allowed=True):
     """Slack workspace spec."""
 
     slack: SlackApi
     managed_usergroups: list[str] = []
 
-    class Config:
-        arbitrary_types_allowed = True
-
 
 SlackMap = dict[str, WorkspaceSpec]
 
@@ -357,11 +376,11 @@ def get_slack_usernames_from_owners(
 
 def get_slack_usernames_from_schedule(schedule: Iterable[ScheduleEntryV1]) -> list[str]:
     """Return list of usernames from all schedules."""
-    now = datetime.utcnow()
+    now = utc_now()
     all_slack_usernames: list[str] = []
     for entry in schedule:
-        start = datetime.strptime(entry.start, DATE_FORMAT)
-        end = datetime.strptime(entry.end, DATE_FORMAT)
+        start = ensure_utc(datetime.strptime(entry.start, DATE_FORMAT))  # noqa: DTZ007
+        end = ensure_utc(datetime.strptime(entry.end, DATE_FORMAT))  # noqa: DTZ007
         if start <= now <= end:
             all_slack_usernames.extend(get_slack_username(u) for u in entry.users)
     return all_slack_usernames
@@ -819,7 +838,9 @@ def run(
         desired_usergroup_name=usergroup_name,
     )
     # merge the two desired states recursively
-    desired_state = deep_update(desired_state, desired_state_cluster_usergroups)
+    desired_state = datatransformation.deep_merge(
+        desired_state, desired_state_cluster_usergroups
+    )
 
     runner_params: RunnerParams = {
         "dry_run": dry_run,
@@ -891,10 +912,10 @@ def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
             if role.tag_on_cluster_updates is not False
         ]
     return {
-        "permissions": [p.dict() for p in get_permissions(gqlapi.query)],
+        "permissions": [p.model_dump() for p in get_permissions(gqlapi.query)],
         "pagerduty_instances": [
-            p.dict() for p in get_pagerduty_instances(gqlapi.query)
+            p.model_dump() for p in get_pagerduty_instances(gqlapi.query)
         ],
-        "users": [u.dict() for u in users],
-        "clusters": [c.dict() for c in get_clusters(gqlapi.query)],
+        "users": [u.model_dump() for u in users],
+        "clusters": [c.model_dump() for c in get_clusters(gqlapi.query)],
     }

reconcile/sql_query.py

@@ -229,6 +229,7 @@ def collect_queries(
         accounts=[],
         prefetch_resources_by_schemas=["/aws/rds-defaults-1.yml"],
         secret_reader=secret_reader,
+        default_tags=None,
     )
 
     for sql_query in sql_queries:

reconcile/status_board.py

@@ -52,7 +52,7 @@ class AbstractStatusBoard(ABC, BaseModel):
     """Abstract class for upgrade policies
     Used to create and delete upgrade policies in OCM."""
 
-    id: str | None
+    id: str | None = None
     name: str
     fullname: str
 
@@ -88,7 +88,7 @@ class AbstractStatusBoard(ABC, BaseModel):
 
 
 class Product(AbstractStatusBoard):
-    applications: list["Application"] | None
+    applications: list["Application"] | None = None
 
     def create(self, ocm: OCMBaseClient) -> None:
         spec = self.to_ocm_spec()
@@ -121,7 +121,7 @@ class Product(AbstractStatusBoard):
 
 class Application(AbstractStatusBoard):
     product: Product
-    services: list["Service"] | None
+    services: list["Service"] | None = None
 
     def create(self, ocm: OCMBaseClient) -> None:
         if self.product.id:
@@ -214,9 +214,9 @@ class Service(AbstractStatusBoard):
 
 
 # Resolve forward references after class definitions
-Product.update_forward_refs()
-Application.update_forward_refs()
-Service.update_forward_refs()
+Product.model_rebuild()
+Application.model_rebuild()
+Service.model_rebuild()
 
 
 class UpdateNotSupportedError(Exception):

reconcile/statuspage/atlassian.py

@@ -29,12 +29,12 @@ class AtlassianRawComponent(BaseModel):
 
     id: str
     name: str
-    description: str | None
+    description: str | None = None
     position: int
     status: str
-    automation_email: str | None
-    group_id: str | None
-    group: bool | None
+    automation_email: str | None = None
+    group_id: str | None = None
+    group: bool | None = None
 
 
 class AtlassianRawMaintenanceUpdate(BaseModel):
@@ -56,9 +56,9 @@ class AtlassianRawMaintenance(BaseModel):
     scheduled_until: str
     incident_updates: list[AtlassianRawMaintenanceUpdate]
     components: list[AtlassianRawComponent]
-    auto_transition_deliver_notifications_at_end: bool | None
-    auto_transition_deliver_notifications_at_start: bool | None
-    scheduled_remind_prior: bool | None
+    auto_transition_deliver_notifications_at_end: bool | None = None
+    auto_transition_deliver_notifications_at_start: bool | None = None
+    scheduled_remind_prior: bool | None = None
 
 
 class AtlassianAPI:

reconcile/statuspage/integrations/maintenances.py

@@ -1,12 +1,13 @@
 import logging
 import sys
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta
 
 from reconcile.slack_base import slackapi_from_queries
 from reconcile.statuspage.atlassian import AtlassianStatusPageProvider
 from reconcile.statuspage.integration import get_binding_state, get_status_pages
 from reconcile.statuspage.page import StatusMaintenance
 from reconcile.statuspage.state import S3ComponentBindingState
+from reconcile.utils.datetime_util import utc_now
 from reconcile.utils.differ import diff_iterables
 from reconcile.utils.runtime.integration import (
     NoParams,
@@ -52,7 +53,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
         desired_state: list[StatusMaintenance],
         binding_state: S3ComponentBindingState,
     ) -> None:
-        now = datetime.now(UTC)
+        now = utc_now()
         slack = slackapi_from_queries(QONTRACT_INTEGRATION, init_usergroups=False)
         for m in desired_state:
             scheduled_start = m.schedule_start
@@ -68,7 +69,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
     def run(self, dry_run: bool = False) -> None:
         binding_state = get_binding_state(self.name, self.secret_reader)
         pages = get_status_pages()
-        now = datetime.now(UTC)
+        now = utc_now()
 
         error = False
         for p in pages:

reconcile/statuspage/page.py

@@ -19,19 +19,17 @@ from reconcile.statuspage.status import (
 PROVIDER_NAME = "statuspage"
 
 
-class StatusComponent(BaseModel):
+class StatusComponent(BaseModel, arbitrary_types_allowed=True):
     """
     Represents a status page component from the desired state.
     """
 
     name: str
     display_name: str
-    description: str | None
-    group_name: str | None
+    description: str | None = None
+    group_name: str | None = None
+    # Status provider configs hold different ways for a component to determine its status
     status_provider_configs: list[StatusProvider]
-    """
-    Status provider configs hold different ways for a component to determine its status
-    """
 
     def status_management_enabled(self) -> bool:
         """
@@ -49,9 +47,6 @@ class StatusComponent(BaseModel):
             return "operational"
         return None
 
-    class Config:
-        arbitrary_types_allowed = True
-
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, StatusComponent):
             raise NotImplementedError("Cannot compare to non StatusComponent objects.")