qontract-reconcile 0.10.2.dev317__py3-none-any.whl → 0.10.2.dev318__py3-none-any.whl

{qontract_reconcile-0.10.2.dev317.dist-info → qontract_reconcile-0.10.2.dev318.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev317
+Version: 0.10.2.dev318
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev317.dist-info → qontract_reconcile-0.10.2.dev318.dist-info}/RECORD

@@ -35,12 +35,12 @@ reconcile/gitlab_permissions.py,sha256=LkufO5HDeti8N6QSZoGfoJG51_v8aVZYd-5MkK9Du
 reconcile/gitlab_projects.py,sha256=JIB1UP8CnwSkngEMZE7DFQETMX6sJMp4DXaKoS-Pdkc,1879
 reconcile/integrations_manager.py,sha256=g6QJOu_hJp_6tUpjpqc9HC_8FNWjvtoYat20TX-bJhg,9398
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
-reconcile/jenkins_job_builder.py,sha256=SAcoJUSs2BgxEzfuRfJ4Poik2OSg_B8LaT5VQISocPs,3474
+reconcile/jenkins_job_builder.py,sha256=eRR3AL3RN7U_8A4hceUlj_k_jWf-qHMyLr9gqxcj3kQ,3469
 reconcile/jenkins_job_builds_cleaner.py,sha256=l9eLyvdgv1sN2tAlkGx3T8g6Db9kIfWW3LJh5H6dV9A,4080
 reconcile/jenkins_roles.py,sha256=zdGavYJJNmbOdu_pr-NrNPl_Tj3j8oin14qvydKxXZw,4916
 reconcile/jenkins_webhooks.py,sha256=8BDPsCJdvuYDl0D3qJc0l6pUtceBh9WiNGpfy-LE4S8,2351
 reconcile/jenkins_webhooks_cleaner.py,sha256=tFbAzsFGvJ6UrHRZFdIuLdqG-Ocd5_OknfsbtN-eyFY,1619
-reconcile/jenkins_worker_fleets.py,sha256=tLFEF3ijnqF0jA7hgmFOOrshmfjGYXHFlQcvMZVvI7U,5386
+reconcile/jenkins_worker_fleets.py,sha256=CqYekCjYv75NvtcegOjxMC-LvKpMYPChxI_9NQVu_VY,8236
 reconcile/jira_permissions_validator.py,sha256=nVHZg7kNn04Q-ryNM20wthMrhXos28g3O9b0ahzxAKc,14690
 reconcile/ldap_users.py,sha256=oP1CAxmgSi3zDJ3vKTPySjap6WmEX1U469FmFrov5l4,4599
 reconcile/mr_client_gateway.py,sha256=3L21YncbetuUI3HYvDAEb5JX5HO5KG2CfUyjapX3w8E,2063
@@ -438,8 +438,6 @@ reconcile/gql_definitions/vault_policies/vault_policies.py,sha256=hfKhUXTqz22aBi
 reconcile/gql_definitions/vpc_peerings_validator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/vpc_peerings_validator/vpc_peerings_validator.py,sha256=8eN4p6csq79qwIsnMzbnWRqvxRHv6AqOZJY6lsx6fFE,4451
 reconcile/gql_definitions/vpc_peerings_validator/vpc_peerings_validator_peered_cluster_fragment.py,sha256=Hez1Oi2t2ow-G8vCQiZpi0WmSEwDFKf8RC-9uC9JcUM,1067
-reconcile/jenkins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/jenkins/types.py,sha256=8YJVwnwilTbBKcB46mlMztudDwd0x7rzNOI4D_lV4Fc,2958
 reconcile/ldap_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ldap_groups/integration.py,sha256=hx-JX9TgUJMIZoQRWO3nmQLjAPnJaQ-tNud4ky8JQdA,10622
 reconcile/ocm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -453,7 +451,7 @@ reconcile/oum/base.py,sha256=WCFdHOHXLPrJcvxVqw6HjaJthT7olC5BQqqXlD4DM6c,13552
 reconcile/oum/labelset.py,sha256=f5kDndbaIT4iNYxTRPSELTUgj_aMlzEJDPzooAkG2mE,2154
 reconcile/oum/metrics.py,sha256=S_0C-hIW4jHVl9Lltgis9q-p33fdBjADWBouQ9Emeao,1575
 reconcile/oum/models.py,sha256=teH0bJTCMTzbdbYD9CU4yXDuMr34ceLcM0KuoIPU8gI,1712
-reconcile/oum/providers.py,sha256=lfG6d7YV-A4Lte45EMv1Gx4A346piJ_jAkrU5AHJZ_g,1834
+reconcile/oum/providers.py,sha256=M2kfN5gxOgIGJN2Hpprc-oQkMNhCcPPqy9ABETwLABk,1839
 reconcile/oum/standalone.py,sha256=EN5y1S-3DwUZYzSRqRMtf63mI2slvBHKiU9zOTjYvWM,7334
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/prometheus_rules_tester/integration.py,sha256=qa1OrD1gCR1PUrHNFc2AL3J01SdBYfMOX8fHcOUh1T8,9618
@@ -608,21 +606,21 @@ reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,
 reconcile/utils/git.py,sha256=o4p9m8jlzCJDcutl2HErvGLhL6sZ1NB4Aw3zGcQIzso,2427
 reconcile/utils/github_api.py,sha256=S1vO-hvYPzm5BIychVIHSYibMns0HBmLgS78MkPfunE,3402
 reconcile/utils/gitlab_api.py,sha256=okuBtZA3dRvIDuZOL-zAmiQqugebdA_H_AOV7luPnDk,28343
-reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
+reconcile/utils/gpg.py,sha256=VCNERVnIFZtIu62VbBtM_MtokTPVQ0bsCWs2evGKLeo,1254
 reconcile/utils/gql.py,sha256=_GtzCoYIvDSS7PHXIImShs_g3k85MLlGNTJqqwhYFLQ,14703
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
 reconcile/utils/helm.py,sha256=wC1h0GylhDFeZ6hZEtYy2giAGIIQroaQhkAtURoSlI8,3893
 reconcile/utils/helpers.py,sha256=koyAtYnxsUVx-HIn6GpedcUE-ekz_VtoYDkiZ0iv8ik,1795
-reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
+reconcile/utils/imap_client.py,sha256=sJSBBCObR34JTk70raIkJYXZbmEOOyc8IDQ1CrcSO1Q,2019
 reconcile/utils/instrumented_wrappers.py,sha256=VqT4s0Bdicv224-uSeSaugtHXm-xJ3oSeBiqj0QQRiU,1942
 reconcile/utils/jenkins_api.py,sha256=jNwdtBtO8DgMW_H8XfqkQs2r4JsLovHe03t5_F3M1xg,7961
 reconcile/utils/jira_client.py,sha256=qC1mE47_WCp3pgbMn9YqBH6LJFeQKn93biH4oG0P1bc,10574
-reconcile/utils/jjb_client.py,sha256=p3I5Aup5NtvCrc2XS2V2GVtTqnsrPXbjQvmcHuacTHY,15196
+reconcile/utils/jjb_client.py,sha256=ZwoQvrufRxyMGXo2rg2-_b5U0rJASLG398MDBQI3K20,16416
 reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
 reconcile/utils/jump_host.py,sha256=gi8vGUDgdTVwJvROvRVauFxtL0YAramhbWvG70L7AY8,5137
 reconcile/utils/keycloak.py,sha256=YWSEUGrOVqFaJUk055dKUWpLDPdDRvhcmvR-lfbmxdE,3388
-reconcile/utils/ldap_client.py,sha256=HxOxpqyLRbXxOARZyBNbccceWIk6gF8PQjNQmBvjF2o,2148
-reconcile/utils/lean_terraform_client.py,sha256=X9358loxzkhwRExTeDv_NC8Q6HNr2tJK6Lx897YtJUc,4004
+reconcile/utils/ldap_client.py,sha256=EIq2A19LzEQNcNCUeJQxp161tkWV1qpj9ufU15uBefE,2216
+reconcile/utils/lean_terraform_client.py,sha256=cVxx0jR3-Jiuirub_gJDf-G0FC8lNoFHdI5H6xc5TyA,4047
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=kiOoWO0b0mO-MDZWxyClYz9SeohQ0QU-xji0p-cSiLo,18462
 reconcile/utils/models.py,sha256=N-cOLsLbZAzVazFImue4d1pllCGd_vVcIrFKykYZXZo,4682
@@ -775,7 +773,7 @@ tools/template_validation.py,sha256=Xn9X4sGFznx-rvBDnq9Kq16rfET8V3bqH1EwavsGBac,
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=8mAjCS6XR0yD7k0mfiVBlt6xbYU47q_ftdYNi5o5VKE,5566
 tools/cli_commands/erv2.py,sha256=H5RKytXP2BRYxixd-6Z3qfRJRfs2cOhtmXTgEOsn9_s,26079
-tools/cli_commands/gpg_encrypt.py,sha256=RHRSI_Oc_Y3nBE-_lcmJbo8UEL9IWz4xzv1PFLWWVPQ,4927
+tools/cli_commands/gpg_encrypt.py,sha256=C6y0KnZxnycYOxgpDvCfAUZYGhDZjIYfZ7tnlyg3a7M,4920
 tools/cli_commands/systems_and_tools.py,sha256=n6IFdPPLpueGP8Eh3dqv2errk0ZqHWUDcan_Nrhnt9I,16747
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/aws.py,sha256=JtwDfhaYLfa4Uz1LR6OfSBh_3nBlb90kQq6i3MV_ims,4563
@@ -796,7 +794,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev317.dist-info/METADATA,sha256=Sq5cR104VjHigyaBW68DsOjQJ9CEBQ80THxUjbrE7G8,24916
-qontract_reconcile-0.10.2.dev317.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev317.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev317.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev318.dist-info/METADATA,sha256=YtxUnWzyEhN3lydGG0PUts7xTOW4MbgAbsDAyCWT0qc,24916
+qontract_reconcile-0.10.2.dev318.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev318.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev318.dist-info/RECORD,,

reconcile/jenkins_job_builder.py

@@ -81,7 +81,7 @@ def run(
     if not print_only and config_name is not None:
         raise Exception("--config-name must works with --print-only mode")
     secret_reader = SecretReader(queries.get_secret_reader_settings())
-    jjb: JJB = init_jjb(secret_reader, instance_name, config_name, print_only)
+    jjb = init_jjb(secret_reader, instance_name, config_name, print_only)
     if defer:
         defer(jjb.cleanup)
 

reconcile/jenkins_worker_fleets.py

@@ -1,14 +1,12 @@
+from __future__ import annotations
+
 import logging
-from typing import (
-    Any,
-    cast,
-)
+from enum import Enum
+from typing import Any, cast
+
+from pydantic import BaseModel, Field
 
 from reconcile import queries
-from reconcile.jenkins.types import (
-    JenkinsWorkerFleet,
-    SSHConnector,
-)
 from reconcile.utils.external_resources import get_external_resource_specs
 from reconcile.utils.jenkins_api import JenkinsApi
 from reconcile.utils.secret_reader import SecretReader
@@ -17,6 +15,75 @@ from reconcile.utils.terrascript_aws_client import TerrascriptClient as Terrascr
 QONTRACT_INTEGRATION = "jenkins-worker-fleets"
 
 
+class SSHHostKeyVerificationStrategy(Enum):
+    MANUALLY_TRUSTED_KEY_VERIFICATION_STRATEGY = (
+        "manuallyTrustedKeyVerificationStrategy"
+    )
+    MANUALLY_PROVIDED_KEY_VERIFICATION_STRATEGY = (
+        "manuallyProvidedKeyVerificationStrategy"
+    )
+    NON_VERIFYING_KEY_VERIFICATION_STRATEGY = "nonVerifyingKeyVerificationStrategy"
+    KNOWN_HOSTS_FILE_KEY_VERIFICATION_STRATEGY = "knownHostsFileKeyVerificationStrategy"
+
+
+class SSHConnector(BaseModel):
+    credentials_id: str = Field(..., alias="credentialsId")
+    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",
+    )
+
+    class Config:
+        use_enum_values = True
+
+
+class ComputerConnector(BaseModel):
+    # alias name is defined by jcasc schema
+    ssh_connector: SSHConnector = Field(..., alias="sSHConnector")
+
+
+class JenkinsWorkerFleet(BaseModel):
+    # following options comes form https://github.com/jenkinsci/ec2-fleet-plugin/blob/master/docs/
+    name: str
+    fleet: str
+    region: str
+    min_size: int = Field(..., alias="minSize")
+    max_size: int = Field(..., alias="maxSize")
+    computer_connector: ComputerConnector = Field(..., alias="computerConnector")
+    fs_root: str = Field(..., alias="fsRoot")
+    label_string: str = Field(..., alias="labelString")
+    num_executors: int = Field(2, alias="numExecutors")
+    idle_minutes: int = Field(30, alias="idleMinutes")
+    min_spare_size: int = Field(0, alias="minSpareSize")
+    max_total_uses: int = Field(-1, alias="maxTotalUses")
+    no_delay_provision: bool = Field(False, alias="noDelayProvision")
+    add_node_only_if_running: bool = Field(True, alias="addNodeOnlyIfRunning")
+    always_reconnect: bool = Field(True, alias="alwaysReconnect")
+    private_ip_used: bool = Field(True, alias="privateIpUsed")
+    restrict_usage: bool = Field(True, alias="restrictUsage")
+
+    def __lt__(self, other: JenkinsWorkerFleet) -> bool:
+        return self.fleet < other.fleet
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, JenkinsWorkerFleet):
+            raise NotImplementedError(
+                "Cannot compare to non JenkinsWorkerFleet objects."
+            )
+        return self.fleet == other.fleet and self.region == other.region
+
+    def __hash__(self) -> int:
+        return hash(self.fleet + self.region)
+
+    def differ(self, other: JenkinsWorkerFleet) -> bool:
+        return self.dict() != other.dict()
+
+
 def get_current_state(jenkins: JenkinsApi) -> list[JenkinsWorkerFleet]:
     current_state = []
 

reconcile/oum/providers.py

@@ -33,7 +33,7 @@ class LdapGroupMemberProvider(GroupMemberProvider):
         if len(group_ids) == 0:
             return {}
         with self.ldap_client as lc:
-            groups_members_by_dn = lc.get_group_members(group_dn_mapping.keys())
+            groups_members_by_dn = lc.get_group_members(set(group_dn_mapping.keys()))
         return {
             group_dn_mapping[dn]: members
             for dn, members in groups_members_by_dn.items()

reconcile/utils/gpg.py

@@ -8,7 +8,7 @@ from subprocess import (
 )
 
 
-def gpg_encrypt(content, public_gpg_key):
+def gpg_encrypt(content: str, public_gpg_key: str) -> str:
     public_gpg_key_dec = base64.b64decode(public_gpg_key)
 
     with tempfile.TemporaryDirectory() as gnupg_home_dir:
@@ -22,6 +22,8 @@ def gpg_encrypt(content, public_gpg_key):
         )
         out = proc.stdout.decode("utf-8")
         match = re.search(r"<\S+>", out)
+        if not match:
+            raise ValueError("No recipient found in GPG import output")
         recipient = match.group(0)[1:-1]
         # encrypt content
         proc = run(
@@ -41,5 +43,5 @@ def gpg_encrypt(content, public_gpg_key):
             stderr=STDOUT,
             check=True,
         )
-        out = proc.stdout
-    return out.decode("utf-8")
+        encrypted_out = proc.stdout
+    return encrypted_out.decode("utf-8")

reconcile/utils/imap_client.py

@@ -21,7 +21,7 @@ class ImapClient:
         self._server.login(self.user, self.password)
         return self
 
-    def __exit__(self, *args, **kwargs) -> None:
+    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
         if self._server:
             self._server.logout()
 

reconcile/utils/jjb_client.py

@@ -8,6 +8,7 @@ import shutil
 import subprocess
 import tempfile
 import xml.etree.ElementTree as ET
+from collections.abc import Iterable, Mapping
 from os import path
 from subprocess import (
     PIPE,
@@ -25,6 +26,8 @@ from sretoolbox.utils import retry
 
 from reconcile.utils import throughput
 from reconcile.utils.helpers import toggle_logger
+from reconcile.utils.secret_reader import SecretReaderBase
+from reconcile.utils.state import State
 from reconcile.utils.vcs import GITHUB_BASE_URL
 
 JJB_INI = "[jenkins]\nurl = https://JENKINS_URL"
@@ -33,14 +36,22 @@ JJB_INI = "[jenkins]\nurl = https://JENKINS_URL"
 class JJB:
     """Wrapper around Jenkins Jobs"""
 
-    def __init__(self, configs, ssl_verify=True, secret_reader=None, print_only=False):
+    def __init__(
+        self,
+        configs: list[dict[str, Any]],
+        ssl_verify: bool = True,
+        secret_reader: SecretReaderBase | None = None,
+        print_only: bool = False,
+    ) -> None:
         self.print_only = print_only
         self.secret_reader = secret_reader
+        if not self.print_only and self.secret_reader is None:
+            raise ValueError("secret_reader must be provided if print_only is False")
         self.collect_configs(configs)
         self.modify_logger()
         self.python_https_verify = str(int(ssl_verify))
 
-    def collect_configs(self, configs):
+    def collect_configs(self, configs: list[dict[str, Any]]) -> None:
         instances = {
             c["instance"]["name"]: {
                 "serverUrl": c["instance"]["serverUrl"],
@@ -57,7 +68,7 @@ class JJB:
             server_url = data["serverUrl"]
             wd = tempfile.mkdtemp()
             ini = JJB_INI
-            if not self.print_only:
+            if not self.print_only and self.secret_reader:
                 ini = self.secret_reader.read(token)
                 ini = ini.replace('"', "")
                 ini = ini.replace("false", "False")
@@ -92,7 +103,7 @@ class JJB:
         self.instance_urls = instance_urls
         self.working_dirs = working_dirs
 
-    def overwrite_configs(self, configs):
+    def overwrite_configs(self, configs: Mapping[str, str] | State) -> None:
         """This function will override the existing
         config files in the working directories with
         the supplied configs"""
@@ -101,12 +112,12 @@ class JJB:
             with open(config_path, "w", encoding="locale") as f:
                 f.write(configs[name])
 
-    def sort(self, configs):
+    def sort(self, configs: list[dict[str, Any]]) -> None:
         configs.sort(key=self.sort_by_name)
-        configs.sort(key=self.sort_by_type)
+        configs.sort(key=lambda x: self.sort_by_type(x) or 0)
 
     @staticmethod
-    def sort_by_type(config):
+    def sort_by_type(config: Mapping[str, Any]) -> int:
         if config["type"] == "defaults":
             return 0
         if config["type"] == "global-defaults":
@@ -123,12 +134,13 @@ class JJB:
             return 40
         if config["type"] == "jobs":
             return 50
+        return 100
 
     @staticmethod
-    def sort_by_name(config):
+    def sort_by_name(config: Mapping[str, Any]) -> str:
         return config["name"]
 
-    def get_configs(self):
+    def get_configs(self) -> dict[str, str]:
         """This function gets the configs from the
         working directories"""
         configs = {}
@@ -139,7 +151,7 @@ class JJB:
 
         return configs
 
-    def generate(self, io_dir, fetch_state):
+    def generate(self, io_dir: str, fetch_state: str) -> None:
         """
         Generates job definitions from JJB configs
 
@@ -163,7 +175,7 @@ class JJB:
             self.execute(args)
             throughput.change_files_ownership(io_dir)
 
-    def print_diffs(self, io_dir, instance_name=None):
+    def print_diffs(self, io_dir: str, instance_name: str | None = None) -> None:
         """Print the diffs between the current and
         the desired job definitions"""
         current_path = path.join(io_dir, "jjb", "current")
@@ -179,7 +191,7 @@ class JJB:
         self.print_diff(delete, current_path, "delete")
         self.print_diff(common, desired_path, "update")
 
-    def print_diff(self, files, replace_path, action):
+    def print_diff(self, files: Iterable[str], replace_path: str, action: str) -> None:
         for f in files:
             if action == "update":
                 ft = self.toggle_cd(f)
@@ -210,11 +222,16 @@ class JJB:
                     ]
                     logging.debug("DIFF:\n" + "".join(diff))
 
-    def compare_files(self, from_files, subtract_files, in_op=False):
+    def compare_files(
+        self,
+        from_files: Iterable[str],
+        subtract_files: Iterable[str],
+        in_op: bool = False,
+    ) -> list[str]:
         return [f for f in from_files if (self.toggle_cd(f) in subtract_files) is in_op]
 
     @staticmethod
-    def get_files(search_path, instance_name=None):
+    def get_files(search_path: str, instance_name: str | None = None) -> list[str]:
         if instance_name is not None:
             search_path = path.join(search_path, instance_name)
         return [
@@ -222,7 +239,7 @@ class JJB:
         ]
 
     @staticmethod
-    def toggle_cd(file_name):
+    def toggle_cd(file_name: str) -> str:
         if "desired" in file_name:
             return file_name.replace("desired", "current")
         return file_name.replace("current", "desired")
@@ -248,28 +265,28 @@ class JJB:
                 raise
 
     @staticmethod
-    def get_jjb(args):
+    def get_jjb(args: Iterable[str]) -> Any:
         from jenkins_jobs.cli.entry import JenkinsJobs  # noqa: PLC0415
 
         return JenkinsJobs(args)
 
-    def execute(self, args):
+    def execute(self, args: Iterable[str]) -> None:
         jjb = self.get_jjb(args)
         with toggle_logger():
             jjb.execute()
 
-    def modify_logger(self):
+    def modify_logger(self) -> None:
         yaml.warnings({"YAMLLoadWarning": False})
         formatter = logging.Formatter("%(levelname)s: %(message)s")
         logger = logging.getLogger()
         logger.handlers[0].setFormatter(formatter)
 
-    def cleanup(self):
+    def cleanup(self) -> None:
         for wd in self.working_dirs.values():
             shutil.rmtree(wd)
 
     @retry(exceptions=(JenkinsJobsException))
-    def get_jobs(self, wd, name):
+    def get_jobs(self, wd: str, name: str) -> list[dict[str, Any]]:
         ini_path = f"{wd}/{name}.ini"
         config_path = f"{wd}/config.yaml"
 
@@ -283,8 +300,8 @@ class JJB:
 
         return jobs
 
-    def get_job_webhooks_data(self):
-        job_webhooks_data = {}
+    def get_job_webhooks_data(self) -> dict[str, list[dict[str, Any]]]:
+        job_webhooks_data: dict[str, list[dict[str, Any]]] = {}
         for name, wd in self.working_dirs.items():
             jobs = self.get_jobs(wd, name)
 
@@ -313,7 +330,7 @@ class JJB:
 
         return job_webhooks_data
 
-    def get_repos(self):
+    def get_repos(self) -> set[str]:
         repos = set()
         for name, wd in self.working_dirs.items():
             jobs = self.get_jobs(wd, name)
@@ -325,7 +342,7 @@ class JJB:
                     logging.debug(f"missing github url: {job_name}")
         return repos
 
-    def get_admins(self):
+    def get_admins(self) -> set[str]:
         admins = set()
         for name, wd in self.working_dirs.items():
             jobs = self.get_jobs(wd, name)
@@ -340,15 +357,17 @@ class JJB:
         return admins
 
     @staticmethod
-    def get_repo_url(job):
+    def get_repo_url(job: Mapping[str, Any]) -> str:
         repo_url_raw = job["properties"][0]["github"]["url"]
         return repo_url_raw.strip("/").replace(".git", "")
 
     @staticmethod
-    def get_ref(job: dict) -> str:
+    def get_ref(job: Mapping[str, Any]) -> str:
         return job["scm"][0]["git"]["branches"][0]
 
-    def get_all_jobs(self, job_types=None, instance_name=None) -> dict[str, list[dict]]:
+    def get_all_jobs(
+        self, job_types: Iterable[str] | None = None, instance_name: str | None = None
+    ) -> dict[str, list[dict[str, Any]]]:
         if job_types is None:
             job_types = []
         all_jobs: dict[str, list[dict]] = {}
@@ -366,8 +385,8 @@ class JJB:
 
         return all_jobs
 
-    def print_jobs(self, job_name=None):
-        all_jobs = {}
+    def print_jobs(self, job_name: str | None = None) -> None:
+        all_jobs: dict[str, list[dict[str, Any]]] = {}
         found = False
         for name, wd in self.working_dirs.items():
             logging.debug(f"getting jobs from {name}")
@@ -394,7 +413,7 @@ class JJB:
         raise ValueError(f"job with {job_type=} and {repo_url=} not found")
 
     @staticmethod
-    def get_trigger_phrases_regex(job: dict) -> str | None:
+    def get_trigger_phrases_regex(job: Mapping[str, Any]) -> str | None:
         for trigger in job["triggers"]:
             if "gitlab" in trigger:
                 return trigger["gitlab"].get("note-regex")
@@ -403,7 +422,7 @@ class JJB:
         return None
 
     @staticmethod
-    def get_gitlab_webhook_trigger(job: dict) -> list[str]:
+    def get_gitlab_webhook_trigger(job: Mapping[str, Any]) -> list[str]:
         gitlab_triggers = job["triggers"][0]["gitlab"]
         # pr-check job should be triggered by merge request events
         # and certain comments: [test]|/retest|/lgtm|/lgtm cancel|/hold|/hold cancel

reconcile/utils/ldap_client.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
 from collections.abc import Iterable
+from typing import Any, Self
 
 from ldap3 import (
     ALL,
@@ -17,15 +18,15 @@ class LdapClient:
     appropriately.
     """
 
-    def __init__(self, base_dn: str, connection: Connection):
+    def __init__(self, base_dn: str, connection: Connection) -> None:
         self.base_dn = base_dn
         self.connection = connection
 
-    def __enter__(self):
+    def __enter__(self) -> Self:
         self.connection.bind()
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
         self.connection.unbind()
 
     def get_users(self, uids: Iterable[str]) -> set[str]:

reconcile/utils/lean_terraform_client.py

@@ -6,7 +6,9 @@ from collections.abc import Mapping
 from typing import Any
 
 
-def state_rm_access_key(working_dirs, account, user):
+def state_rm_access_key(
+    working_dirs: Mapping[str, str], account: str, user: str
+) -> bool:
     wd = working_dirs[account]
     init_result = subprocess.run(["terraform", "init"], check=False, cwd=wd)
     if init_result.returncode != 0:

tools/cli_commands/gpg_encrypt.py

@@ -114,7 +114,7 @@ class GPGEncryptCommand:
             f"No argument given which defines how to fetch the secret {self._command_data}"
         )
 
-    def _get_gpg_key(self) -> str | None:
+    def _get_gpg_key(self) -> str:
         target_user = self._command_data.target_user
         users = queries.get_users_by(
             refs=False,

reconcile/jenkins/types.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-from enum import Enum
-
-from pydantic import (
-    BaseModel,
-    Field,
-)
-
-
-class SSHHostKeyVerificationStrategy(Enum):
-    MANUALLY_TRUSTED_KEY_VERIFICATION_STRATEGY = (
-        "manuallyTrustedKeyVerificationStrategy"
-    )
-    MANUALLY_PROVIDED_KEY_VERIFICATION_STRATEGY = (
-        "manuallyProvidedKeyVerificationStrategy"
-    )
-    NON_VERIFYING_KEY_VERIFICATION_STRATEGY = "nonVerifyingKeyVerificationStrategy"
-    KNOWN_HOSTS_FILE_KEY_VERIFICATION_STRATEGY = "knownHostsFileKeyVerificationStrategy"
-
-
-class SSHConnector(BaseModel):
-    credentials_id: str = Field(..., alias="credentialsId")
-    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",
-    )
-
-    class Config:
-        use_enum_values = True
-
-
-class ComputerConnector(BaseModel):
-    # alias name is defined by jcasc schema
-    ssh_connector: SSHConnector = Field(..., alias="sSHConnector")
-
-
-class JenkinsWorkerFleet(BaseModel):
-    # following options comes form https://github.com/jenkinsci/ec2-fleet-plugin/blob/master/docs/
-    name: str
-    fleet: str
-    region: str
-    min_size: int = Field(..., alias="minSize")
-    max_size: int = Field(..., alias="maxSize")
-    computer_connector: ComputerConnector = Field(..., alias="computerConnector")
-    fs_root: str = Field(..., alias="fsRoot")
-    label_string: str = Field(..., alias="labelString")
-    num_executors: int = Field(2, alias="numExecutors")
-    idle_minutes: int = Field(30, alias="idleMinutes")
-    min_spare_size: int = Field(0, alias="minSpareSize")
-    max_total_uses: int = Field(-1, alias="maxTotalUses")
-    no_delay_provision: bool = Field(False, alias="noDelayProvision")
-    add_node_only_if_running: bool = Field(True, alias="addNodeOnlyIfRunning")
-    always_reconnect: bool = Field(True, alias="alwaysReconnect")
-    private_ip_used: bool = Field(True, alias="privateIpUsed")
-    restrict_usage: bool = Field(True, alias="restrictUsage")
-
-    def __lt__(self, other: JenkinsWorkerFleet) -> bool:
-        return self.fleet < other.fleet
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, JenkinsWorkerFleet):
-            raise NotImplementedError(
-                "Cannot compare to non JenkinsWorkerFleet objects."
-            )
-        return self.fleet == other.fleet and self.region == other.region
-
-    def __hash__(self) -> int:
-        return hash(self.fleet + self.region)
-
-    def differ(self, other: JenkinsWorkerFleet) -> bool:
-        return self.dict() != other.dict()