replace mypy with ty

Author: gruebel

.github/workflows/test.yml

@@ -12,7 +12,7 @@ permissions:
   contents: read
 
 env:
-  PREK_VERSION: '0.2.13'
+  PREK_VERSION: '0.2.22'
 
 jobs:
   prek:

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.8
+    rev: v1.7.9
     hooks:
       - id: actionlint-docker
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.3
+    rev: v0.14.10
     hooks:
       - id: ruff-check
         files: ^(cloudsplaining/|setup.py)

cloudsplaining/command/download.py

@@ -81,7 +81,7 @@ def get_account_authorization_details(
     session_data: dict[str, str], include_non_default_policy_versions: bool
 ) -> dict[str, list[Any]]:
     """Runs aws-iam-get-account-authorization-details"""
-    session = boto3.Session(**session_data)  # type:ignore[arg-type]
+    session = boto3.Session(**session_data)  # ty: ignore[invalid-argument-type]
     config = Config(connect_timeout=5, retries={"max_attempts": 10})
     iam_client: IAMClient = session.client("iam", config=config)
 

cloudsplaining/command/scan_multi_account.py

@@ -217,13 +217,13 @@ def scan_accounts(
             )
             # Write the HTML file
             output_file = f"{target_account_name}.html"
-            s3.Object(output_bucket, output_file).put(ACL="bucket-owner-full-control", Body=rendered_report)
+            s3.Object(output_bucket, output_file).put(ACL="bucket-owner-full-control", Body=rendered_report)  # ty: ignore[unresolved-attribute]
             utils.print_green(f"Saved the HTML report to: s3://{output_bucket}/{output_file}")
             # Write the JSON data file
             if write_data_file:
                 output_file = f"{target_account_name}.json"
                 body = json.dumps(results, sort_keys=True, default=str, indent=4)
-                s3.Object(output_bucket, output_file).put(ACL="bucket-owner-full-control", Body=body)
+                s3.Object(output_bucket, output_file).put(ACL="bucket-owner-full-control", Body=body)  # ty: ignore[unresolved-attribute]
                 utils.print_green(f"Saved the JSON data to: s3://{output_bucket}/{output_file}")
         if output_directory:
             # Write the HTML file

cloudsplaining/scan/assume_role_policy_document.py

@@ -40,7 +40,7 @@ def __init__(
         self.policy = policy
         self.current_account_id = current_account_id
         # We would actually need to define a proper base class with a generic type for statements
-        self.statements: list[AssumeRoleStatement] = []  # type:ignore[assignment]
+        self.statements: list[AssumeRoleStatement] = []
         self.exclusions = exclusions
         # leaving here but excluding from tests because IAM Policy grammar dictates that it must be a list
         if not isinstance(statement_structure, list):  # pragma: no cover

cloudsplaining/shared/aws_login.py

@@ -20,10 +20,7 @@
 def get_boto3_client(service: str, profile: str | None = None, region: str = "us-east-1") -> BaseClient:
     """Get a boto3 client for a given service"""
     logging.getLogger("botocore").setLevel(logging.CRITICAL)
-    session_data = {"region_name": region}
-    if profile:
-        session_data["profile_name"] = profile
-    session = boto3.Session(**session_data)  # type:ignore[arg-type]
+    session = boto3.Session(region_name=region, profile_name=profile)
 
     config = Config(connect_timeout=5, retries={"max_attempts": 10})
     if os.environ.get("LOCALSTACK_ENDPOINT_URL"):
@@ -41,10 +38,7 @@ def get_boto3_client(service: str, profile: str | None = None, region: str = "us
 def get_boto3_resource(service: str, profile: str | None = None, region: str = "us-east-1") -> ServiceResource:
     """Get a boto3 resource for a given service"""
     logging.getLogger("botocore").setLevel(logging.CRITICAL)
-    session_data = {"region_name": region}
-    if profile:
-        session_data["profile_name"] = profile
-    session = boto3.Session(**session_data)  # type:ignore[arg-type]
+    session = boto3.Session(region_name=region, profile_name=profile)
 
     config = Config(connect_timeout=5, retries={"max_attempts": 10})
     resource: ServiceResource = session.resource(service, config=config)
@@ -82,11 +76,7 @@ def get_target_account_credentials(
     :param target_account_id: The target account ID
     :return:
     """
-    default_region = "us-east-1"
-    session_data = {"region_name": default_region}
-    if profile:
-        session_data["profile_name"] = profile
-    session = boto3.Session(**session_data)  # type:ignore[arg-type]
+    session = boto3.Session(region_name="us-east-1", profile_name=profile)
     config = Config(connect_timeout=5, retries={"max_attempts": 10})
     sts_client: STSClient = session.client("sts", config=config)
 

cloudsplaining/shared/validation.py

@@ -46,12 +46,12 @@ def check(conf_schema: Schema, conf: dict[str, list[Any]]) -> bool:
     try:
         conf_schema.validate(conf)
         return True
-    except SchemaError as schema_error:
+    except SchemaError as schema_error:  # pragma: no cover
         try:
             # workarounds for Schema's logging approach
             print(schema_error.autos[0])
             detailed_error_message = schema_error.autos[2]
-            print(detailed_error_message.split(" in {'")[0])  # pragma: no cover
+            print(detailed_error_message.split(" in {'")[0])  # ty: ignore[possibly-missing-attribute]
             # for error in schema_error.autos:
         except Exception:
             logger.critical(schema_error)

examples/jira-tickets/open_jira_ticket.py

@@ -1,4 +1,4 @@
-from jira import JIRA
+from jira import JIRA  # ty: ignore[unresolved-import]
 import click
 import getpass
 

justfile

@@ -47,7 +47,7 @@ test-js: install-js
 
 [group('test')]
 type-check:
-    mypy
+    ty check
 
 [group('test')]
 unit-tests:

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "click>=8.1.0,<9.0.0",
     "click_option_group>=0.5.9,<0.6.0",
     "jinja2>=3.1.0,<4.0.0",
-    "policy_sentry>=0.14.0,<0.15",
+    "policy_sentry>=0.15.0,<0.16.0",
     "pyyaml>=6.0.0,<7.0.0",
     "schema>=0.7.0,<0.8.0",
 ]
@@ -48,12 +48,12 @@ Twitter = "https://twitter.com/kmcquade3"
 [dependency-groups]
 dev = [
     "boto3-stubs-lite[iam,s3,sts]>=1.40.0,<2.0.0",
-    "coverage>=7.11.0,<8.0.0",
+    "coverage>=7.13.0,<8.0.0",
     "moto[sts]>=5.1.0,<6.0.0",
-    "mypy>=1.18.0,<2.0.0",
-    "prek>=0.2.13,<0.3.0",
-    "pytest>=8.4.0,<9.0.0",
-    "rust-just>=1.43.0,<2.0.0",
+    "prek>=0.2.22,<0.3.0",
+    "pytest>=9.0.0,<10.0.0",
+    "rust-just>=1.45.0,<2.0.0",
+    "ty>=0.0.4,<0.1.0",
     "types-pyyaml>=6.0.12,<7.0.0",
 ]
 
@@ -85,23 +85,6 @@ module-name = "cloudsplaining"
 module-root = ""
 source-include = ["test/**"]
 
-[tool.mypy]
-files = "cloudsplaining"
-
-python_version = "3.10" # should be identical to the minimum supported version
-local_partial_types = true # will become the new default from version 2
-allow_redefinition_new = true # will become the new default from version 2
-fixed_format_cache = true # new caching mechanism
-strict = true
-pretty = true
-disallow_untyped_decorators = false
-
-[[tool.mypy.overrides]]
-module = [
-    "schema",
-]
-ignore_missing_imports = true
-
 [tool.ruff]
 line-length = 120
 target-version = "py310"
@@ -175,3 +158,12 @@ omit = [
     "cloudsplaining/output/html_report.py",
     "cloudsplaining/output/triage_worksheet.py",
 ]
+
+[tool.ty.environment]
+python-version = "3.10"
+
+[tool.ty.src]
+include = ["examples", "cloudsplaining", "utils"]
+
+[tool.ty.rules]
+unused-ignore-comment = "error"