qontract-reconcile 0.10.1rc879__py3-none-any.whl → 0.10.1rc894__py3-none-any.whl

reconcile/github_org.py

@@ -438,9 +438,7 @@ def run(dry_run):
 
     assert (
         current_orgs == desired_orgs
-    ), "Current orgs ({}) don't match desired orgs ({})".format(
-        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/github_repo_invites.py

@@ -5,10 +5,7 @@ from collections.abc import (
     Mapping,
 )
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils import (
@@ -27,7 +24,7 @@ class CodeComponents:
 
 
 def _parse_code_components(
-    raw: Optional[Iterable[Mapping[str, Any]]],
+    raw: Iterable[Mapping[str, Any]] | None,
 ) -> CodeComponents:
     urls = set()
     known_orgs = set()

reconcile/gitlab_housekeeping.py

@@ -9,11 +9,7 @@ from datetime import (
     timedelta,
 )
 from operator import itemgetter
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 import gitlab
 from gitlab.v4.objects import (
@@ -178,7 +174,7 @@ def close_item(
     gl: GitLabApi,
     enable_closing: bool,
     item_type: str,
-    item: Union[ProjectIssue, ProjectMergeRequest],
+    item: ProjectIssue | ProjectMergeRequest,
 ):
     if enable_closing:
         logging.info([
@@ -239,7 +235,7 @@ def handle_stale_items(
             cancel_notes = [
                 n
                 for n in item.notes.list()
-                if n.attributes.get("body") == "/{} cancel".format(LABEL)
+                if n.attributes.get("body") == f"/{LABEL} cancel"
             ]
             if not cancel_notes:
                 continue
@@ -280,7 +276,7 @@ def is_rebased(mr, gl: GitLabApi) -> bool:
 def get_merge_requests(
     dry_run: bool,
     gl: GitLabApi,
-    users_allowed_to_label: Optional[Iterable[str]] = None,
+    users_allowed_to_label: Iterable[str] | None = None,
 ) -> list[dict[str, Any]]:
     mrs = gl.get_merge_requests(state=MRState.OPENED)
     return preprocess_merge_requests(
@@ -295,7 +291,7 @@ def preprocess_merge_requests(
     dry_run: bool,
     gl: GitLabApi,
     project_merge_requests: list[ProjectMergeRequest],
-    users_allowed_to_label: Optional[Iterable[str]] = None,
+    users_allowed_to_label: Iterable[str] | None = None,
 ) -> list[dict[str, Any]]:
     results = []
     for mr in project_merge_requests:
@@ -434,7 +430,7 @@ def rebase_merge_requests(
                     rebases += 1
                     rebased_merge_requests.labels(mr.target_project_id).inc()
             except gitlab.exceptions.GitlabMRRebaseError as e:
-                logging.error("unable to rebase {}: {}".format(mr.iid, e))
+                logging.error(f"unable to rebase {mr.iid}: {e}")
         else:
             logging.info([
                 "rebase",
@@ -538,7 +534,7 @@ def merge_merge_requests(
                     return
                 merges += 1
             except gitlab.exceptions.GitlabMRClosedError as e:
-                logging.error("unable to merge {}: {}".format(mr.iid, e))
+                logging.error(f"unable to merge {mr.iid}: {e}")
 
 
 def get_app_sre_usernames(gl: GitLabApi) -> set[str]:

reconcile/gitlab_labeler.py

@@ -4,7 +4,6 @@ from collections.abc import (
     Iterable,
     Set,
 )
-from typing import Optional
 
 from reconcile import queries
 from reconcile.gitlab_housekeeping import (
@@ -48,7 +47,7 @@ def get_parents_list() -> set[str]:
 
 def guess_onboarding_status(
     changed_paths: Iterable[str], apps: dict[str, dict], parent_apps: set[str]
-) -> Optional[str]:
+) -> str | None:
     """
     Guess the service name of a given MR from the changed paths of the
     MR. This will allow to add the onboarding status to the MR's as label

reconcile/gitlab_members.py

@@ -1,10 +1,7 @@
 import enum
 import logging
 from collections.abc import Callable
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -203,7 +200,7 @@ def get_gitlab_instance(query_func: Callable) -> GitlabInstanceV1:
 @defer
 def run(
     dry_run: bool,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
     gqlapi = gql.get_api()
     # queries

reconcile/gitlab_permissions.py

@@ -21,9 +21,7 @@ def get_members_to_add(repo, gl, app_sre):
     if maintainers is None:
         return []
     if gl.user.username not in maintainers:
-        logging.error(
-            "'{}' is not shared with {} as 'Maintainer'".format(repo, gl.user.username)
-        )
+        logging.error(f"'{repo}' is not shared with {gl.user.username} as 'Maintainer'")
         return []
     members_to_add = [
         {"user": u, "repo": repo} for u in app_sre if u.username not in maintainers

reconcile/glitchtip/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Iterable,
     Sequence,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.glitchtip.reconciler import GlitchtipReconciler
 from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
@@ -19,7 +16,7 @@ from reconcile.gql_definitions.glitchtip.glitchtip_project import (
     DEFINITION as GLITCHTIP_PROJECT_DEFINITION,
 )
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
-    GlitchtipProjectsV1,
+    GlitchtipProjectV1,
     RoleV1,
 )
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
@@ -87,7 +84,7 @@ def fetch_current_state(
 
 
 def fetch_desired_state(
-    glitchtip_projects: Sequence[GlitchtipProjectsV1],
+    glitchtip_projects: Sequence[GlitchtipProjectV1],
     mail_domain: str,
     internal_groups_client: InternalGroupsClient,
 ) -> list[Organization]:
@@ -143,7 +140,7 @@ def fetch_desired_state(
     return list(organizations.values())
 
 
-def get_glitchtip_projects(query_func: Callable) -> list[GlitchtipProjectsV1]:
+def get_glitchtip_projects(query_func: Callable) -> list[GlitchtipProjectV1]:
     glitchtip_projects = (
         glitchtip_project_query(query_func=query_func).glitchtip_projects or []
     )
@@ -172,7 +169,7 @@ def get_internal_groups_client(
 
 @defer
 def run(
-    dry_run: bool, instance: Optional[str] = None, defer: Optional[Callable] = None
+    dry_run: bool, instance: str | None = None, defer: Callable | None = None
 ) -> None:
     gqlapi = gql.get_api()
     vault_settings = get_app_interface_vault_settings()

reconcile/glitchtip_project_alerts/integration.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from urllib.parse import urlencode
 
 from reconcile import jira_permissions_validator
@@ -18,7 +15,7 @@ from reconcile.gql_definitions.glitchtip_project_alerts.glitchtip_project import
     GlitchtipProjectAlertRecipientEmailV1,
     GlitchtipProjectAlertRecipientV1,
     GlitchtipProjectAlertRecipientWebhookV1,
-    GlitchtipProjectsV1,
+    GlitchtipProjectV1,
 )
 from reconcile.gql_definitions.glitchtip_project_alerts.glitchtip_project import (
     query as glitchtip_project_query,
@@ -46,7 +43,7 @@ ProjectStates = dict[str, Project]
 
 
 class GlitchtipProjectAlertsIntegrationParams(PydanticRunParams):
-    instance: Optional[str] = None
+    instance: str | None = None
 
 
 def webhook_urls_are_unique(alerts: Iterable[ProjectAlert]) -> bool:
@@ -70,10 +67,10 @@ class GlitchtipProjectAlertsIntegration(
     def name(self) -> str:
         return QONTRACT_INTEGRATION
 
-    def get_early_exit_desired_state(self) -> Optional[dict[str, Any]]:
+    def get_early_exit_desired_state(self) -> dict[str, Any] | None:
         return {"projects": [c.dict() for c in self.get_projects(gql.get_api().query)]}
 
-    def get_projects(self, query_func: Callable) -> list[GlitchtipProjectsV1]:
+    def get_projects(self, query_func: Callable) -> list[GlitchtipProjectV1]:
         return glitchtip_project_query(query_func=query_func).glitchtip_projects or []
 
     def _build_project_alert_recipient(
@@ -95,7 +92,7 @@ class GlitchtipProjectAlertsIntegration(
 
     def fetch_desired_state(
         self,
-        glitchtip_projects: Iterable[GlitchtipProjectsV1],
+        glitchtip_projects: Iterable[GlitchtipProjectV1],
         gjb_alert_url: str | None,
         gjb_token: str | None,
     ) -> list[Organization]:
@@ -123,30 +120,16 @@ class GlitchtipProjectAlertsIntegration(
                     )
                 )
             if glitchtip_project.jira and gjb_alert_url:
-                jira_project_key = None
-                if glitchtip_project.jira.project:
-                    jira_project_key = glitchtip_project.jira.project
-                elif (
-                    glitchtip_project.jira.board
-                    and integration_is_enabled(
-                        QONTRACT_INTEGRATION, glitchtip_project.jira.board
-                    )
-                    and integration_is_enabled(
-                        jira_permissions_validator.QONTRACT_INTEGRATION,
-                        glitchtip_project.jira.board,
-                    )
-                ):
-                    jira_project_key = glitchtip_project.jira.board.name
+                params: dict[str, str | list[str]] = {}
+                token_params = {"token": gjb_token} if gjb_token else {}
+                alert_labels = glitchtip_project.jira.labels or []
 
-                if jira_project_key:
-                    params: dict[str, str | list] = {}
-                    if gjb_token:
-                        params["token"] = gjb_token
-                    if glitchtip_project.jira.labels:
-                        params["labels"] = glitchtip_project.jira.labels
-                    url = (
-                        f"{gjb_alert_url}/{jira_project_key}?{urlencode(params, True)}"
-                    )
+                if glitchtip_project.jira.project:
+                    params = {
+                        "labels": alert_labels,
+                        "components": glitchtip_project.jira.components or [],
+                    } | token_params
+                    url = f"{gjb_alert_url}/{glitchtip_project.jira.project}?{urlencode(params, True)}"
                     alerts.append(
                         ProjectAlert(
                             name=GJB_ALERT_NAME,
@@ -160,6 +143,47 @@ class GlitchtipProjectAlertsIntegration(
                             ],
                         )
                     )
+
+                elif (
+                    glitchtip_project.jira.escalation_policy
+                    and glitchtip_project.jira.escalation_policy.channels.jira_board
+                ):
+                    # definition via escalation policy
+                    channels = glitchtip_project.jira.escalation_policy.channels
+                    for board in channels.jira_board:
+                        if not integration_is_enabled(
+                            QONTRACT_INTEGRATION, board
+                        ) or not integration_is_enabled(
+                            jira_permissions_validator.QONTRACT_INTEGRATION, board
+                        ):
+                            continue
+                        params = {
+                            "labels": alert_labels + (channels.jira_labels or []),
+                            "components": [channels.jira_component]
+                            if channels.jira_component
+                            else [],
+                        } | token_params
+                        if board.issue_type:
+                            params["issue_type"] = board.issue_type
+                        url = f"{gjb_alert_url}/{board.name}?{urlencode(params, True)}"
+                        alerts.append(
+                            ProjectAlert(
+                                name=GJB_ALERT_NAME,
+                                timespan_minutes=1,
+                                quantity=1,
+                                recipients=[
+                                    ProjectAlertRecipient(
+                                        recipient_type=RecipientType.WEBHOOK,
+                                        url=url,
+                                    )
+                                ],
+                            )
+                        )
+                else:
+                    raise ValueError(
+                        "Jira integration requires either project or escalation policy to be set"
+                    )
+
             # check for duplicates
             if not webhook_urls_are_unique(alerts):
                 raise ValueError(
@@ -264,7 +288,7 @@ class GlitchtipProjectAlertsIntegration(
         glitchtip_instances = glitchtip_instance_query(
             query_func=gqlapi.query
         ).instances
-        glitchtip_projects_by_instance: dict[str, list[GlitchtipProjectsV1]] = (
+        glitchtip_projects_by_instance: dict[str, list[GlitchtipProjectV1]] = (
             defaultdict(list)
         )
         for glitchtip_project in self.get_projects(query_func=gqlapi.query):

reconcile/glitchtip_project_dsn/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import threaded
 
@@ -20,7 +17,7 @@ from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
     DEFINITION as GLITCHTIP_PROJECT_DEFINITION,
 )
-from reconcile.gql_definitions.glitchtip.glitchtip_project import GlitchtipProjectsV1
+from reconcile.gql_definitions.glitchtip.glitchtip_project import GlitchtipProjectV1
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
     query as glitchtip_project_query,
 )
@@ -73,7 +70,7 @@ def glitchtip_project_dsn_secret(project: Project, key: ProjectKey) -> dict[str,
 
 
 def fetch_current_state(
-    project: GlitchtipProjectsV1,
+    project: GlitchtipProjectV1,
     oc_map: OCMap,
     ri: ResourceInventory,
 ) -> None:
@@ -110,7 +107,7 @@ def fetch_current_state(
 
 
 def fetch_desired_state(
-    glitchtip_projects: Iterable[GlitchtipProjectsV1],
+    glitchtip_projects: Iterable[GlitchtipProjectV1],
     ri: ResourceInventory,
     glitchtip_client: GlitchtipClient,
 ) -> None:
@@ -145,7 +142,7 @@ def fetch_desired_state(
             )
 
 
-def projects_query(query_func: Callable) -> list[GlitchtipProjectsV1]:
+def projects_query(query_func: Callable) -> list[GlitchtipProjectV1]:
     glitchtip_projects = []
     for project in (
         glitchtip_project_query(query_func=query_func).glitchtip_projects or []
@@ -169,10 +166,10 @@ def projects_query(query_func: Callable) -> list[GlitchtipProjectsV1]:
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    instance: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    instance: str | None = None,
+    defer: Callable | None = None,
 ) -> None:
     # settings
     vault_settings = get_app_interface_vault_settings()

reconcile/gql_definitions/aws_account_manager/aws_accounts.py

@@ -39,6 +39,12 @@ fragment AWSAccountManaged on AWSAccount_v1 {
       value
     }
   }
+  securityContact {
+    name
+    title
+    email
+    phoneNumber
+  }
 }
 
 fragment VaultSecret on VaultSecret_v1 {

reconcile/gql_definitions/fragments/aws_account_managed.py

@@ -40,6 +40,13 @@ class AWSQuotaLimitsV1(ConfiguredBaseModel):
     quotas: list[AWSQuotaV1] = Field(..., alias="quotas")
 
 
+class AWSContactV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    title: Optional[str] = Field(..., alias="title")
+    email: str = Field(..., alias="email")
+    phone_number: str = Field(..., alias="phoneNumber")
+
+
 class AWSAccountManaged(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     uid: str = Field(..., alias="uid")
@@ -47,3 +54,4 @@ class AWSAccountManaged(ConfiguredBaseModel):
     premium_support: bool = Field(..., alias="premiumSupport")
     organization: Optional[AWSOrganizationV1] = Field(..., alias="organization")
     quota_limits: Optional[list[AWSQuotaLimitsV1]] = Field(..., alias="quotaLimits")
+    security_contact: Optional[AWSContactV1] = Field(..., alias="securityContact")

reconcile/gql_definitions/glitchtip/glitchtip_project.py

@@ -143,7 +143,7 @@ class GlitchtipInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
 
-class GlitchtipProjectsV1_GlitchtipOrganizationV1(ConfiguredBaseModel):
+class GlitchtipProjectV1_GlitchtipOrganizationV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     instance: GlitchtipInstanceV1 = Field(..., alias="instance")
     owners: Optional[list[str]] = Field(..., alias="owners")
@@ -180,19 +180,19 @@ class AppV1(ConfiguredBaseModel):
     path: str = Field(..., alias="path")
 
 
-class GlitchtipProjectsV1(ConfiguredBaseModel):
+class GlitchtipProjectV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     platform: str = Field(..., alias="platform")
     project_id: Optional[str] = Field(..., alias="projectId")
     event_throttle_rate: Optional[int] = Field(..., alias="eventThrottleRate")
     teams: list[GlitchtipTeamV1] = Field(..., alias="teams")
-    organization: GlitchtipProjectsV1_GlitchtipOrganizationV1 = Field(..., alias="organization")
+    organization: GlitchtipProjectV1_GlitchtipOrganizationV1 = Field(..., alias="organization")
     namespaces: list[NamespaceV1] = Field(..., alias="namespaces")
     app: Optional[AppV1] = Field(..., alias="app")
 
 
 class ProjectsQueryData(ConfiguredBaseModel):
-    glitchtip_projects: Optional[list[GlitchtipProjectsV1]] = Field(..., alias="glitchtip_projects")
+    glitchtip_projects: Optional[list[GlitchtipProjectV1]] = Field(..., alias="glitchtip_projects")
 
 
 def query(query_func: Callable, **kwargs: Any) -> ProjectsQueryData:

reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py

@@ -58,10 +58,18 @@ query GlitchtipProjectsWithAlerts {
     }
     jira {
       project
-      board {
-        name
-        disable {
-          integrations
+      components
+      escalationPolicy {
+        channels {
+          jiraBoard {
+            name
+            issueType
+            disable {
+              integrations
+            }
+          }
+          jiraComponent
+          jiraLabels
         }
       }
       labels
@@ -113,16 +121,28 @@ class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
 
 class JiraBoardV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    issue_type: Optional[str] = Field(..., alias="issueType")
     disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
 
 
+class AppEscalationPolicyChannelsV1(ConfiguredBaseModel):
+    jira_board: list[JiraBoardV1] = Field(..., alias="jiraBoard")
+    jira_component: Optional[str] = Field(..., alias="jiraComponent")
+    jira_labels: Optional[list[str]] = Field(..., alias="jiraLabels")
+
+
+class AppEscalationPolicyV1(ConfiguredBaseModel):
+    channels: AppEscalationPolicyChannelsV1 = Field(..., alias="channels")
+
+
 class GlitchtipProjectJiraV1(ConfiguredBaseModel):
     project: Optional[str] = Field(..., alias="project")
-    board: Optional[JiraBoardV1] = Field(..., alias="board")
+    components: Optional[list[str]] = Field(..., alias="components")
+    escalation_policy: Optional[AppEscalationPolicyV1] = Field(..., alias="escalationPolicy")
     labels: Optional[list[str]] = Field(..., alias="labels")
 
 
-class GlitchtipProjectsV1(ConfiguredBaseModel):
+class GlitchtipProjectV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     project_id: Optional[str] = Field(..., alias="projectId")
     organization: GlitchtipOrganizationV1 = Field(..., alias="organization")
@@ -131,7 +151,7 @@ class GlitchtipProjectsV1(ConfiguredBaseModel):
 
 
 class GlitchtipProjectsWithAlertsQueryData(ConfiguredBaseModel):
-    glitchtip_projects: Optional[list[GlitchtipProjectsV1]] = Field(..., alias="glitchtip_projects")
+    glitchtip_projects: Optional[list[GlitchtipProjectV1]] = Field(..., alias="glitchtip_projects")
 
 
 def query(query_func: Callable, **kwargs: Any) -> GlitchtipProjectsWithAlertsQueryData:

reconcile/integrations_manager.py

@@ -6,10 +6,7 @@ from collections.abc import (
     Mapping,
     Sequence,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from github import Github
 from pydantic import BaseModel
@@ -76,7 +73,7 @@ def collect_parameters(
     environment: EnvironmentV1,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ) -> dict[str, Any]:
     parameters: dict[str, Any] = {}
     if environment.parameters:
@@ -180,7 +177,7 @@ def construct_oc_resources(
     integrations_environment: IntegrationsEnvironment,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ) -> list[OpenshiftResource]:
     # Generate the openshift template with the helm chart. The resulting template
     # contains all the integrations in the environment
@@ -213,7 +210,7 @@ def fetch_desired_state(
     ri: ResourceInventory,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ):
     for ie in integrations_environments:
         oc_resources = construct_oc_resources(ie, upstream, image, image_tag_from_ref)
@@ -224,7 +221,7 @@ def fetch_desired_state(
 
 
 def filter_integrations(
-    integrations: Iterable[IntegrationV1], upstream: Optional[str] = None
+    integrations: Iterable[IntegrationV1], upstream: str | None = None
 ) -> list[IntegrationV1]:
     if upstream is None:
         return list(integrations)

reconcile/jenkins/types.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Optional
 
 from pydantic import (
     BaseModel,
@@ -22,11 +21,11 @@ class SSHHostKeyVerificationStrategy(Enum):
 
 class SSHConnector(BaseModel):
     credentials_id: str = Field(..., alias="credentialsId")
-    launch_timeout_seconds: Optional[int] = Field(None, alias="launchTimeoutSeconds")
-    max_num_retries: Optional[int] = Field(None, alias="maxNumRetries")
-    retry_wait_time: Optional[int] = Field(None, alias="retryWaitTime")
-    port: Optional[int] = 22
-    jvm_options: Optional[str] = Field(None, alias="jvmOptions")
+    launch_timeout_seconds: int | None = Field(None, alias="launchTimeoutSeconds")
+    max_num_retries: int | None = Field(None, alias="maxNumRetries")
+    retry_wait_time: int | None = Field(None, alias="retryWaitTime")
+    port: int | None = 22
+    jvm_options: str | None = Field(None, alias="jvmOptions")
     ssh_host_key_verification_strategy: SSHHostKeyVerificationStrategy = Field(
         SSHHostKeyVerificationStrategy.NON_VERIFYING_KEY_VERIFICATION_STRATEGY,
         alias="sshHostKeyVerificationStrategy",

reconcile/jenkins_job_builder.py

@@ -1,10 +1,7 @@
 import logging
 import sys
 from collections.abc import Callable
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils.defer import defer
@@ -20,7 +17,7 @@ GENERATE_TYPE = ["jobs", "views"]
 
 
 def collect_configs(
-    instance_name: Optional[str], config_name: Optional[str]
+    instance_name: str | None, config_name: str | None
 ) -> list[dict[str, Any]]:
     configs = queries.get_jenkins_configs()
     if instance_name is not None:
@@ -41,8 +38,8 @@ def collect_configs(
 
 def init_jjb(
     secret_reader: SecretReaderBase,
-    instance_name: Optional[str] = None,
-    config_name: Optional[str] = None,
+    instance_name: str | None = None,
+    config_name: str | None = None,
     print_only: bool = False,
 ) -> JJB:
     configs = collect_configs(instance_name, config_name)
@@ -66,7 +63,7 @@ def validate_repos_and_admins(jjb: JJB):
     )
     unknown_admins = [a for a in jjb_admins if a not in github_usernames]
     for a in unknown_admins:
-        logging.warning("admin is missing from users: {}".format(a))
+        logging.warning(f"admin is missing from users: {a}")
     if missing_repos:
         sys.exit(1)
 
@@ -76,10 +73,10 @@ def run(
     dry_run: bool,
     io_dir: str = "throughput/",
     print_only: bool = False,
-    config_name: Optional[str] = None,
-    job_name: Optional[str] = None,
-    instance_name: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    config_name: str | None = None,
+    job_name: str | None = None,
+    instance_name: str | None = None,
+    defer: Callable | None = None,
 ) -> None:
     if not print_only and config_name is not None:
         raise Exception("--config-name must works with --print-only mode")

reconcile/jenkins_roles.py

@@ -170,7 +170,7 @@ def act(diff, jenkins_map):
     elif action == "unassign_role_from_user":
         jenkins_map[instance].unassign_role_from_user(role, user)
     else:
-        raise Exception("invalid action: {}".format(action))
+        raise Exception(f"invalid action: {action}")
 
 
 def run(dry_run):