localstack-core 4.6.1.dev60__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/services/firehose/provider.py

@@ -8,7 +8,6 @@ import threading
 import time
 import uuid
 from datetime import datetime
-from typing import Dict, List
 from urllib.parse import urlparse
 
 import requests
@@ -609,7 +608,7 @@ class FirehoseProvider(FirehoseApi):
             record["Data"] = base64.b64encode(record["Data"])
         return record
 
-    def _reencode_records(self, records: List[Record]) -> List[Record]:
+    def _reencode_records(self, records: list[Record]) -> list[Record]:
         return [self._reencode_record(r) for r in records]
 
     def _process_records(
@@ -617,7 +616,7 @@ class FirehoseProvider(FirehoseApi):
         account_id: str,
         region_name: str,
         fh_d_stream: str,
-        records: List[Record],
+        records: list[Record],
     ):
         """Process the given records from the underlying Kinesis stream"""
         return self._put_records(account_id, region_name, fh_d_stream, records)
@@ -638,8 +637,8 @@ class FirehoseProvider(FirehoseApi):
         account_id: str,
         region_name: str,
         delivery_stream_name: str,
-        unprocessed_records: List[Record],
-    ) -> List[PutRecordBatchResponseEntry]:
+        unprocessed_records: list[Record],
+    ) -> list[PutRecordBatchResponseEntry]:
         """Put a list of records to the firehose stream - either directly from a PutRecord API call, or
         received from an underlying Kinesis stream (if 'KinesisStreamAsSource' is configured)"""
         store = self.get_store(account_id, region_name)
@@ -707,7 +706,11 @@ class FirehoseProvider(FirehoseApi):
                 try:
                     requests.post(url, json=record_to_send, headers=headers)
                 except Exception as e:
-                    LOG.exception("Unable to put Firehose records to HTTP endpoint %s.", url)
+                    LOG.error(
+                        "Unable to put Firehose records to HTTP endpoint %s.",
+                        url,
+                        exc_info=LOG.isEnabledFor(logging.DEBUG),
+                    )
                     raise e
             if "RedshiftDestinationDescription" in destination:
                 s3_dest_desc = destination["RedshiftDestinationDescription"][
@@ -783,10 +786,14 @@ class FirehoseProvider(FirehoseApi):
             try:
                 db_connection.create(index=search_db_index, id=obj_id, body=body)
             except Exception as e:
-                LOG.exception("Unable to put record to stream %s.", delivery_stream_name)
+                LOG.error(
+                    "Unable to put record to stream %s.",
+                    delivery_stream_name,
+                    exc_info=LOG.isEnabledFor(logging.DEBUG),
+                )
                 raise e
 
-    def _add_missing_record_attributes(self, records: List[Dict]) -> None:
+    def _add_missing_record_attributes(self, records: list[dict]) -> None:
         def _get_entry(obj, key):
             return obj.get(key) or obj.get(first_char_to_lower(key))
 
@@ -806,7 +813,7 @@ class FirehoseProvider(FirehoseApi):
                     "subsequenceNumber": "",
                 }
 
-    def _preprocess_records(self, processor: Dict, records: List[Record]) -> List[Dict]:
+    def _preprocess_records(self, processor: dict, records: list[Record]) -> list[dict]:
         """Preprocess the list of records by calling the given processor (e.g., Lamnda function)."""
         proc_type = processor.get("Type")
         parameters = processor.get("Parameters", [])
@@ -838,7 +845,7 @@ class FirehoseProvider(FirehoseApi):
     def _put_records_to_s3_bucket(
         self,
         stream_name: str,
-        records: List[Dict],
+        records: list[dict],
         s3_destination_description: S3DestinationDescription,
     ):
         bucket = s3_bucket_name(s3_destination_description["BucketARN"])
@@ -861,9 +868,10 @@ class FirehoseProvider(FirehoseApi):
             LOG.debug("Publishing to S3 destination: %s. Data: %s", bucket, batched_data)
             s3.put_object(Bucket=bucket, Key=obj_path, Body=batched_data)
         except Exception as e:
-            LOG.exception(
+            LOG.error(
                 "Unable to put records %s to s3 bucket.",
                 records,
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
             )
             raise e
 
@@ -884,7 +892,7 @@ class FirehoseProvider(FirehoseApi):
 
     def _put_to_redshift(
         self,
-        records: List[Dict],
+        records: list[dict],
         redshift_destination_description: RedshiftDestinationDescription,
     ):
         jdbcurl = redshift_destination_description.get("ClusterJDBCURL")
@@ -918,9 +926,10 @@ class FirehoseProvider(FirehoseApi):
                 )
                 redshift_data.execute_statement(Parameters=row_to_insert, **execute_statement)
             except Exception as e:
-                LOG.exception(
+                LOG.error(
                     "Unable to put records %s to redshift cluster.",
                     row_to_insert,
+                    exc_info=LOG.isEnabledFor(logging.DEBUG),
                 )
                 raise e
 
@@ -940,13 +949,13 @@ class FirehoseProvider(FirehoseApi):
             LOG.debug("Cannot extract region from JDBC url '%s'", jdbc_url)
             return None
 
-    def _decode_record(self, record: Dict) -> Dict:
+    def _decode_record(self, record: dict) -> dict:
         data = base64.b64decode(record.get("Data") or record.get("data"))
         data = to_str(data)
         data = json.loads(data)
         return data
 
-    def _prepare_records_for_redshift(self, record: Dict) -> List[Dict]:
+    def _prepare_records_for_redshift(self, record: dict) -> list[dict]:
         data = self._decode_record(record)
 
         parameters = []
@@ -963,7 +972,7 @@ class FirehoseProvider(FirehoseApi):
 
         return parameters
 
-    def _extract_columns(self, record: Dict) -> str:
+    def _extract_columns(self, record: dict) -> str:
         data = self._decode_record(record)
         placeholders = [f":{key}" for key in data]
         placeholder_str = ", ".join(placeholders)

localstack/services/iam/iam_patches.py

@@ -1,5 +1,4 @@
 import threading
-from typing import Dict, List, Optional
 
 from moto.iam.models import (
     AccessKey,
@@ -106,11 +105,11 @@ def apply_iam_patches():
         role_name: str,
         assume_role_policy_document: str,
         path: str,
-        permissions_boundary: Optional[str],
+        permissions_boundary: str | None,
         description: str,
-        tags: List[Dict[str, str]],
-        max_session_duration: Optional[str],
-        linked_service: Optional[str] = None,
+        tags: list[dict[str, str]],
+        max_session_duration: str | None,
+        linked_service: str | None = None,
     ):
         role = fn(
             self,
@@ -143,7 +142,7 @@ def apply_iam_patches():
     def access_key__init__(
         fn,
         self,
-        user_name: Optional[str],
+        user_name: str | None,
         prefix: str,
         account_id: str,
         status: str = "Active",

localstack/services/iam/provider.py

@@ -6,7 +6,7 @@ import re
 import string
 import uuid
 from datetime import datetime
-from typing import Any, Dict, List, TypeVar
+from typing import Any, TypeVar
 from urllib.parse import quote
 
 from moto.iam.models import (
@@ -20,10 +20,7 @@ from moto.iam.utils import generate_access_key_id_from_account_id
 
 from localstack.aws.api import CommonServiceException, RequestContext, handler
 from localstack.aws.api.iam import (
-    ActionNameListType,
-    ActionNameType,
     AttachedPermissionsBoundary,
-    ContextEntryListType,
     CreateRoleRequest,
     CreateRoleResponse,
     CreateServiceLinkedRoleResponse,
@@ -33,7 +30,6 @@ from localstack.aws.api.iam import (
     DeleteServiceLinkedRoleResponse,
     DeletionTaskIdType,
     DeletionTaskStatusType,
-    EvaluationResult,
     GetServiceLinkedRoleDeletionStatusResponse,
     GetUserResponse,
     IamApi,
@@ -43,16 +39,12 @@ from localstack.aws.api.iam import (
     ListServiceSpecificCredentialsResponse,
     MalformedPolicyDocumentException,
     NoSuchEntityException,
-    PolicyEvaluationDecisionType,
     ResetServiceSpecificCredentialResponse,
-    ResourceHandlingOptionType,
-    ResourceNameListType,
-    ResourceNameType,
     Role,
     ServiceSpecificCredential,
     ServiceSpecificCredentialMetadata,
     SimulatePolicyResponse,
-    SimulationPolicyListType,
+    SimulatePrincipalPolicyRequest,
     User,
     allUsers,
     arnType,
@@ -65,7 +57,6 @@ from localstack.aws.api.iam import (
     maxItemsType,
     pathPrefixType,
     pathType,
-    policyDocumentType,
     roleDescriptionType,
     roleNameType,
     serviceName,
@@ -78,6 +69,10 @@ from localstack.aws.api.iam import (
 from localstack.aws.connect import connect_to
 from localstack.constants import INTERNAL_AWS_SECRET_ACCESS_KEY
 from localstack.services.iam.iam_patches import apply_iam_patches
+from localstack.services.iam.resources.policy_simulator import (
+    BasicIAMPolicySimulator,
+    IAMPolicySimulator,
+)
 from localstack.services.iam.resources.service_linked_roles import SERVICE_LINKED_ROLES
 from localstack.services.moto import call_moto
 from localstack.utils.aws.request_context import extract_access_key_id_from_auth_header
@@ -108,58 +103,12 @@ def get_iam_backend(context: RequestContext) -> IAMBackend:
     return iam_backends[context.account_id][context.partition]
 
 
-def get_policies_from_principal(backend: IAMBackend, principal_arn: str) -> list[dict]:
-    policies = []
-    if ":role" in principal_arn:
-        role_name = principal_arn.split("/")[-1]
-
-        policies.append(backend.get_role(role_name=role_name).assume_role_policy_document)
-
-        policy_names = backend.list_role_policies(role_name=role_name)
-        policies.extend(
-            [
-                backend.get_role_policy(role_name=role_name, policy_name=policy_name)[1]
-                for policy_name in policy_names
-            ]
-        )
-
-        attached_policies, _ = backend.list_attached_role_policies(role_name=role_name)
-        policies.extend([policy.document for policy in attached_policies])
-
-    if ":group" in principal_arn:
-        print(principal_arn)
-        group_name = principal_arn.split("/")[-1]
-        policy_names = backend.list_group_policies(group_name=group_name)
-        policies.extend(
-            [
-                backend.get_group_policy(group_name=group_name, policy_name=policy_name)[1]
-                for policy_name in policy_names
-            ]
-        )
-
-        attached_policies, _ = backend.list_attached_group_policies(group_name=group_name)
-        policies.extend([policy.document for policy in attached_policies])
-
-    if ":user" in principal_arn:
-        print(principal_arn)
-        user_name = principal_arn.split("/")[-1]
-        policy_names = backend.list_user_policies(user_name=user_name)
-        policies.extend(
-            [
-                backend.get_user_policy(user_name=user_name, policy_name=policy_name)[1]
-                for policy_name in policy_names
-            ]
-        )
-
-        attached_policies, _ = backend.list_attached_user_policies(user_name=user_name)
-        policies.extend([policy.document for policy in attached_policies])
-
-    return policies
-
-
 class IamProvider(IamApi):
+    policy_simulator: IAMPolicySimulator
+
     def __init__(self):
         apply_iam_patches()
+        self.policy_simulator = BasicIAMPolicySimulator()
 
     @handler("CreateRole", expand=False)
     def create_role(
@@ -181,75 +130,21 @@ class IamProvider(IamApi):
 
         return result
 
-    @staticmethod
-    def build_evaluation_result(
-        action_name: ActionNameType, resource_name: ResourceNameType, policy_statements: List[Dict]
-    ) -> EvaluationResult:
-        eval_res = EvaluationResult()
-        eval_res["EvalActionName"] = action_name
-        eval_res["EvalResourceName"] = resource_name
-        eval_res["EvalDecision"] = PolicyEvaluationDecisionType.explicitDeny
-        for statement in policy_statements:
-            # TODO Implement evaluation logic here
-            if (
-                action_name in statement["Action"]
-                and resource_name in statement["Resource"]
-                and statement["Effect"] == "Allow"
-            ):
-                eval_res["EvalDecision"] = PolicyEvaluationDecisionType.allowed
-                eval_res["MatchedStatements"] = []  # TODO: add support for statement compilation.
-        return eval_res
-
+    @handler("SimulatePrincipalPolicy", expand=False)
     def simulate_principal_policy(
         self,
         context: RequestContext,
-        policy_source_arn: arnType,
-        action_names: ActionNameListType,
-        policy_input_list: SimulationPolicyListType = None,
-        permissions_boundary_policy_input_list: SimulationPolicyListType = None,
-        resource_arns: ResourceNameListType = None,
-        resource_policy: policyDocumentType = None,
-        resource_owner: ResourceNameType = None,
-        caller_arn: ResourceNameType = None,
-        context_entries: ContextEntryListType = None,
-        resource_handling_option: ResourceHandlingOptionType = None,
-        max_items: maxItemsType = None,
-        marker: markerType = None,
+        request: SimulatePrincipalPolicyRequest,
         **kwargs,
     ) -> SimulatePolicyResponse:
-        backend = get_iam_backend(context)
-
-        policies = get_policies_from_principal(backend, policy_source_arn)
-
-        def _get_statements_from_policy_list(policies: list[str]):
-            statements = []
-            for policy_str in policies:
-                policy_dict = json.loads(policy_str)
-                if isinstance(policy_dict["Statement"], list):
-                    statements.extend(policy_dict["Statement"])
-                else:
-                    statements.append(policy_dict["Statement"])
-            return statements
-
-        policy_statements = _get_statements_from_policy_list(policies)
-
-        evaluations = [
-            self.build_evaluation_result(action_name, resource_arn, policy_statements)
-            for action_name in action_names
-            for resource_arn in resource_arns
-        ]
-
-        response = SimulatePolicyResponse()
-        response["IsTruncated"] = False
-        response["EvaluationResults"] = evaluations
-        return response
+        return self.policy_simulator.simulate_principal_policy(context, request)
 
     def delete_policy(self, context: RequestContext, policy_arn: arnType, **kwargs) -> None:
         backend = get_iam_backend(context)
         if backend.managed_policies.get(policy_arn):
             backend.managed_policies.pop(policy_arn, None)
         else:
-            raise NoSuchEntityException("Policy {0} was not found.".format(policy_arn))
+            raise NoSuchEntityException(f"Policy {policy_arn} was not found.")
 
     def detach_role_policy(
         self, context: RequestContext, role_name: roleNameType, policy_arn: arnType, **kwargs
@@ -260,7 +155,7 @@ class IamProvider(IamApi):
             policy = role.managed_policies[policy_arn]
             policy.detach_from(role)
         except KeyError:
-            raise NoSuchEntityException("Policy {0} was not found.".format(policy_arn))
+            raise NoSuchEntityException(f"Policy {policy_arn} was not found.")
 
     @staticmethod
     def moto_role_to_role_type(moto_role: MotoRole) -> Role:

localstack/services/iam/resource_providers/aws_iam_accesskey.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,11 +14,11 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class IAMAccessKeyProperties(TypedDict):
-    UserName: Optional[str]
-    Id: Optional[str]
-    SecretAccessKey: Optional[str]
-    Serial: Optional[int]
-    Status: Optional[str]
+    UserName: str | None
+    Id: str | None
+    SecretAccessKey: str | None
+    Serial: int | None
+    Status: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/iam/resource_providers/aws_iam_accesskey_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class IAMAccessKeyProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::IAM::AccessKey"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.iam.resource_providers.aws_iam_accesskey import (

localstack/services/iam/resource_providers/aws_iam_group.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -15,17 +15,17 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class IAMGroupProperties(TypedDict):
-    Arn: Optional[str]
-    GroupName: Optional[str]
-    Id: Optional[str]
-    ManagedPolicyArns: Optional[list[str]]
-    Path: Optional[str]
-    Policies: Optional[list[Policy]]
+    Arn: str | None
+    GroupName: str | None
+    Id: str | None
+    ManagedPolicyArns: list[str] | None
+    Path: str | None
+    Policies: list[Policy] | None
 
 
 class Policy(TypedDict):
-    PolicyDocument: Optional[dict]
-    PolicyName: Optional[str]
+    PolicyDocument: dict | None
+    PolicyName: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/iam/resource_providers/aws_iam_group_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class IAMGroupProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::IAM::Group"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.iam.resource_providers.aws_iam_group import IAMGroupProvider

localstack/services/iam/resource_providers/aws_iam_instanceprofile.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,10 +14,10 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class IAMInstanceProfileProperties(TypedDict):
-    Roles: Optional[list[str]]
-    Arn: Optional[str]
-    InstanceProfileName: Optional[str]
-    Path: Optional[str]
+    Roles: list[str] | None
+    Arn: str | None
+    InstanceProfileName: str | None
+    Path: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/iam/resource_providers/aws_iam_instanceprofile_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class IAMInstanceProfileProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::IAM::InstanceProfile"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.iam.resource_providers.aws_iam_instanceprofile import (

localstack/services/iam/resource_providers/aws_iam_managedpolicy.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -15,14 +15,14 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class IAMManagedPolicyProperties(TypedDict):
-    PolicyDocument: Optional[dict]
-    Description: Optional[str]
-    Groups: Optional[list[str]]
-    Id: Optional[str]
-    ManagedPolicyName: Optional[str]
-    Path: Optional[str]
-    Roles: Optional[list[str]]
-    Users: Optional[list[str]]
+    PolicyDocument: dict | None
+    Description: str | None
+    Groups: list[str] | None
+    Id: str | None
+    ManagedPolicyName: str | None
+    Path: str | None
+    Roles: list[str] | None
+    Users: list[str] | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/iam/resource_providers/aws_iam_managedpolicy_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class IAMManagedPolicyProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::IAM::ManagedPolicy"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.iam.resource_providers.aws_iam_managedpolicy import (

localstack/services/iam/resource_providers/aws_iam_policy.py

@@ -5,7 +5,7 @@ import json
 import random
 import string
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -17,12 +17,12 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class IAMPolicyProperties(TypedDict):
-    PolicyDocument: Optional[dict]
-    PolicyName: Optional[str]
-    Groups: Optional[list[str]]
-    Id: Optional[str]
-    Roles: Optional[list[str]]
-    Users: Optional[list[str]]
+    PolicyDocument: dict | None
+    PolicyName: str | None
+    Groups: list[str] | None
+    Id: str | None
+    Roles: list[str] | None
+    Users: list[str] | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/iam/resource_providers/aws_iam_policy_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class IAMPolicyProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::IAM::Policy"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.iam.resource_providers.aws_iam_policy import IAMPolicyProvider

localstack/services/iam/resource_providers/aws_iam_role.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -16,27 +16,27 @@ from localstack.utils.functions import call_safe
 
 
 class IAMRoleProperties(TypedDict):
-    AssumeRolePolicyDocument: Optional[dict | str]
-    Arn: Optional[str]
-    Description: Optional[str]
-    ManagedPolicyArns: Optional[list[str]]
-    MaxSessionDuration: Optional[int]
-    Path: Optional[str]
-    PermissionsBoundary: Optional[str]
-    Policies: Optional[list[Policy]]
-    RoleId: Optional[str]
-    RoleName: Optional[str]
-    Tags: Optional[list[Tag]]
+    AssumeRolePolicyDocument: dict | str | None
+    Arn: str | None
+    Description: str | None
+    ManagedPolicyArns: list[str] | None
+    MaxSessionDuration: int | None
+    Path: str | None
+    PermissionsBoundary: str | None
+    Policies: list[Policy] | None
+    RoleId: str | None
+    RoleName: str | None
+    Tags: list[Tag] | None
 
 
 class Policy(TypedDict):
-    PolicyDocument: Optional[str | dict]
-    PolicyName: Optional[str]
+    PolicyDocument: str | dict | None
+    PolicyName: str | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/iam/resource_providers/aws_iam_role_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class IAMRoleProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::IAM::Role"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.iam.resource_providers.aws_iam_role import IAMRoleProvider