qontract-reconcile 0.10.2.dev14__py3-none-any.whl → 0.10.2.dev16__py3-none-any.whl

reconcile/glitchtip/integration.py

@@ -97,7 +97,7 @@ def fetch_desired_state(
         project = Project(
             name=glitchtip_project.name,
             platform=glitchtip_project.platform,
-            slug=glitchtip_project.project_id if glitchtip_project.project_id else "",
+            slug=glitchtip_project.project_id or "",
             event_throttle_rate=glitchtip_project.event_throttle_rate or 0,
         )
         # Check project is unique within an organization
@@ -108,24 +108,24 @@ def fetch_desired_state(
 
             # Get users via roles
             for role in glitchtip_team.roles:
-                for role_user in role.users:
-                    users.append(
-                        User(
-                            email=f"{role_user.org_username}@{mail_domain}",
-                            role=get_user_role(organization, role),
-                        )
+                users.extend(
+                    User(
+                        email=f"{role_user.org_username}@{mail_domain}",
+                        role=get_user_role(organization, role),
                     )
+                    for role_user in role.users
+                )
 
             # Get users via ldap
             for ldap_group in glitchtip_team.ldap_groups or []:
-                for member in internal_groups_client.group(ldap_group).members:
-                    users.append(
-                        User(
-                            email=f"{member.id}@{mail_domain}",
-                            role=glitchtip_team.members_organization_role
-                            or DEFAULT_MEMBER_ROLE,
-                        )
+                users.extend(
+                    User(
+                        email=f"{member.id}@{mail_domain}",
+                        role=glitchtip_team.members_organization_role
+                        or DEFAULT_MEMBER_ROLE,
                     )
+                    for member in internal_groups_client.group(ldap_group).members
+                )
 
             # set(users) will take the first occurrence of a user, so the users from roles will be preferred
             team = Team(name=glitchtip_team.name, users=set(users))

reconcile/glitchtip_project_alerts/integration.py

@@ -1,4 +1,5 @@
 import logging
+import operator
 from collections import defaultdict
 from collections.abc import (
     Callable,
@@ -192,9 +193,7 @@ class GlitchtipProjectAlertsIntegration(
             project = Project(
                 name=glitchtip_project.name,
                 platform=None,
-                slug=glitchtip_project.project_id
-                if glitchtip_project.project_id
-                else "",
+                slug=glitchtip_project.project_id or "",
                 alerts=alerts,
             )
 
@@ -238,7 +237,7 @@ class GlitchtipProjectAlertsIntegration(
                     current_project.alerts,
                     desired_project.alerts,
                     key=lambda g: g.name,
-                    equal=lambda g1, g2: g1 == g2,
+                    equal=operator.eq,
                 )
 
                 for alert_to_add in diff_result.add.values():

reconcile/gql_definitions/endpoints_discovery/{namespaces.py → apps.py}

@@ -58,20 +58,20 @@ fragment VaultSecret on VaultSecret_v1 {
     format
 }
 
-query EndPointsDiscoveryNamespaces {
-  namespaces: namespaces_v1 {
+query EndPointsDiscoveryApps {
+  apps: apps_v1 {
+    path
     name
-    delete
-    clusterAdmin
-    cluster {
-      ... OcConnectionCluster
+    endPoints {
+      name
+      url
     }
-    app {
-      path
+    namespaces {
       name
-      endPoints {
-        name
-        url
+      delete
+      clusterAdmin
+      cluster {
+        ...OcConnectionCluster
       }
     }
   }
@@ -90,25 +90,25 @@ class AppEndPointsV1(ConfiguredBaseModel):
     url: str = Field(..., alias="url")
 
 
-class AppV1(ConfiguredBaseModel):
-    path: str = Field(..., alias="path")
-    name: str = Field(..., alias="name")
-    end_points: Optional[list[AppEndPointsV1]] = Field(..., alias="endPoints")
-
-
 class NamespaceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     delete: Optional[bool] = Field(..., alias="delete")
     cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")
     cluster: OcConnectionCluster = Field(..., alias="cluster")
-    app: AppV1 = Field(..., alias="app")
 
 
-class EndPointsDiscoveryNamespacesQueryData(ConfiguredBaseModel):
+class AppV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+    name: str = Field(..., alias="name")
+    end_points: Optional[list[AppEndPointsV1]] = Field(..., alias="endPoints")
     namespaces: Optional[list[NamespaceV1]] = Field(..., alias="namespaces")
 
 
-def query(query_func: Callable, **kwargs: Any) -> EndPointsDiscoveryNamespacesQueryData:
+class EndPointsDiscoveryAppsQueryData(ConfiguredBaseModel):
+    apps: Optional[list[AppV1]] = Field(..., alias="apps")
+
+
+def query(query_func: Callable, **kwargs: Any) -> EndPointsDiscoveryAppsQueryData:
     """
     This is a convenience function which queries and parses the data into
     concrete types. It should be compatible with most GQL clients.
@@ -121,7 +121,7 @@ def query(query_func: Callable, **kwargs: Any) -> EndPointsDiscoveryNamespacesQu
         kwargs: optional arguments that will be passed to the query function
 
     Returns:
-        EndPointsDiscoveryNamespacesQueryData: queried data parsed into generated classes
+        EndPointsDiscoveryAppsQueryData: queried data parsed into generated classes
     """
     raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return EndPointsDiscoveryNamespacesQueryData(**raw_data)
+    return EndPointsDiscoveryAppsQueryData(**raw_data)

reconcile/integrations_manager.py

@@ -59,8 +59,7 @@ INTEGRATION_UPSTREAM_REPOS_PARAM = "INTEGRATION_UPSTREAM_REPOS"
 
 def get_image_tag_from_ref(ref: str, upstream: str) -> str:
     gh_prefix = "https://github.com/"
-    if upstream.startswith(gh_prefix):
-        upstream = upstream[len(gh_prefix) :]
+    upstream = upstream.removeprefix(gh_prefix)
     settings = queries.get_app_interface_settings()
     gh_token = get_default_config()["token"]
     github = Github(gh_token, base_url=GH_BASE_URL)

reconcile/jenkins_job_builds_cleaner.py

@@ -1,4 +1,5 @@
 import logging
+import operator
 import re
 import time
 
@@ -36,7 +37,7 @@ def delete_builds(jenkins, builds_todel, dry_run=True):
 
 def get_last_build_ids(builds):
     builds_to_keep = []
-    sorted_builds = sorted(builds, key=lambda b: b["timestamp"], reverse=True)
+    sorted_builds = sorted(builds, key=operator.itemgetter("timestamp"), reverse=True)
     if sorted_builds:
         last_build = sorted_builds[0]
         builds_to_keep.append(last_build["id"])
@@ -88,14 +89,15 @@ def run(dry_run):
             continue
 
         # Process cleanup rules, pre-compile as regexes
-        cleanup_rules = []
-        for rule in instance_cleanup_rules:
-            cleanup_rules.append({
+        cleanup_rules = [
+            {
                 "name": rule["name"],
                 "name_re": re.compile(rule["name"]),
                 "keep_hours": rule["keep_hours"],
                 "keep_ms": hours_to_ms(rule["keep_hours"]),
-            })
+            }
+            for rule in instance_cleanup_rules
+        ]
 
         token = instance["token"]
         instance_name = instance["name"]

reconcile/jenkins_roles.py

@@ -85,12 +85,14 @@ def get_current_state(jenkins_map):
             if role_name == "anonymous":
                 continue
 
-            for user in users:
-                current_state.append({
+            current_state.extend(
+                {
                     "instance": instance,
                     "role": role_name,
                     "user": user,
-                })
+                }
+                for user in users
+            )
 
     return current_state
 
@@ -105,12 +107,14 @@ def get_desired_state():
             if p["service"] != "jenkins-role":
                 continue
 
-            for u in r["users"]:
-                desired_state.append({
+            desired_state.extend(
+                {
                     "instance": p["instance"]["name"],
                     "role": p["role"],
                     "user": u["org_username"],
-                })
+                }
+                for u in r["users"]
+            )
             for u in r["bots"]:
                 if u["org_username"] is None:
                     continue

reconcile/jenkins_worker_fleets.py

@@ -71,7 +71,7 @@ def get_desired_state(
         if not found:
             raise ValueError(
                 f"Could not find asg identifier {identifier} "
-                f'for account {account} in namespace {namespace["name"]}'
+                f"for account {account} in namespace {namespace['name']}"
             )
     return desired_state
 
@@ -105,9 +105,10 @@ def act(
             logging.info(["update_jenkins_worker_fleet", instance_name, fleet.name])
 
         if not dry_run:
-            d_clouds = []
-            for d in desired_state:
-                d_clouds.append({"eC2Fleet": d.dict(by_alias=True, exclude_none=True)})
+            d_clouds = [
+                {"eC2Fleet": d.dict(by_alias=True, exclude_none=True)}
+                for d in desired_state
+            ]
             config = {"jenkins": {"clouds": d_clouds}}
             jenkins.apply_jcasc_config(config)
 

reconcile/jira_permissions_validator.py

@@ -107,7 +107,7 @@ def board_is_valid(
                 )
                 error |= ValidationError.INVALID_COMPONENT
 
-        issue_type = board.issue_type if board.issue_type else default_issue_type
+        issue_type = board.issue_type or default_issue_type
         project_issue_types = jira.project_issue_types()
         project_issue_types_str = [i.name for i in project_issue_types]
         if issue_type not in project_issue_types_str:
@@ -128,11 +128,7 @@ def board_is_valid(
             )
             error |= ValidationError.INVALID_ISSUE_TYPE
 
-        reopen_state = (
-            board.issue_reopen_state
-            if board.issue_reopen_state
-            else default_reopen_state
-        )
+        reopen_state = board.issue_reopen_state or default_reopen_state
         if reopen_state.lower() not in [t.lower() for t in available_states]:
             logging.error(
                 f"[{board.name}] '{reopen_state}' is not a valid state in project. Valid states: {available_states}"

reconcile/ldap_groups/integration.py

@@ -1,5 +1,6 @@
 import contextlib
 import logging
+import operator
 from collections.abc import (
     Callable,
     Iterable,
@@ -86,7 +87,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
         owner = Entity(
             type=EntityType.SERVICE_ACCOUNT,
             # OIDC service accounts are named service-account-<client_id>
-            id=f'service-account-{secret["client_id"]}',
+            id=f"service-account-{secret['client_id']}",
         )
         desired_groups_for_roles = self.get_desired_groups_for_roles(
             roles,
@@ -241,7 +242,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
             current_groups,
             desired_groups,
             key=lambda g: g.name,
-            equal=lambda g1, g2: g1 == g2,
+            equal=operator.eq,
         )
         # Internal Groups API does not support listing all managed groups, therefore
         # we need to keep track of them ourselves.

reconcile/ocm_groups.py

@@ -19,16 +19,16 @@ QONTRACT_INTEGRATION = "ocm-groups"
 
 
 def get_cluster_state(group_items, ocm_map):
-    results = []
     cluster = group_items["cluster"]
     ocm = ocm_map.get(cluster)
     group_name = group_items["group_name"]
     group = ocm.get_group_if_exists(cluster, group_name)
     if group is None:
-        return results
-    for user in group["users"] or []:
-        results.append({"cluster": cluster, "group": group_name, "user": user})
-    return results
+        return []
+    return [
+        {"cluster": cluster, "group": group_name, "user": user}
+        for user in group["users"] or []
+    ]
 
 
 def fetch_current_state(clusters, thread_pool_size):

reconcile/ocm_update_recommended_version.py

@@ -19,8 +19,8 @@ QONTRACT_INTEGRATION = "ocm-update-recommended-version"
 
 def get_highest(version_set: set[str]) -> str:
     def _compare(v1: str, v2: str) -> int:
-        _v1 = semver.VersionInfo.parse(v1)
-        return _v1.compare(v2)
+        v1_ = semver.VersionInfo.parse(v1)
+        return v1_.compare(v2)
 
     sorted_version_set = sorted(
         version_set, key=functools.cmp_to_key(_compare), reverse=True

reconcile/openshift_base.py

@@ -220,17 +220,17 @@ def init_specs_to_fetch(
 
             # Initialize desired state specs
             openshift_resources = namespace_info.get("openshiftResources")
-            for openshift_resource in openshift_resources or []:
-                state_specs.append(
-                    DesiredStateSpec(
-                        oc=oc,
-                        cluster=cluster,
-                        namespace=namespace,
-                        resource=openshift_resource,
-                        parent=namespace_info,
-                        privileged=privileged,
-                    )
+            state_specs.extend(
+                DesiredStateSpec(
+                    oc=oc,
+                    cluster=cluster,
+                    namespace=namespace,
+                    resource=openshift_resource,
+                    parent=namespace_info,
+                    privileged=privileged,
                 )
+                for openshift_resource in openshift_resources or []
+            )
 
     elif clusters:
         # set namespace to something indicative
@@ -488,7 +488,7 @@ def apply(
                 obsolete_rs["metadata"]["ownerReferences"] = owner_references
                 oc.apply(namespace=namespace, resource=OR(obsolete_rs, "", ""))
         except (MayNotChangeOnceSetError, PrimaryClusterIPCanNotBeUnsetError):
-            if resource_type not in {"Service"}:
+            if resource_type != "Service":
                 raise
 
             oc.delete(namespace=namespace, kind=resource_type, name=resource.name)
@@ -882,10 +882,7 @@ def apply_action(
             if resource_type != "Secret"
             else f"error applying Secret {resource.name}: REDACTED"
         )
-        msg = (
-            f"[{cluster}/{namespace}] {err} "
-            f"(error details: {resource.error_details})"
-        )
+        msg = f"[{cluster}/{namespace}] {err} (error details: {resource.error_details})"
         logging.error(msg)
 
 
@@ -956,7 +953,7 @@ def _realize_resource_data_3way_diff(
     actions: list[dict] = []
 
     if ri.has_error_registered(cluster=cluster):
-        msg = f"[{cluster}] skipping realize_data for " "cluster with errors"
+        msg = f"[{cluster}] skipping realize_data for cluster with errors"
         logging.error(msg)
         return actions
 
@@ -1212,8 +1209,7 @@ def validate_realized_data(actions: Iterable[dict[str, str]], oc_map: ClusterMap
                 state = status.get("state")
                 if state != "AtLatestKnown":
                     logging.info(
-                        f"Subscription {name} state is invalid. "
-                        f"Current state: {state}"
+                        f"Subscription {name} state is invalid. Current state: {state}"
                     )
                     raise ValidationError(name)
             elif kind == "Job":
@@ -1311,8 +1307,7 @@ def aggregate_shared_resources(namespace_info, shared_resources_type):
     ]
     if shared_resources_type not in supported_shared_resources_types:
         raise KeyError(
-            f"shared_resource_type must be one of "
-            f"{supported_shared_resources_types}."
+            f"shared_resource_type must be one of {supported_shared_resources_types}."
         )
     shared_resources = namespace_info.get("sharedResources")
     namespace_type_resources = namespace_info.get(shared_resources_type)

reconcile/openshift_groups.py

@@ -41,12 +41,11 @@ QONTRACT_INTEGRATION = "openshift-groups"
 def get_cluster_state(
     group_items: Mapping[str, str], oc_map: ClusterMap
 ) -> list[dict[str, str]]:
-    results: list[dict[str, str]] = []
     cluster = group_items["cluster"]
     oc = oc_map.get(cluster)
     if isinstance(oc, OCLogMsg):
         logging.log(level=oc.log_level, msg=oc.message)
-        return results
+        return []
     group_name = group_items["group_name"]
     try:
         group = oc.get_group_if_exists(group_name)
@@ -55,10 +54,11 @@ def get_cluster_state(
         logging.error(msg)
         raise e
     if group is None:
-        return results
-    for user in group["users"] or []:
-        results.append({"cluster": cluster, "group": group_name, "user": user})
-    return results
+        return []
+    return [
+        {"cluster": cluster, "group": group_name, "user": user}
+        for user in group["users"] or []
+    ]
 
 
 def create_groups_list(
@@ -74,8 +74,9 @@ def create_groups_list(
         if isinstance(oc, OCLogMsg):
             logging.log(level=oc.log_level, msg=oc.message)
         groups = cluster_info["managedGroups"] or []
-        for group_name in groups:
-            groups_list.append({"cluster": cluster, "group_name": group_name})
+        groups_list.extend(
+            {"cluster": cluster, "group_name": group_name} for group_name in groups
+        )
     return groups_list
 
 

reconcile/openshift_namespace_labels.py

@@ -192,7 +192,7 @@ class LabelInventory:
                     changed[k] = v
 
             # remove old labels
-            for k, _ in current.items():
+            for k in current:
                 if k in managed and k not in desired:
                     changed[k] = None
 
@@ -261,7 +261,7 @@ def get_desired(
         # A dedicated integration or PR check will be done to ensure this
         # case does not occur (anymore)
         _LOG.debug(
-            f"Found several namespace definitions for " f"{cluster}/{ns_name}. Ignoring"
+            f"Found several namespace definitions for {cluster}/{ns_name}. Ignoring"
         )
         inventory.delete(cluster=cluster, namespace=ns_name)
 
@@ -310,8 +310,7 @@ def lookup_namespaces(cluster: str, oc_map: OCMap) -> tuple[str, dict[str, Any]
         _LOG.error(msg)
     except ApiException as e:
         _LOG.error(
-            f"Cluster {cluster} skipped: "
-            f"APIException [{e.status}:{e.reason}] {e.body}"
+            f"Cluster {cluster} skipped: APIException [{e.status}:{e.reason}] {e.body}"
         )
 
     return cluster, None

reconcile/openshift_namespaces.py

@@ -131,7 +131,7 @@ def check_results(
         if isinstance(e, Exception):
             err = True
             msg = (
-                f'cluster: {s["cluster"]}, namespace: {s["namespace"]}, '
+                f"cluster: {s['cluster']}, namespace: {s['namespace']}, "
                 f"exception: {e!s}"
             )
             logging.error(msg)

reconcile/openshift_network_policies.py

@@ -120,7 +120,7 @@ def run(dry_run, thread_pool_size=10, internal=None, use_jump_host=True, defer=N
         if ob.is_namespace_deleted(namespace_info):
             continue
 
-        shard_key = f"{namespace_info['cluster']['name']}/" f"{namespace_info['name']}"
+        shard_key = f"{namespace_info['cluster']['name']}/{namespace_info['name']}"
 
         if not is_in_shard(shard_key):
             continue

reconcile/openshift_resources_base.py

@@ -864,10 +864,10 @@ def get_namespaces(
             )
         )
     ]
-    _namespaces = filter_namespaces_by_cluster_and_namespace(
+    namespaces_ = filter_namespaces_by_cluster_and_namespace(
         namespaces, cluster_names, exclude_clusters, namespace_name
     )
-    return canonicalize_namespaces(_namespaces, providers, resource_schema_filter)
+    return canonicalize_namespaces(namespaces_, providers, resource_schema_filter)
 
 
 @defer
@@ -1029,10 +1029,10 @@ class CheckClusterScopedResourceDuplicates:
         duplicates: list[tuple[str, str, str, list[str]]] = []
 
         for cluster, cluster_resources in cluster_cs_resources.items():
-            _kind_name: dict[str, dict[str, list[str]]] = {}
+            kind_name: dict[str, dict[str, list[str]]] = {}
             for ns, resources in cluster_resources.items():
                 for kind, names in resources.items():
-                    k_ref = _kind_name.setdefault(kind, {})
+                    k_ref = kind_name.setdefault(kind, {})
                     for name in names:
                         n_ref = k_ref.setdefault(name, [])
                         n_ref.append(ns)

reconcile/openshift_serviceaccount_tokens.py

@@ -75,7 +75,7 @@ def get_tokens_for_service_account(
             == service_account
             and token["type"] == "kubernetes.io/service-account-token"
         ):
-            result.append(token)
+            result.append(token)  # noqa: PERF401
     return result
 
 

reconcile/openshift_tekton_resources.py

@@ -108,8 +108,7 @@ def fetch_tkn_providers(saas_file_name: str | None) -> dict[str, Any]:
 
     if duplicates:
         raise OpenshiftTektonResourcesBadConfigError(
-            "There are duplicates in tekton providers names: "
-            f'{", ".join(duplicates)}'
+            f"There are duplicates in tekton providers names: {', '.join(duplicates)}"
         )
 
     # Only get the providers that are used by the saas files

reconcile/openshift_users.py

@@ -47,10 +47,11 @@ def get_cluster_users(
 
     # backwarts compatibiltiy for clusters w/o auth
     identity_prefixes = ["github"]
-
-    for auth in cluster_info.auth:
-        if isinstance(auth, ClusterAuthOIDCV1 | ClusterAuthRHIDPV1):
-            identity_prefixes.append(auth.name)
+    identity_prefixes.extend(
+        auth.name
+        for auth in cluster_info.auth
+        if isinstance(auth, ClusterAuthOIDCV1 | ClusterAuthRHIDPV1)
+    )
 
     for u in oc.get_users():
         if u["metadata"].get("labels", {}).get("admin", ""):

reconcile/prometheus_rules_tester/integration.py

@@ -124,22 +124,22 @@ def get_rules_and_tests(
     """Iterates through all namespaces and returns a list of tests to run"""
     namespace_with_prom_rules, _ = orb.get_namespaces(
         PROVIDERS,
-        cluster_names=cluster_names if cluster_names else [],
+        cluster_names=cluster_names or [],
         namespace_name=NAMESPACE_NAME,
     )
 
-    iterable = []
+    iterable: list[RuleToFetch] = []
     for namespace in namespace_with_prom_rules:
         prom_rules = [
             r for r in namespace["openshiftResources"] if r["provider"] in PROVIDERS
         ]
-        for resource in prom_rules:
-            iterable.append(
-                RuleToFetch(
-                    namespace=namespace,
-                    resource=resource,
-                )
+        iterable.extend(
+            RuleToFetch(
+                namespace=namespace,
+                resource=resource,
             )
+            for resource in prom_rules
+        )
 
     return threaded.run(
         func=fetch_rule_and_tests,

reconcile/quay_mirror.py

@@ -190,8 +190,7 @@ class QuayMirror:
                     )
                     if mirror_image.registry == "docker.io" and item["public"]:
                         _LOG.error(
-                            "Image %s can't be mirrored to a public "
-                            "quay repository.",
+                            "Image %s can't be mirrored to a public quay repository.",
                             mirror_image,
                         )
                         sys.exit(ExitCodes.ERROR)
@@ -250,7 +249,7 @@ class QuayMirror:
             for item in data:
                 push_creds = self.push_creds[org_key].split(":")
                 image = Image(
-                    f'{item["server_url"]}/{org}/{item["name"]}',
+                    f"{item['server_url']}/{org}/{item['name']}",
                     username=push_creds[0],
                     password=push_creds[1],
                     response_cache=self.response_cache,
@@ -409,7 +408,7 @@ class QuayMirror:
             org = org_data["name"]
             instance = org_data["instance"]["name"]
             org_key = OrgKey(instance, org)
-            creds[org_key] = f'{raw_data["user"]}:{raw_data["token"]}'
+            creds[org_key] = f"{raw_data['user']}:{raw_data['token']}"
 
         return creds
 

reconcile/quay_mirror_org.py

@@ -150,7 +150,7 @@ class QuayMirrorOrg:
 
             for item in data:
                 image = Image(
-                    f'{server_url}/{org_name}/{item["name"]}',
+                    f"{server_url}/{org_name}/{item['name']}",
                     username=username,
                     password=password,
                     session=self.session,