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

localstack/services/sqs/resource_providers/aws_sqs_queue_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 SQSQueueProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SQS::Queue"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.sqs.resource_providers.aws_sqs_queue import SQSQueueProvider

localstack/services/sqs/resource_providers/aws_sqs_queuepolicy.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,9 +15,9 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SQSQueuePolicyProperties(TypedDict):
-    PolicyDocument: Optional[dict]
-    Queues: Optional[list[str]]
-    Id: Optional[str]
+    PolicyDocument: dict | None
+    Queues: list[str] | None
+    Id: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"
@@ -104,7 +104,9 @@ class SQSQueuePolicyProvider(ResourceProvider[SQSQueuePolicyProperties]):
             policy = json.dumps(model["PolicyDocument"])
             sqs.set_queue_attributes(QueueUrl=queue, Attributes={"Policy": policy})
 
+        model["Id"] = request.previous_state["Id"]
+
         return ProgressEvent(
             status=OperationStatus.SUCCESS,
-            resource_model=request.desired_state,
+            resource_model=model,
         )

localstack/services/sqs/resource_providers/aws_sqs_queuepolicy_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 SQSQueuePolicyProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SQS::QueuePolicy"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.sqs.resource_providers.aws_sqs_queuepolicy import (

localstack/services/sqs/utils.py

@@ -1,12 +1,20 @@
 import base64
+import hashlib
 import itertools
 import json
 import re
+import struct
 import time
-from typing import Literal, NamedTuple, Optional, Tuple
+from typing import Any, Literal, NamedTuple
 from urllib.parse import urlparse
 
-from localstack.aws.api.sqs import QueueAttributeName, ReceiptHandleIsInvalid
+from localstack.aws.api.sqs import (
+    AttributeNameList,
+    Message,
+    MessageAttributeNameList,
+    QueueAttributeName,
+    ReceiptHandleIsInvalid,
+)
 from localstack.services.sqs.constants import (
     DOMAIN_STRATEGY_URL_REGEX,
     LEGACY_STRATEGY_URL_REGEX,
@@ -22,6 +30,11 @@ DOMAIN_ENDPOINT = re.compile(DOMAIN_STRATEGY_URL_REGEX)
 PATH_ENDPOINT = re.compile(PATH_STRATEGY_URL_REGEX)
 LEGACY_ENDPOINT = re.compile(LEGACY_STRATEGY_URL_REGEX)
 
+STRING_TYPE_FIELD_INDEX = 1
+BINARY_TYPE_FIELD_INDEX = 2
+STRING_LIST_TYPE_FIELD_INDEX = 3
+BINARY_LIST_TYPE_FIELD_INDEX = 4
+
 
 def is_sqs_queue_url(url: str) -> bool:
     return any(
@@ -36,7 +49,7 @@ def is_sqs_queue_url(url: str) -> bool:
 
 def guess_endpoint_strategy_and_host(
     host: str,
-) -> Tuple[Literal["standard", "domain", "path"], str]:
+) -> tuple[Literal["standard", "domain", "path"], str]:
     """
     This method is used for the dynamic endpoint strategy. It heuristically determines a tuple where the first
     element is the endpoint strategy, and the second is the part of the host after the endpoint prefix and region.
@@ -77,7 +90,7 @@ def is_fifo_queue(queue):
     return "true" == queue.attributes.get(QueueAttributeName.FifoQueue, "false").lower()
 
 
-def parse_queue_url(queue_url: str) -> Tuple[str, Optional[str], str]:
+def parse_queue_url(queue_url: str) -> tuple[str, str | None, str]:
     """
     Parses an SQS Queue URL and returns a triple of account_id, region and queue_name.
 
@@ -184,3 +197,109 @@ def global_message_sequence():
 
 def generate_message_id():
     return long_uid()
+
+
+def message_filter_attributes(message: Message, names: AttributeNameList | None):
+    """
+    Utility function filter from the given message (in-place) the system attributes from the given list. It will
+    apply all rules according to:
+    https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sqs.html#SQS.Client.receive_message.
+
+    :param message: The message to filter (it will be modified)
+    :param names: the attributes names/filters
+    """
+    if "Attributes" not in message:
+        return
+
+    if not names:
+        del message["Attributes"]
+        return
+
+    if QueueAttributeName.All in names:
+        return
+
+    for k in list(message["Attributes"].keys()):
+        if k not in names:
+            del message["Attributes"][k]
+
+
+def message_filter_message_attributes(message: Message, names: MessageAttributeNameList | None):
+    """
+    Utility function filter from the given message (in-place) the message attributes from the given list. It will
+    apply all rules according to:
+    https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sqs.html#SQS.Client.receive_message.
+
+    :param message: The message to filter (it will be modified)
+    :param names: the attributes names/filters (can be 'All', '.*', '*' or prefix filters like 'Foo.*')
+    """
+    if not message.get("MessageAttributes"):
+        return
+
+    if not names:
+        del message["MessageAttributes"]
+        return
+
+    if "All" in names or ".*" in names or "*" in names:
+        return
+
+    attributes = message["MessageAttributes"]
+    matched = []
+
+    keys = [name for name in names if ".*" not in name]
+    prefixes = [name.split(".*")[0] for name in names if ".*" in name]
+
+    # match prefix filters
+    for k in attributes:
+        if k in keys:
+            matched.append(k)
+            continue
+
+        for prefix in prefixes:
+            if k.startswith(prefix):
+                matched.append(k)
+            break
+    if matched:
+        message["MessageAttributes"] = {k: attributes[k] for k in matched}
+    else:
+        message.pop("MessageAttributes")
+
+
+def _utf8(value: Any) -> bytes:  # type: ignore[misc]
+    if isinstance(value, str):
+        return value.encode("utf-8")
+    return value
+
+
+def _update_binary_length_and_value(md5: Any, value: bytes) -> None:  # type: ignore[misc]
+    length_bytes = struct.pack("!I".encode("ascii"), len(value))
+    md5.update(length_bytes)
+    md5.update(value)
+
+
+def create_message_attribute_hash(message_attributes) -> str | None:
+    """
+    Method from moto's attribute_md5 of moto/sqs/models.py, separated from the Message Object.
+    """
+    # To avoid the need to check for dict conformity everytime we invoke this function
+    if not isinstance(message_attributes, dict):
+        return
+
+    hash = hashlib.md5()
+
+    for attrName in sorted(message_attributes.keys()):
+        attr_value = message_attributes[attrName]
+        # Encode name
+        _update_binary_length_and_value(hash, _utf8(attrName))
+        # Encode data type
+        _update_binary_length_and_value(hash, _utf8(attr_value["DataType"]))
+        # Encode transport type and value
+        if attr_value.get("StringValue"):
+            hash.update(bytearray([STRING_TYPE_FIELD_INDEX]))
+            _update_binary_length_and_value(hash, _utf8(attr_value.get("StringValue")))
+        elif attr_value.get("BinaryValue"):
+            hash.update(bytearray([BINARY_TYPE_FIELD_INDEX]))
+            decoded_binary_value = attr_value.get("BinaryValue")
+            _update_binary_length_and_value(hash, decoded_binary_value)
+        # string_list_value, binary_list_value type is not implemented, reserved for the future use.
+        # See https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_MessageAttributeValue.html
+    return hash.hexdigest()

localstack/services/ssm/provider.py

@@ -3,7 +3,6 @@ import json
 import logging
 import time
 from abc import ABC
-from typing import Dict, Optional
 
 from localstack.aws.api import CommonServiceException, RequestContext
 from localstack.aws.api.ssm import (
@@ -339,7 +338,7 @@ class SsmProvider(SsmApi, ABC):
     # utility methods below
 
     @staticmethod
-    def _denormalize_param_name_in_response(param_result: Dict, param_name: str):
+    def _denormalize_param_name_in_response(param_result: dict, param_name: str):
         result_name = param_result["Name"]
         if result_name != param_name and result_name.lstrip("/") == param_name.lstrip("/"):
             param_result["Name"] = param_name
@@ -367,13 +366,13 @@ class SsmProvider(SsmApi, ABC):
         param_name = param_name.strip("/")
         param_name = param_name.replace("//", "/")
         if "/" in param_name:
-            param_name = "/%s" % param_name
+            param_name = f"/{param_name}"
         return param_name
 
     @staticmethod
     def _get_secrets_information(
         account_id: str, region_name: str, name: ParameterName, resource_name: str
-    ) -> Optional[GetParameterResult]:
+    ) -> GetParameterResult | None:
         client = connect_to(aws_access_key_id=account_id, region_name=region_name).secretsmanager
         try:
             secret_info = client.get_secret_value(SecretId=resource_name)

localstack/services/ssm/resource_providers/aws_ssm_maintenancewindow.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,23 +14,23 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SSMMaintenanceWindowProperties(TypedDict):
-    AllowUnassociatedTargets: Optional[bool]
-    Cutoff: Optional[int]
-    Duration: Optional[int]
-    Name: Optional[str]
-    Schedule: Optional[str]
-    Description: Optional[str]
-    EndDate: Optional[str]
-    Id: Optional[str]
-    ScheduleOffset: Optional[int]
-    ScheduleTimezone: Optional[str]
-    StartDate: Optional[str]
-    Tags: Optional[list[Tag]]
+    AllowUnassociatedTargets: bool | None
+    Cutoff: int | None
+    Duration: int | None
+    Name: str | None
+    Schedule: str | None
+    Description: str | None
+    EndDate: str | None
+    Id: str | None
+    ScheduleOffset: int | None
+    ScheduleTimezone: str | None
+    StartDate: str | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ssm/resource_providers/aws_ssm_maintenancewindow_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 SSMMaintenanceWindowProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SSM::MaintenanceWindow"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ssm.resource_providers.aws_ssm_maintenancewindow import (

localstack/services/ssm/resource_providers/aws_ssm_maintenancewindowtarget.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,18 +14,18 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SSMMaintenanceWindowTargetProperties(TypedDict):
-    ResourceType: Optional[str]
-    Targets: Optional[list[Targets]]
-    WindowId: Optional[str]
-    Description: Optional[str]
-    Id: Optional[str]
-    Name: Optional[str]
-    OwnerInformation: Optional[str]
+    ResourceType: str | None
+    Targets: list[Targets] | None
+    WindowId: str | None
+    Description: str | None
+    Id: str | None
+    Name: str | None
+    OwnerInformation: str | None
 
 
 class Targets(TypedDict):
-    Key: Optional[str]
-    Values: Optional[list[str]]
+    Key: str | None
+    Values: list[str] | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ssm/resource_providers/aws_ssm_maintenancewindowtarget_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 SSMMaintenanceWindowTargetProviderPlugin(CloudFormationResourceProviderPlu
     name = "AWS::SSM::MaintenanceWindowTarget"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ssm.resource_providers.aws_ssm_maintenancewindowtarget import (

localstack/services/ssm/resource_providers/aws_ssm_maintenancewindowtask.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,80 +14,80 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SSMMaintenanceWindowTaskProperties(TypedDict):
-    Priority: Optional[int]
-    TaskArn: Optional[str]
-    TaskType: Optional[str]
-    WindowId: Optional[str]
-    CutoffBehavior: Optional[str]
-    Description: Optional[str]
-    Id: Optional[str]
-    LoggingInfo: Optional[LoggingInfo]
-    MaxConcurrency: Optional[str]
-    MaxErrors: Optional[str]
-    Name: Optional[str]
-    ServiceRoleArn: Optional[str]
-    Targets: Optional[list[Target]]
-    TaskInvocationParameters: Optional[TaskInvocationParameters]
-    TaskParameters: Optional[dict]
+    Priority: int | None
+    TaskArn: str | None
+    TaskType: str | None
+    WindowId: str | None
+    CutoffBehavior: str | None
+    Description: str | None
+    Id: str | None
+    LoggingInfo: LoggingInfo | None
+    MaxConcurrency: str | None
+    MaxErrors: str | None
+    Name: str | None
+    ServiceRoleArn: str | None
+    Targets: list[Target] | None
+    TaskInvocationParameters: TaskInvocationParameters | None
+    TaskParameters: dict | None
 
 
 class Target(TypedDict):
-    Key: Optional[str]
-    Values: Optional[list[str]]
+    Key: str | None
+    Values: list[str] | None
 
 
 class MaintenanceWindowStepFunctionsParameters(TypedDict):
-    Input: Optional[str]
-    Name: Optional[str]
+    Input: str | None
+    Name: str | None
 
 
 class CloudWatchOutputConfig(TypedDict):
-    CloudWatchLogGroupName: Optional[str]
-    CloudWatchOutputEnabled: Optional[bool]
+    CloudWatchLogGroupName: str | None
+    CloudWatchOutputEnabled: bool | None
 
 
 class NotificationConfig(TypedDict):
-    NotificationArn: Optional[str]
-    NotificationEvents: Optional[list[str]]
-    NotificationType: Optional[str]
+    NotificationArn: str | None
+    NotificationEvents: list[str] | None
+    NotificationType: str | None
 
 
 class MaintenanceWindowRunCommandParameters(TypedDict):
-    CloudWatchOutputConfig: Optional[CloudWatchOutputConfig]
-    Comment: Optional[str]
-    DocumentHash: Optional[str]
-    DocumentHashType: Optional[str]
-    DocumentVersion: Optional[str]
-    NotificationConfig: Optional[NotificationConfig]
-    OutputS3BucketName: Optional[str]
-    OutputS3KeyPrefix: Optional[str]
-    Parameters: Optional[dict]
-    ServiceRoleArn: Optional[str]
-    TimeoutSeconds: Optional[int]
+    CloudWatchOutputConfig: CloudWatchOutputConfig | None
+    Comment: str | None
+    DocumentHash: str | None
+    DocumentHashType: str | None
+    DocumentVersion: str | None
+    NotificationConfig: NotificationConfig | None
+    OutputS3BucketName: str | None
+    OutputS3KeyPrefix: str | None
+    Parameters: dict | None
+    ServiceRoleArn: str | None
+    TimeoutSeconds: int | None
 
 
 class MaintenanceWindowLambdaParameters(TypedDict):
-    ClientContext: Optional[str]
-    Payload: Optional[str]
-    Qualifier: Optional[str]
+    ClientContext: str | None
+    Payload: str | None
+    Qualifier: str | None
 
 
 class MaintenanceWindowAutomationParameters(TypedDict):
-    DocumentVersion: Optional[str]
-    Parameters: Optional[dict]
+    DocumentVersion: str | None
+    Parameters: dict | None
 
 
 class TaskInvocationParameters(TypedDict):
-    MaintenanceWindowAutomationParameters: Optional[MaintenanceWindowAutomationParameters]
-    MaintenanceWindowLambdaParameters: Optional[MaintenanceWindowLambdaParameters]
-    MaintenanceWindowRunCommandParameters: Optional[MaintenanceWindowRunCommandParameters]
-    MaintenanceWindowStepFunctionsParameters: Optional[MaintenanceWindowStepFunctionsParameters]
+    MaintenanceWindowAutomationParameters: MaintenanceWindowAutomationParameters | None
+    MaintenanceWindowLambdaParameters: MaintenanceWindowLambdaParameters | None
+    MaintenanceWindowRunCommandParameters: MaintenanceWindowRunCommandParameters | None
+    MaintenanceWindowStepFunctionsParameters: MaintenanceWindowStepFunctionsParameters | None
 
 
 class LoggingInfo(TypedDict):
-    Region: Optional[str]
-    S3Bucket: Optional[str]
-    S3Prefix: Optional[str]
+    Region: str | None
+    S3Bucket: str | None
+    S3Prefix: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ssm/resource_providers/aws_ssm_maintenancewindowtask_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 SSMMaintenanceWindowTaskProviderPlugin(CloudFormationResourceProviderPlugi
     name = "AWS::SSM::MaintenanceWindowTask"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ssm.resource_providers.aws_ssm_maintenancewindowtask import (

localstack/services/ssm/resource_providers/aws_ssm_parameter.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,15 +14,15 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SSMParameterProperties(TypedDict):
-    Type: Optional[str]
-    Value: Optional[str]
-    AllowedPattern: Optional[str]
-    DataType: Optional[str]
-    Description: Optional[str]
-    Name: Optional[str]
-    Policies: Optional[str]
-    Tags: Optional[dict]
-    Tier: Optional[str]
+    Type: str | None
+    Value: str | None
+    AllowedPattern: str | None
+    DataType: str | None
+    Description: str | None
+    Name: str | None
+    Policies: str | None
+    Tags: dict | None
+    Tier: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ssm/resource_providers/aws_ssm_parameter_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 SSMParameterProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SSM::Parameter"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ssm.resource_providers.aws_ssm_parameter import (

localstack/services/ssm/resource_providers/aws_ssm_patchbaseline.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,52 +14,52 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SSMPatchBaselineProperties(TypedDict):
-    Name: Optional[str]
-    ApprovalRules: Optional[RuleGroup]
-    ApprovedPatches: Optional[list[str]]
-    ApprovedPatchesComplianceLevel: Optional[str]
-    ApprovedPatchesEnableNonSecurity: Optional[bool]
-    Description: Optional[str]
-    GlobalFilters: Optional[PatchFilterGroup]
-    Id: Optional[str]
-    OperatingSystem: Optional[str]
-    PatchGroups: Optional[list[str]]
-    RejectedPatches: Optional[list[str]]
-    RejectedPatchesAction: Optional[str]
-    Sources: Optional[list[PatchSource]]
-    Tags: Optional[list[Tag]]
+    Name: str | None
+    ApprovalRules: RuleGroup | None
+    ApprovedPatches: list[str] | None
+    ApprovedPatchesComplianceLevel: str | None
+    ApprovedPatchesEnableNonSecurity: bool | None
+    Description: str | None
+    GlobalFilters: PatchFilterGroup | None
+    Id: str | None
+    OperatingSystem: str | None
+    PatchGroups: list[str] | None
+    RejectedPatches: list[str] | None
+    RejectedPatchesAction: str | None
+    Sources: list[PatchSource] | None
+    Tags: list[Tag] | None
 
 
 class PatchFilter(TypedDict):
-    Key: Optional[str]
-    Values: Optional[list[str]]
+    Key: str | None
+    Values: list[str] | None
 
 
 class PatchFilterGroup(TypedDict):
-    PatchFilters: Optional[list[PatchFilter]]
+    PatchFilters: list[PatchFilter] | None
 
 
 class Rule(TypedDict):
-    ApproveAfterDays: Optional[int]
-    ApproveUntilDate: Optional[dict]
-    ComplianceLevel: Optional[str]
-    EnableNonSecurity: Optional[bool]
-    PatchFilterGroup: Optional[PatchFilterGroup]
+    ApproveAfterDays: int | None
+    ApproveUntilDate: dict | None
+    ComplianceLevel: str | None
+    EnableNonSecurity: bool | None
+    PatchFilterGroup: PatchFilterGroup | None
 
 
 class RuleGroup(TypedDict):
-    PatchRules: Optional[list[Rule]]
+    PatchRules: list[Rule] | None
 
 
 class PatchSource(TypedDict):
-    Configuration: Optional[str]
-    Name: Optional[str]
-    Products: Optional[list[str]]
+    Configuration: str | None
+    Name: str | None
+    Products: list[str] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"