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

reconcile/external_resources/state.py

@@ -74,47 +74,47 @@ class DynamoDBStateAdapter:
     MODCONF_DRIFT_MINS = "drift_detection_minutes"
     MODCONF_TIMEOUT_MINS = "timeout_minutes"
 
-    def _get_value(self, item: Mapping[str, Any], key: str, _type: str = "S") -> Any:
-        return item[key][_type]
+    def _get_value(self, item: Mapping[str, Any], key: str, type: str = "S") -> Any:
+        return item[key][type]
 
     def deserialize(
         self,
         item: Mapping[str, Any],
         partial_data: bool = False,
     ) -> ExternalResourceState:
-        _key = self._get_value(item, self.ER_KEY, _type="M")
+        key_ = self._get_value(item, self.ER_KEY, type="M")
         key = ExternalResourceKey(
-            provision_provider=self._get_value(_key, self.ER_KEY_PROVISION_PROVIDER),
-            provisioner_name=self._get_value(_key, self.ER_KEY_PROVISIONER_NAME),
-            provider=self._get_value(_key, self.ER_KEY_PROVIDER),
-            identifier=self._get_value(_key, self.ER_KEY_IDENTIFIER),
+            provision_provider=self._get_value(key_, self.ER_KEY_PROVISION_PROVIDER),
+            provisioner_name=self._get_value(key_, self.ER_KEY_PROVISIONER_NAME),
+            provider=self._get_value(key_, self.ER_KEY_PROVIDER),
+            identifier=self._get_value(key_, self.ER_KEY_IDENTIFIER),
         )
-        _reconciliation = self._get_value(item, self.RECONC, _type="M")
+        reconciliation = self._get_value(item, self.RECONC, type="M")
 
         if partial_data:
             r = Reconciliation(
                 key=key,
                 resource_hash=self._get_value(
-                    _reconciliation, self.RECONC_RESOURCE_HASH
+                    reconciliation, self.RECONC_RESOURCE_HASH
                 ),
             )
         else:
-            _modconf = self._get_value(_reconciliation, self.MODCONF, _type="M")
+            modconf = self._get_value(reconciliation, self.MODCONF, type="M")
             r = Reconciliation(
                 key=key,
                 resource_hash=self._get_value(
-                    _reconciliation, self.RECONC_RESOURCE_HASH
+                    reconciliation, self.RECONC_RESOURCE_HASH
                 ),
-                input=self._get_value(_reconciliation, self.RECONC_INPUT),
-                action=self._get_value(_reconciliation, self.RECONC_ACTION),
+                input=self._get_value(reconciliation, self.RECONC_INPUT),
+                action=self._get_value(reconciliation, self.RECONC_ACTION),
                 module_configuration=ExternalResourceModuleConfiguration(
-                    image=self._get_value(_modconf, self.MODCONF_IMAGE),
-                    version=self._get_value(_modconf, self.MODCONF_VERSION),
+                    image=self._get_value(modconf, self.MODCONF_IMAGE),
+                    version=self._get_value(modconf, self.MODCONF_VERSION),
                     reconcile_drift_interval_minutes=self._get_value(
-                        _modconf, self.MODCONF_DRIFT_MINS, _type="N"
+                        modconf, self.MODCONF_DRIFT_MINS, type="N"
                     ),
                     reconcile_timeout_minutes=self._get_value(
-                        _modconf, self.MODCONF_TIMEOUT_MINS, _type="N"
+                        modconf, self.MODCONF_TIMEOUT_MINS, type="N"
                     ),
                 ),
             )

reconcile/gabi_authorized_users.py

@@ -67,7 +67,7 @@ def fetch_desired_state(
         expiration_date = datetime.strptime(g["expirationDate"], "%Y-%m-%d").date()
         if (expiration_date - date.today()).days > EXPIRATION_DAYS_MAX:
             raise RunnerException(
-                f'The maximum expiration date of {g["name"]} shall not '
+                f"The maximum expiration date of {g['name']} shall not "
                 f"exceed {EXPIRATION_DAYS_MAX} days from today"
             )
         for i in g["instances"]:
@@ -92,8 +92,8 @@ def fetch_desired_state(
                     break
             if not found:
                 raise RunnerException(
-                    f'[gabi:{g["name"]} (path: {g["path"]})] Could not find RDS identifier {identifier} '
-                    f'for account {account} in namespace {namespace["name"]}. '
+                    f"[gabi:{g['name']} (path: {g['path']})] Could not find RDS identifier {identifier} "
+                    f"for account {account} in namespace {namespace['name']}. "
                     "If this is a removed read only instance, consider updating the identifier to the source replica."
                 )
             users = get_usernames(g["users"], cluster)

reconcile/gcr_mirror.py

@@ -147,7 +147,7 @@ class QuayMirror:
         for org, data in summary.items():
             for item in data:
                 image = Image(
-                    f'{item["server_url"]}/{org}/{item["name"]}',
+                    f"{item['server_url']}/{org}/{item['name']}",
                     session=self.session,
                     timeout=REQUEST_TIMEOUT,
                 )
@@ -267,7 +267,7 @@ class QuayMirror:
             raw_data = self.secret_reader.read_all(push_secret)
             project = project_data["name"]
             token = base64.b64decode(raw_data["token"]).decode()
-            creds[project] = f'{raw_data["user"]}:{token}'
+            creds[project] = f"{raw_data['user']}:{token}"
         return creds
 
 

reconcile/github_org.py

@@ -120,7 +120,7 @@ def get_config(default=False):
             raise KeyError("default github org config not found")
         if len(found_defaults) > 1:
             raise KeyError(
-                "multiple default github org configs found: " f"{found_defaults}"
+                f"multiple default github org configs found: {found_defaults}"
             )
 
     return config
@@ -206,15 +206,11 @@ def fetch_desired_state(infer_clusters=True):
         if not permissions:
             continue
 
-        members = []
-
-        for user in role["users"]:
-            members.append(user["github_username"])
-
-        for bot in role["bots"]:
-            if "github_username" in bot:
-                members.append(bot["github_username"])
-        members = [m.lower() for m in members]
+        user_members = [user["github_username"] for user in role["users"]]
+        bot_members = [
+            bot["github_username"] for bot in role["bots"] if "github_username" in bot
+        ]
+        members = [m.lower() for m in user_members + bot_members]
 
         for permission in permissions:
             if permission["service"] == "github-org":
@@ -436,9 +432,9 @@ def run(dry_run):
     current_orgs = {item["params"]["org"] for item in current_state.dump()}
     desired_orgs = {item["params"]["org"] for item in desired_state.dump()}
 
-    assert (
-        current_orgs == desired_orgs
-    ), f"Current orgs ({current_orgs}) don't match desired orgs ({desired_orgs})"
+    assert current_orgs == desired_orgs, (
+        f"Current orgs ({current_orgs}) don't match desired orgs ({desired_orgs})"
+    )
 
     # Calculate diff
     diff = current_state.diff(desired_state)

reconcile/gitlab_housekeeping.py

@@ -174,7 +174,7 @@ def clean_pipelines(
                 gl_piplelines.get(p["id"]).cancel()
             except gitlab.exceptions.GitlabPipelineCancelError as err:
                 logging.error(
-                    f'unable to cancel {p["web_url"]} - '
+                    f"unable to cancel {p['web_url']} - "
                     f"error message {err.error_message}"
                 )
 

reconcile/gitlab_owners.py

@@ -198,7 +198,7 @@ class MRApproval:
         markdown_report = ""
 
         closest_approvers = []
-        for _, owners in report.items():
+        for owners in report.values():
             new_group = []
 
             if "closest_approvers" not in owners:
@@ -232,10 +232,10 @@ class MRApproval:
                 )
 
         for group in sorted(closest_approvers):
-            markdown_report += f'* {", ".join(group)}\n'
+            markdown_report += f"* {', '.join(group)}\n"
 
         approvers = set()
-        for _, owners in report.items():
+        for owners in report.values():
             if "approvers" not in owners:
                 continue
 
@@ -254,10 +254,10 @@ class MRApproval:
                 "\nIn case of emergency, the override approvers "
                 "(from parent directories) are:\n\n"
             )
-            markdown_report += f'* {", ".join(sorted(approvers))}\n'
+            markdown_report += f"* {', '.join(sorted(approvers))}\n"
 
         closest_reviewers = set()
-        for _, owners in report.items():
+        for owners in report.values():
             if "closest_reviewers" not in owners:
                 continue
 
@@ -274,11 +274,11 @@ class MRApproval:
                     closest_reviewers.add(closest_reviewer)
 
         if closest_reviewers:
-            markdown_report += "\nRelevant reviewers (with no " "merge rights) are:\n\n"
-            markdown_report += f'* {", ".join(sorted(closest_reviewers))}\n'
+            markdown_report += "\nRelevant reviewers (with no merge rights) are:\n\n"
+            markdown_report += f"* {', '.join(sorted(closest_reviewers))}\n"
 
         reviewers = set()
-        for _, owners in report.items():
+        for owners in report.values():
             if "reviewers" not in owners:
                 continue
 
@@ -303,7 +303,7 @@ class MRApproval:
                 "merge rights) from parent "
                 "directories are:\n\n"
             )
-            markdown_report += f'* {", ".join(sorted(reviewers))}\n'
+            markdown_report += f"* {', '.join(sorted(reviewers))}\n"
 
         return markdown_report.rstrip()
 
@@ -328,9 +328,7 @@ def act(repo, dry_run, instance, settings, defer=None):
 
         if mr_approval.top_commit_created_at is None:
             _LOG.info([
-                f"Project:{gitlab_cli.project.id} "
-                f"Merge Request:{mr.iid} "
-                f"- skipping"
+                f"Project:{gitlab_cli.project.id} Merge Request:{mr.iid} - skipping"
             ])
             continue
 

reconcile/gitlab_permissions.py

@@ -91,11 +91,12 @@ class GroupPermissionHandler:
         current_state: dict[str, GroupSpec],
     ) -> None:
         # gather list of app-interface managed repos
-        managed_repos: set[str] = set()
         instance = queries.get_gitlab_instance()
-        for project_request in instance.get("projectRequests", []):
-            for r in project_request.get("projects", []):
-                managed_repos.add(f"{instance['url']}/{project_request['group']}/{r}")
+        managed_repos = {
+            f"{instance['url']}/{project_request['group']}/{r}"
+            for project_request in instance.get("projectRequests", [])
+            for r in project_request.get("projects", [])
+        }
 
         # get the diff data
         diff_data = diff_mappings(

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/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