Merge pull request #38 from PostHog/tom/fix-wrong-param-name

Fix type error

Author: Piccirello

CLAUDE.md

@@ -5,6 +5,12 @@
 Always run these commands before committing changes:
 
 ```bash
+# Run type checking
+cd src && uv run pyright .
+
+# Run tests
+cd src && uv run pytest -q
+
 # Run all pre-commit hooks (linting, formatting, terraform docs, etc.)
 uv run --directory src --extra dev pre-commit run --all-files
 ```

run-tests.sh

@@ -5,6 +5,7 @@ set -e
 cd src
 uv sync --no-install-project --extra dev
 LOG_LEVEL=DEBUG uv run pytest -q $1
+uv run pyright .
 cd ..
 
 uvx pre-commit run -a

src/analytics.py

@@ -24,14 +24,15 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    import posthog as posthog_module
+    import types
+
 
 APPLICATION = "aws-sso-elevator"
 logger = logging.getLogger(__name__)
 
 
 @lru_cache(maxsize=1)
-def get_posthog_client() -> posthog_module | None:
+def get_posthog_client() -> types.ModuleType | None:
     """Get configured PostHog client, or None if not configured.
 
     Returns cached client instance. The client is configured on first call

src/cache.py

@@ -292,7 +292,7 @@ def set_cached_permission_sets(
         logger.warning(f"Failed to cache permission sets: {e}", extra={"error": str(e)})
 
 
-def _compute_data_hash(data: T) -> str:
+def _compute_data_hash(data: object) -> str:
     """Compute SHA256 hash of data for comparison.
 
     Args:
@@ -303,7 +303,7 @@ def _compute_data_hash(data: T) -> str:
     """
     try:
         # Convert to JSON string with sorted keys for consistent hashing
-        json_str = json.dumps([item.dict() if hasattr(item, "dict") else item for item in data], sort_keys=True)
+        json_str = json.dumps([item.dict() if hasattr(item, "dict") else item for item in data], sort_keys=True)  # pyright: ignore[reportGeneralTypeIssues]
         return hashlib.sha256(json_str.encode("utf-8")).hexdigest()
     except Exception as e:
         logger.warning(f"Failed to compute hash: {e}")

src/config.py

@@ -268,4 +268,5 @@ def check_and_refresh_config(s3_client: S3Client) -> Config:
     except Exception as e:
         logger.warning(f"Failed to check config freshness: {e}")
 
+    assert _config is not None
     return _config

src/entities/model.py

@@ -30,19 +30,19 @@ class BaseModel(PydanticBaseModel):
     def dict(self, *args, **kwargs) -> dict:  # noqa: ANN101, ANN003, ANN002, ARG002
         """Converts instance to dict representation of it. Workaround for https://github.com/pydantic/pydantic/issues/1090"""
         # Manually convert to avoid Pydantic serialization issues with frozensets of frozen models
-        return _convert_to_serializable(self)
+        return _convert_to_serializable(self)  # type: ignore[return-value]
 
     def json(self, *args, **kwargs) -> str:  # noqa: ANN101, ANN003, ANN002
         """Converts instance to JSON string. Compatibility wrapper for Pydantic v2."""
         # In Pydantic v2, use model_dump_json instead
         return self.model_dump_json(*args, **kwargs)
 
 
-def json_default(o: object) -> str | dict:
+def json_default(o: object) -> str | dict | list:
     if isinstance(o, PydanticBaseModel):
         return o.dict()
     elif dataclasses.is_dataclass(o):
-        return dataclasses.asdict(o)
+        return dataclasses.asdict(o)  # type: ignore[arg-type]
     elif isinstance(o, enum.Enum):
         return o.value
     return str(o)

src/event_publisher.py

@@ -11,7 +11,6 @@
 import os
 
 import boto3
-from botocore.exceptions import ClientError
 from mypy_boto3_events import EventBridgeClient
 
 logger = logging.getLogger(__name__)
@@ -57,7 +56,7 @@ def publish_access_event(
                 {
                     "Source": "sso-elevator",
                     "DetailType": "AccessChange",
-                    "EventBusArn": bus_arn,
+                    "EventBusName": bus_arn,
                     "Detail": json.dumps(detail),
                 }
             ]
@@ -74,7 +73,7 @@ def publish_access_event(
                 permission_set_name,
                 account_id,
             )
-    except ClientError:
+    except Exception:
         logger.exception(
             "Error publishing EventBridge event",
             extra={"detail": detail},

src/group.py

@@ -147,13 +147,14 @@ def approver_group_resolver(group_ids: frozenset[str]) -> set[str]:
             """,
         )
 
+    assert slack_response is not None
     blocks = slack_helpers.HeaderSectionBlock.set_status(
-        blocks=slack_response["message"]["blocks"],
+        blocks=slack_response["message"]["blocks"],  # type: ignore[index]
         status_text=status_text,
     )
     client.chat_update(
         channel=cfg.slack_channel_id,
-        ts=slack_response["ts"],
+        ts=str(slack_response["ts"]),
         blocks=blocks,
         text=text,
     )
@@ -199,6 +200,7 @@ def approver_group_resolver(group_ids: frozenset[str]) -> set[str]:
             first_statement = list(decision.based_on_statements)[0] if decision.based_on_statements else None
             approver_emails = list(first_statement.approvers) if first_statement else []
             approver_groups = list(first_statement.approver_groups) if first_statement else []
+            assert result.user_principal_id is not None
             early_revoke_payload = slack_helpers.EarlyRevokeButtonPayload(
                 schedule_name=result.schedule_name,
                 requester_slack_id=requester.id,
@@ -357,6 +359,7 @@ def approver_group_resolver(group_ids: frozenset[str]) -> set[str]:
         first_statement = list(decision.based_on_statements)[0] if decision.based_on_statements else None
         approver_emails = list(first_statement.approvers) if first_statement else []
         approver_groups = list(first_statement.approver_groups) if first_statement else []
+        assert result.user_principal_id is not None
         early_revoke_payload = slack_helpers.EarlyRevokeButtonPayload(
             schedule_name=result.schedule_name,
             requester_slack_id=requester.id,

src/main.py

@@ -390,6 +390,7 @@ def approver_group_resolver(group_ids: frozenset[str]) -> set[str]:
         first_statement = list(decision.based_on_statements)[0] if decision.based_on_statements else None
         approver_emails = list(first_statement.approvers) if first_statement else []
         approver_groups = list(first_statement.approver_groups) if first_statement else []
+        assert result.user_principal_id is not None
         early_revoke_payload = slack_helpers.EarlyRevokeButtonPayload(
             schedule_name=result.schedule_name,
             requester_slack_id=requester.id,
@@ -578,13 +579,14 @@ def approver_group_resolver(group_ids: frozenset[str]) -> set[str]:
             """,
         )
 
+    assert slack_response is not None
     blocks = slack_helpers.HeaderSectionBlock.set_status(
-        blocks=slack_response["message"]["blocks"],
+        blocks=slack_response["message"]["blocks"],  # type: ignore[index]
         status_text=status_text,
     )
     client.chat_update(
         channel=cfg.slack_channel_id,
-        ts=slack_response["ts"],
+        ts=str(slack_response["ts"]),
         blocks=blocks,
         text=text,
     )
@@ -639,6 +641,7 @@ def approver_group_resolver(group_ids: frozenset[str]) -> set[str]:
             first_statement = list(decision.based_on_statements)[0] if decision.based_on_statements else None
             approver_emails = list(first_statement.approvers) if first_statement else []
             approver_groups = list(first_statement.approver_groups) if first_statement else []
+            assert result.user_principal_id is not None
             early_revoke_payload = slack_helpers.EarlyRevokeButtonPayload(
                 schedule_name=result.schedule_name,
                 requester_slack_id=requester.id,
@@ -1000,6 +1003,7 @@ def handle_extend_grant_button_click(body: dict, client: WebClient, context: Bol
 
     if payload.account_id and payload.permission_set_arn:
         # Account access extension
+        assert payload.instance_arn is not None
         account_assignment = sso.UserAccountAssignment(
             instance_arn=payload.instance_arn,
             account_id=payload.account_id,
@@ -1166,6 +1170,7 @@ def handle_early_revoke_modal_submission(body: dict, client: WebClient, context:
     # Perform the revocation
     if button_payload.account_id and button_payload.permission_set_arn:
         # Account access revocation
+        assert button_payload.instance_arn is not None
         user_account_assignment = sso.UserAccountAssignment(
             instance_arn=button_payload.instance_arn,
             account_id=button_payload.account_id,
@@ -1189,6 +1194,8 @@ def handle_early_revoke_modal_submission(body: dict, client: WebClient, context:
         )
     elif button_payload.group_id and button_payload.membership_id:
         # Group access revocation
+        assert button_payload.group_name is not None
+        assert button_payload.identity_store_id is not None
         group_assignment = sso.GroupAssignment(
             group_name=button_payload.group_name,
             group_id=button_payload.group_id,

src/pyproject.toml

@@ -23,6 +23,7 @@ dev = [
     "hypothesis[ghostwriter]>=6.71.0",
     "pre-commit>=4.0.0",
     "ruff>=0.14.9",
+    "pyright>=1.1.0",
 ]
 
 [build-system]