qontract-reconcile 0.10.2.dev315__tar.gz → 0.10.2.dev316__tar.gz

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev315
+Version: 0.10.2.dev316
 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.dev315 → qontract_reconcile-0.10.2.dev316}/pyproject.toml

@@ -267,13 +267,6 @@ module = [
     "reconcile.utils.jjb_client",
     "reconcile.utils.ldap_client",
     "reconcile.utils.lean_terraform_client",
-    "reconcile.utils.mr.app_interface_reporter",
-    "reconcile.utils.mr.aws_access",
-    "reconcile.utils.mr.base",
-    "reconcile.utils.mr.clusters_updates",
-    "reconcile.utils.mr.ocm_upgrade_scheduler_org_updates",
-    "reconcile.utils.mr.user_maintenance",
-    "reconcile.utils.mr",
     "reconcile.utils.oc",
     "reconcile.utils.ocm_base_client",
     "reconcile.utils.ocm.ocm",
@@ -339,8 +332,6 @@ module = [
     "reconcile.test.utils.test_jjb_client",
     "reconcile.test.utils.test_jsonpath",
     "reconcile.test.utils.test_models",
-    "reconcile.test.utils.test_mr_clusters_updates",
-    "reconcile.test.utils.test_mr",
     "reconcile.test.utils.test_oc",
     "reconcile.test.utils.test_ocm",
     "reconcile.test.utils.test_parse_dhms_duration",

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/__init__.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from reconcile.utils.mr.app_interface_reporter import CreateAppInterfaceReporter
 from reconcile.utils.mr.aws_access import CreateDeleteAwsAccessKey
 from reconcile.utils.mr.base import (
@@ -44,7 +46,7 @@ class UnknownMergeRequestTypeError(Exception):
     """
 
 
-def init_from_sqs_message(message) -> MergeRequestBase:
+def init_from_sqs_message(message: dict[str, Any]) -> MergeRequestBase:
     # First, let's find the classes that are inheriting from
     # MergeRequestBase and create a map where the class.name is
     # the key and the class itself is the value.

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/app_interface_reporter.py

@@ -1,3 +1,4 @@
+from collections.abc import Iterable
 from datetime import datetime
 from pathlib import Path
 
@@ -14,7 +15,9 @@ from reconcile.utils.mr.labels import AUTO_MERGE
 class CreateAppInterfaceReporter(MergeRequestBase):
     name = "create_app_interface_reporter_mr"
 
-    def __init__(self, reports, email_body, reports_path):
+    def __init__(
+        self, reports: Iterable[dict[str, str]], email_body: str, reports_path: str
+    ) -> None:
         self.reports = reports
         self.email_body = email_body
         self.reports_path = reports_path

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/aws_access.py

@@ -18,7 +18,7 @@ BODY_TEMPLATE = PROJ_ROOT / "templates" / "aws_access_key_email.j2"
 class CreateDeleteAwsAccessKey(MergeRequestBase):
     name = "create_delete_aws_access_key_mr"
 
-    def __init__(self, account, path, key):
+    def __init__(self, account: str, path: str, key: str):
         self.account = account
         self.path = path.lstrip("/")
         self.key = key

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/base.py

@@ -45,14 +45,14 @@ class MergeRequestBase(ABC):
 
     name = "merge-request-base"
 
-    def __init__(self):
+    def __init__(self) -> None:
         # Let's first get all the attributes from the instance
         # and use for the SQS Msg payload. With that, the msg
         # to the SQS is enough to create a new, similar, instance
         # of the child class.
         self.sqs_msg_data = {**self.__dict__}
 
-        self.labels = [DO_NOT_MERGE_HOLD]
+        self.labels: Iterable[str] = [DO_NOT_MERGE_HOLD]
 
         random_id = str(uuid4())[:6]
         self.branch = f"{self.name}-{random_id}"

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/clusters_updates.py

@@ -1,4 +1,6 @@
+from collections.abc import Mapping
 from io import StringIO
+from typing import Any
 
 from ruamel.yaml import YAML
 
@@ -15,7 +17,7 @@ yaml.width = 4096
 class CreateClustersUpdates(MergeRequestBase):
     name = "create_clusters_updates_mr"
 
-    def __init__(self, clusters_updates):
+    def __init__(self, clusters_updates: Mapping[str, dict[str, Any]]):
         self.clusters_updates = clusters_updates
 
         super().__init__()
@@ -30,7 +32,7 @@ class CreateClustersUpdates(MergeRequestBase):
     def description(self) -> str:
         return DecisionCommand.APPROVED.value
 
-    def process(self, gitlab_cli: GitLabApi):
+    def process(self, gitlab_cli: GitLabApi) -> None:
         changes = False
         for cluster_name, cluster_updates in self.clusters_updates.items():
             if not cluster_updates:

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py

@@ -1,3 +1,6 @@
+from collections.abc import Mapping
+from typing import Any
+
 from ruamel import yaml
 
 from reconcile.utils.gitlab_api import GitLabApi
@@ -8,7 +11,7 @@ from reconcile.utils.mr.labels import AUTO_MERGE
 class CreateOCMUpgradeSchedulerOrgUpdates(MergeRequestBase):
     name = "create_ocm_upgrade_scheduler_org_updates_mr"
 
-    def __init__(self, updates_info):
+    def __init__(self, updates_info: Mapping[str, Any]):
         self.updates_info = updates_info
 
         super().__init__()

{qontract_reconcile-0.10.2.dev315 → qontract_reconcile-0.10.2.dev316}/reconcile/utils/mr/user_maintenance.py

@@ -24,14 +24,14 @@ class PathSpec(BaseModel):
     path: str
 
     @validator("path")
-    def prepend_data_to_path(cls, v):
+    def prepend_data_to_path(cls, v: str) -> str:
         return "data" + v
 
 
 class CreateDeleteUserAppInterface(MergeRequestBase):
     name = "create_delete_user_mr"
 
-    def __init__(self, username, paths: Iterable[PathSpec]):
+    def __init__(self, username: str, paths: Iterable[PathSpec]) -> None:
         self.username = username
         self.paths = paths
 
@@ -120,7 +120,7 @@ class CreateDeleteUserInfra(MergeRequestBase):
 
     name = "create_ssh_key_mr"
 
-    def __init__(self, usernames):
+    def __init__(self, usernames: Iterable[str]):
         self.usernames = usernames
 
         super().__init__()
@@ -135,7 +135,7 @@ class CreateDeleteUserInfra(MergeRequestBase):
     def description(self) -> str:
         return "delete user(s)"
 
-    def process(self, gitlab_cli):
+    def process(self, gitlab_cli: GitLabApi) -> None:
         raw_file = gitlab_cli.get_raw_file(
             project=gitlab_cli.project,
             path=self.PLAYBOOK,