Switched to ty

Author: lsierant

.pre-commit-config.yaml

@@ -131,9 +131,9 @@ repos:
 
   - repo: local
     hooks:
-      - id: mypy
-        name: mypy
-        entry: bash -c 'cd docker/mongodb-kubernetes-tests && python -m mypy --config-file ../../pyproject.toml --follow-imports=silent --disable-error-code=import-untyped tests/'
+      - id: ty
+        name: ty
+        entry: bash -c 'cd docker/mongodb-kubernetes-tests && uvx ty check tests/'
         language: system
         pass_filenames: false
         files: docker/mongodb-kubernetes-tests/tests/.*\.py$

docker/mongodb-kubernetes-tests/kubetester/__init__.py

@@ -75,7 +75,7 @@ def delete_service_account(namespace: str, name: str) -> str:
 
 def get_service(
     namespace: str, name: str, api_client: Optional[kubernetes.client.ApiClient] = None
-) -> client.V1ServiceSpec:
+) -> Optional[client.V1Service]:
     """Gets a service with `name` in `namespace.
     :return None if the service does not exist
     """

docker/mongodb-kubernetes-tests/tests/clusterwideoperator/om_multiple.py

@@ -51,7 +51,7 @@ def install_database_roles(
         raise e
 
 
-def create_om_admin_secret(ops_manager_namespace: str, api_client: kubernetes.client.ApiClient = None):
+def create_om_admin_secret(ops_manager_namespace: str, api_client: kubernetes.client.ApiClient | None = None):
     data = dict(
         Username="test-user",
         Password="@Sihjifutestpass21nnH",

docker/mongodb-kubernetes-tests/tests/conftest.py

@@ -32,7 +32,8 @@ def _load_env_from_local_file_for_development():
 _load_env_from_local_file_for_development()
 
 import kubernetes
-import requests  # type: ignore[import-untyped]
+import kubernetes.client.rest
+import requests
 from kubernetes import client
 from kubernetes.client import ApiextensionsV1Api
 from kubetester import (
@@ -337,7 +338,10 @@ def multi_cluster_issuer_ca_configmap(
 
 
 def create_issuer_ca_configmap(
-    issuer_ca_filepath: str, namespace: str, name: str = "issuer-ca", api_client: kubernetes.client.ApiClient = None
+    issuer_ca_filepath: str,
+    namespace: str,
+    name: str = "issuer-ca",
+    api_client: kubernetes.client.ApiClient | None = None,
 ):
     """This is the CA file which verifies the certificates signed by it."""
     ca = open(issuer_ca_filepath).read()
@@ -1059,6 +1063,7 @@ def install_official_operator(
         # but workload images (OpsManager, Agent, etc.) will use dev registries from operator_installation_config
         # to support testing unreleased versions in patch builds.
         assert member_cluster_clients is not None
+        assert central_cluster_client is not None
         return _install_multi_cluster_operator(
             namespace,
             helm_args,
@@ -1702,6 +1707,8 @@ def pytest_sessionfinish(session, exitstatus):
     project_id = os.environ.get("OM_PROJECT_ID", "")
     if project_id:
         base_url = os.environ.get("OM_HOST")
+        if base_url is None:
+            return
         user = os.environ.get("OM_USER")
         key = os.environ.get("OM_API_KEY")
         ids = project_id.split(",")
@@ -1755,7 +1762,7 @@ def install_multi_cluster_operator_cluster_scoped(
     central_cluster_name: str = get_central_cluster_name(),
     central_cluster_client: client.ApiClient = get_central_cluster_client(),
     multi_cluster_operator_installation_config: Optional[dict[str, str]] = None,
-    member_cluster_clients: Optional[list[kubernetes.client.ApiClient]] = None,
+    member_cluster_clients: Optional[list[MultiClusterClient]] = None,
     cluster_clients: Optional[dict[str, kubernetes.client.ApiClient]] = None,
     member_cluster_names: Optional[list[str]] = None,
 ) -> Operator:

docker/mongodb-kubernetes-tests/tests/multicluster/conftest.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 import ipaddress
 import urllib
+import urllib.parse
 from typing import Dict, Generator, List, Optional
-from urllib import parse
 
 import kubernetes
 from kubeobject import CustomObject

docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore.py

@@ -65,8 +65,10 @@ def ops_manager_certs(
 
 def create_project_config_map(om: MongoDBOpsManager, mdb_name, project_name, client, custom_ca):
     name = f"{mdb_name}-config"
-    data = {
-        "baseUrl": om.om_status().get_url(),
+    base_url = om.om_status().get_url()
+    assert base_url is not None, "OpsManager URL must not be None"
+    data: dict[str, str] = {
+        "baseUrl": base_url,
         "projectName": project_name,
         "sslMMSCAConfigMap": custom_ca,
         "orgId": "",
@@ -374,7 +376,7 @@ def project_one(
     def mdb_client(self, mongodb_multi_one: MongoDBMulti):
         return pymongo.MongoClient(
             mongodb_multi_one.tester(port=MONGODB_PORT).cnx_string,
-            **mongodb_multi_one.tester(port=MONGODB_PORT).default_opts,  # type: ignore[arg-type]
+            **mongodb_multi_one.tester(port=MONGODB_PORT).default_opts,
             readPreference="primary",  # let's read from the primary and not stale data from the secondary
         )
 
@@ -516,6 +518,6 @@ def test_data_got_restored(self, mongodb_multi_one_collection, mdb_client):
 
 def time_to_millis(date_time) -> int:
     """https://stackoverflow.com/a/11111177/614239"""
-    epoch = datetime.datetime.utcfromtimestamp(0)
+    epoch = datetime.datetime.fromtimestamp(0, tz=datetime.timezone.utc)
     pit_millis = (date_time - epoch).total_seconds() * 1000
     return pit_millis

docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore_no_mesh.py

@@ -65,8 +65,10 @@ def ops_manager_certs(
 
 def create_project_config_map(om: MongoDBOpsManager, mdb_name, project_name, client, custom_ca):
     name = f"{mdb_name}-config"
-    data = {
-        "baseUrl": om.om_status().get_url(),
+    base_url = om.om_status().get_url()
+    assert base_url is not None, "OpsManager URL must not be None"
+    data: dict[str, str] = {
+        "baseUrl": base_url,
         "projectName": project_name,
         "sslMMSCAConfigMap": custom_ca,
         "orgId": "",
@@ -459,7 +461,7 @@ def mongodb_multi_one_collection(self, mongodb_multi_one: MongoDBMulti):
             external=True,
         )
 
-        db: pymongo.database.Database = pymongo.MongoClient(tester.cnx_string, **tester.default_opts)["testdb"]  # type: ignore[arg-type]
+        db: pymongo.database.Database = pymongo.MongoClient(tester.cnx_string, **tester.default_opts)["testdb"]
 
         return db["testcollection"]
 
@@ -681,6 +683,6 @@ def test_data_got_restored(self, mongodb_multi_one_collection):
 
 def time_to_millis(date_time) -> int:
     """https://stackoverflow.com/a/11111177/614239"""
-    epoch = datetime.datetime.utcfromtimestamp(0)
+    epoch = datetime.datetime.fromtimestamp(0, tz=datetime.timezone.utc)
     pit_millis = (date_time - epoch).total_seconds() * 1000
     return pit_millis

docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_clusterwide.py

@@ -86,7 +86,7 @@ def install_operator(
     central_cluster_name: str,
     multi_cluster_operator_installation_config: Dict[str, str],
     central_cluster_client: client.ApiClient,
-    member_cluster_clients: List[kubernetes.client.ApiClient],
+    member_cluster_clients: List[MultiClusterClient],
     cluster_clients: Dict[str, kubernetes.client.ApiClient],
     member_cluster_names: List[str],
     mdba_ns: str,

docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_disaster_recovery.py

@@ -165,7 +165,7 @@ def test_delete_om_and_appdb_statefulset_in_failed_cluster(
         if e.status != 404:
             raise e
 
-    def statefulset_is_deleted(namespace: str, name: str, api_client=Optional[kubernetes.client.ApiClient]):
+    def statefulset_is_deleted(namespace: str, name: str, api_client: Optional[kubernetes.client.ApiClient] = None):
         try:
             get_statefulset(namespace, name, api_client=api_client)
             return False

docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py

@@ -27,8 +27,10 @@ def appdb_member_cluster_names() -> list[str]:
 
 def create_project_config_map(om: MongoDBOpsManager, mdb_name, project_name, client, custom_ca):
     name = f"{mdb_name}-config"
-    data = {
-        "baseUrl": om.om_status().get_url(),
+    base_url = om.om_status().get_url()
+    assert base_url is not None, "OpsManager URL must not be None"
+    data: dict[str, str] = {
+        "baseUrl": base_url,
         "projectName": project_name,
         "sslMMSCAConfigMap": custom_ca,
         "orgId": "",
@@ -162,7 +164,7 @@ def mongodb_multi_one_collection(self, mongodb_multi_one: MongoDBMulti):
         # we instantiate the pymongo client per test to avoid flakiness as the primary and secondary might swap
         db: pymongo.database.Database = pymongo.MongoClient(
             mongodb_multi_one.tester(port=MONGODB_PORT).cnx_string,
-            **mongodb_multi_one.tester(port=MONGODB_PORT).default_opts,  # type: ignore[arg-type]
+            **mongodb_multi_one.tester(port=MONGODB_PORT).default_opts,
         )["testdb"]
 
         return db["testcollection"]
@@ -229,6 +231,6 @@ def test_data_got_restored(self, mongodb_multi_one_collection):
 
 def time_to_millis(date_time) -> int:
     """https://stackoverflow.com/a/11111177/614239"""
-    epoch = datetime.datetime.utcfromtimestamp(0)
+    epoch = datetime.datetime.fromtimestamp(0, tz=datetime.timezone.utc)
     pit_millis = (date_time - epoch).total_seconds() * 1000
     return pit_millis