localstack-core 4.9.3.dev66__tar.gz → 4.10.1.dev39__tar.gz

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/CODEOWNERS

@@ -191,6 +191,11 @@
 # pipes
 /localstack-core/localstack/aws/api/pipes/ @tiurin @gregfurman @joe4dev
 
+# resourcegroupstaggingapi
+/localstack-core/localstack/aws/api/resourcegroupstaggingapi/ @aidehn
+/localstack-core/localstack/services/resourcegroupstaggingapi/ @aidehn
+/tests/aws/services/resourcegroupstaggingapi/ @aidehn
+
 # route53
 /localstack-core/localstack/aws/api/route53/ @giograno
 /localstack-core/localstack/services/route53/ @giograno

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/Dockerfile

@@ -1,7 +1,7 @@
 #
 # base: Stage which installs necessary runtime dependencies (OS packages, etc.)
 #
-FROM python:3.13.9-slim-trixie@sha256:079601253d5d25ae095110937ea8cfd7403917b53b077870bccd8b026dc7c42f AS base
+FROM python:3.13.9-slim-trixie@sha256:85dfbf1b566b7addfe645faea9938e81a0a01a83580b0ea05fb23706357d77fb AS base
 ARG TARGETARCH
 
 # Install runtime OS package dependencies

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/Dockerfile.s3

@@ -1,5 +1,5 @@
 # base: Stage which installs necessary runtime dependencies (OS packages, filesystem...)
-FROM python:3.13.9-slim-trixie@sha256:079601253d5d25ae095110937ea8cfd7403917b53b077870bccd8b026dc7c42f AS base
+FROM python:3.13.9-slim-trixie@sha256:85dfbf1b566b7addfe645faea9938e81a0a01a83580b0ea05fb23706357d77fb AS base
 ARG TARGETARCH
 
 # set workdir

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/MANIFEST.in

@@ -1,5 +1,4 @@
 exclude .github/**
-exclude .circleci/**
 exclude docs/**
 exclude tests/**
 exclude .test_durations

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/Makefile

@@ -36,8 +36,7 @@ freeze:                   ## Run pip freeze -l in the virtual environment
 	@$(VENV_RUN); pip freeze -l
 
 upgrade-pinned-dependencies: venv
-	# FIXME remove pin on pip-tools when https://github.com/jazzband/pip-tools/issues/2215 us resolved
-	$(VENV_RUN); $(PIP_CMD) install --upgrade "pip-tools<7.5.0" pre-commit
+	$(VENV_RUN); $(PIP_CMD) install --upgrade pip pip-tools pre-commit
 	$(VENV_RUN); pip-compile --strip-extras --upgrade -o requirements-basic.txt pyproject.toml
 	$(VENV_RUN); pip-compile --strip-extras --upgrade --extra runtime -o requirements-runtime.txt pyproject.toml
 	$(VENV_RUN); pip-compile --strip-extras --upgrade --extra test -o requirements-test.txt pyproject.toml
@@ -89,7 +88,7 @@ coveralls:         		  ## Publish coveralls metrics
 	$(VENV_RUN); coveralls
 
 start:             		  ## Manually start the local infrastructure for testing
-	($(VENV_RUN); exec bin/localstack start --host)
+	($(VENV_RUN); python3 -m localstack.runtime.main)
 
 docker-run-tests:		  ## Initializes the test environment and runs the tests in a docker container
 	docker run -e LOCALSTACK_INTERNAL_TEST_COLLECT_METRIC=1 --entrypoint= -v `pwd`/.git:/opt/code/localstack/.git -v `pwd`/requirements-test.txt:/opt/code/localstack/requirements-test.txt -v `pwd`/.test_durations:/opt/code/localstack/.test_durations -v `pwd`/tests/:/opt/code/localstack/tests/ -v `pwd`/dist/:/opt/code/localstack/dist/ -v `pwd`/target/:/opt/code/localstack/target/ -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/localstack:/var/lib/localstack  \
@@ -140,6 +139,13 @@ format-modified:          ## Run ruff to format only modified code
 	  python -m ruff check --output-format=full --fix `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs`; \
 	  python -m ruff format `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs`)
 
+asf-regenerate:                   ## Regenerate ASF APIs
+	$(VENV_RUN); python -m localstack.aws.scaffold upgrade
+	@echo 'Removing unused imports from generated modules'
+	$(VENV_RUN); python -m ruff check --select F401 --unsafe-fixes --fix localstack-core/localstack/aws/api/ --config "lint.preview = true"
+	$(VENV_RUN); python -m ruff check --output-format=full --fix localstack-core/localstack/aws/api/
+	$(VENV_RUN); python -m ruff format localstack-core/localstack/aws/api/
+
 init-precommit:    		  ## install te pre-commit hook into your local git repository
 	($(VENV_RUN); pre-commit install)
 
@@ -158,4 +164,4 @@ clean-dist:				  ## Clean up python distribution directories
 	rm -rf dist/ build/
 	rm -rf localstack-core/*.egg-info
 
-.PHONY: usage freeze install-basic install-runtime install-test install-dev install entrypoints dist publish coveralls start docker-run-tests docker-cp-coverage test test-coverage lint lint-modified format format-modified init-precommit clean clean-dist upgrade-pinned-dependencies
+.PHONY: usage freeze install-basic install-runtime install-test install-dev install entrypoints dist publish coveralls start docker-run-tests docker-cp-coverage test test-coverage lint lint-modified format format-modified asf-regenerate init-precommit clean clean-dist upgrade-pinned-dependencies

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.9.3.dev66
+Version: 4.10.1.dev39
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0
@@ -15,6 +15,7 @@ Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: System :: Emulators
 Requires-Python: >=3.10
 License-File: LICENSE.txt
+Requires-Dist: asn1crypto>=1.5.1
 Requires-Dist: click>=7.1
 Requires-Dist: cachetools>=5.0
 Requires-Dist: cryptography
@@ -29,8 +30,8 @@ Requires-Dist: rich>=12.3.0
 Requires-Dist: requests>=2.20.0
 Requires-Dist: semver>=2.10
 Provides-Extra: base-runtime
-Requires-Dist: boto3==1.40.55; extra == "base-runtime"
-Requires-Dist: botocore==1.40.55; extra == "base-runtime"
+Requires-Dist: boto3==1.40.74; extra == "base-runtime"
+Requires-Dist: botocore==1.40.74; extra == "base-runtime"
 Requires-Dist: awscrt!=0.27.1,>=0.13.14; extra == "base-runtime"
 Requires-Dist: cbor2>=5.5.0; extra == "base-runtime"
 Requires-Dist: dnspython>=1.16.0; extra == "base-runtime"
@@ -52,7 +53,7 @@ Requires-Dist: xmltodict>=0.13.0; extra == "base-runtime"
 Requires-Dist: rolo>=0.7; extra == "base-runtime"
 Provides-Extra: runtime
 Requires-Dist: localstack-core[base-runtime]; extra == "runtime"
-Requires-Dist: awscli==1.42.55; extra == "runtime"
+Requires-Dist: awscli==1.42.74; extra == "runtime"
 Requires-Dist: airspeed-ext>=0.6.3; extra == "runtime"
 Requires-Dist: antlr4-python3-runtime==4.13.2; extra == "runtime"
 Requires-Dist: apispec>=5.1.1; extra == "runtime"
@@ -99,5 +100,5 @@ Requires-Dist: rstr>=3.2.0; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Provides-Extra: typehint
 Requires-Dist: localstack-core[dev]; extra == "typehint"
-Requires-Dist: boto3-stubs[acm,acm-pca,amplify,apigateway,apigatewayv2,appconfig,appconfigdata,application-autoscaling,appsync,athena,autoscaling,backup,batch,ce,cloudcontrol,cloudformation,cloudfront,cloudtrail,cloudwatch,codebuild,codecommit,codeconnections,codedeploy,codepipeline,codestar-connections,cognito-identity,cognito-idp,dms,docdb,dynamodb,dynamodbstreams,ec2,ecr,ecs,efs,eks,elasticache,elasticbeanstalk,elbv2,emr,emr-serverless,es,events,firehose,fis,glacier,glue,iam,identitystore,iot,iot-data,iotanalytics,iotwireless,kafka,kinesis,kinesisanalytics,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mediastore,mq,mwaa,neptune,opensearch,organizations,pi,pinpoint,pipes,qldb,qldb-session,rds,rds-data,redshift,redshift-data,resource-groups,resourcegroupstaggingapi,route53,route53resolver,s3,s3control,sagemaker,sagemaker-runtime,secretsmanager,serverlessrepo,servicediscovery,ses,sesv2,sns,sqs,ssm,sso-admin,stepfunctions,sts,timestream-query,timestream-write,transcribe,verifiedpermissions,wafv2,xray]; extra == "typehint"
+Requires-Dist: boto3-stubs[acm,acm-pca,amplify,apigateway,apigatewayv2,appconfig,appconfigdata,application-autoscaling,appsync,athena,autoscaling,backup,batch,ce,cloudcontrol,cloudformation,cloudfront,cloudtrail,cloudwatch,codebuild,codecommit,codeconnections,codedeploy,codepipeline,codestar-connections,cognito-identity,cognito-idp,dms,docdb,dynamodb,dynamodbstreams,ec2,ecr,ecs,efs,eks,elasticache,elasticbeanstalk,elbv2,emr,emr-serverless,es,events,firehose,fis,glacier,glue,iam,identitystore,iot,iot-data,iotanalytics,iotwireless,kafka,kinesis,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mediastore,mq,mwaa,neptune,opensearch,organizations,pi,pinpoint,pipes,rds,rds-data,redshift,redshift-data,resource-groups,resourcegroupstaggingapi,route53,route53resolver,s3,s3control,sagemaker,sagemaker-runtime,secretsmanager,serverlessrepo,servicediscovery,ses,sesv2,sns,sqs,ssm,sso-admin,stepfunctions,sts,timestream-query,timestream-write,transcribe,verifiedpermissions,wafv2,xray]; extra == "typehint"
 Dynamic: license-file

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-:zap: We are thrilled to announce the release of <a href="https://blog.localstack.cloud/localstack-for-aws-release-v-4-9-0/">LocalStack 4.9</a> :zap:
+:zap: We are thrilled to announce the release of <a href="https://blog.localstack.cloud/localstack-for-aws-release-v-4-10-0/">LocalStack 4.10</a> :zap:
 </p>
 
 <p align="center">

{localstack_core-4.9.3.dev66 → localstack_core-4.10.1.dev39}/localstack-core/localstack/aws/api/acm/__init__.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import StrEnum
-from typing import List, Optional, TypedDict
+from typing import TypedDict
 
 from localstack.aws.api import RequestContext, ServiceException, ServiceRequest, handler
 
@@ -261,10 +261,10 @@ class ValidationException(ServiceException):
 
 class Tag(TypedDict, total=False):
     Key: TagKey
-    Value: Optional[TagValue]
+    Value: TagValue | None
 
 
-TagList = List[Tag]
+TagList = list[Tag]
 
 
 class AddTagsToCertificateRequest(ServiceRequest):
@@ -277,29 +277,29 @@ CertificateChainBlob = bytes
 
 
 class CertificateOptions(TypedDict, total=False):
-    CertificateTransparencyLoggingPreference: Optional[CertificateTransparencyLoggingPreference]
-    Export: Optional[CertificateExport]
+    CertificateTransparencyLoggingPreference: CertificateTransparencyLoggingPreference | None
+    Export: CertificateExport | None
 
 
 class ExtendedKeyUsage(TypedDict, total=False):
-    Name: Optional[ExtendedKeyUsageName]
-    OID: Optional[String]
+    Name: ExtendedKeyUsageName | None
+    OID: String | None
 
 
-ExtendedKeyUsageList = List[ExtendedKeyUsage]
+ExtendedKeyUsageList = list[ExtendedKeyUsage]
 
 
 class KeyUsage(TypedDict, total=False):
-    Name: Optional[KeyUsageName]
+    Name: KeyUsageName | None
 
 
-KeyUsageList = List[KeyUsage]
+KeyUsageList = list[KeyUsage]
 TStamp = datetime
 
 
 class HttpRedirect(TypedDict, total=False):
-    RedirectFrom: Optional[String]
-    RedirectTo: Optional[String]
+    RedirectFrom: String | None
+    RedirectTo: String | None
 
 
 class ResourceRecord(TypedDict, total=False):
@@ -308,92 +308,92 @@ class ResourceRecord(TypedDict, total=False):
     Value: String
 
 
-ValidationEmailList = List[String]
+ValidationEmailList = list[String]
 
 
 class DomainValidation(TypedDict, total=False):
     DomainName: DomainNameString
-    ValidationEmails: Optional[ValidationEmailList]
-    ValidationDomain: Optional[DomainNameString]
-    ValidationStatus: Optional[DomainStatus]
-    ResourceRecord: Optional[ResourceRecord]
-    HttpRedirect: Optional[HttpRedirect]
-    ValidationMethod: Optional[ValidationMethod]
+    ValidationEmails: ValidationEmailList | None
+    ValidationDomain: DomainNameString | None
+    ValidationStatus: DomainStatus | None
+    ResourceRecord: ResourceRecord | None
+    HttpRedirect: HttpRedirect | None
+    ValidationMethod: ValidationMethod | None
 
 
-DomainValidationList = List[DomainValidation]
+DomainValidationList = list[DomainValidation]
 
 
 class RenewalSummary(TypedDict, total=False):
     RenewalStatus: RenewalStatus
     DomainValidationOptions: DomainValidationList
-    RenewalStatusReason: Optional[FailureReason]
+    RenewalStatusReason: FailureReason | None
     UpdatedAt: TStamp
 
 
-InUseList = List[String]
-DomainList = List[DomainNameString]
+InUseList = list[String]
+DomainList = list[DomainNameString]
 
 
 class CertificateDetail(TypedDict, total=False):
-    CertificateArn: Optional[Arn]
-    DomainName: Optional[DomainNameString]
-    SubjectAlternativeNames: Optional[DomainList]
-    ManagedBy: Optional[CertificateManagedBy]
-    DomainValidationOptions: Optional[DomainValidationList]
-    Serial: Optional[String]
-    Subject: Optional[String]
-    Issuer: Optional[String]
-    CreatedAt: Optional[TStamp]
-    IssuedAt: Optional[TStamp]
-    ImportedAt: Optional[TStamp]
-    Status: Optional[CertificateStatus]
-    RevokedAt: Optional[TStamp]
-    RevocationReason: Optional[RevocationReason]
-    NotBefore: Optional[TStamp]
-    NotAfter: Optional[TStamp]
-    KeyAlgorithm: Optional[KeyAlgorithm]
-    SignatureAlgorithm: Optional[String]
-    InUseBy: Optional[InUseList]
-    FailureReason: Optional[FailureReason]
-    Type: Optional[CertificateType]
-    RenewalSummary: Optional[RenewalSummary]
-    KeyUsages: Optional[KeyUsageList]
-    ExtendedKeyUsages: Optional[ExtendedKeyUsageList]
-    CertificateAuthorityArn: Optional[Arn]
-    RenewalEligibility: Optional[RenewalEligibility]
-    Options: Optional[CertificateOptions]
-
-
-CertificateStatuses = List[CertificateStatus]
-ExtendedKeyUsageNames = List[ExtendedKeyUsageName]
-KeyUsageNames = List[KeyUsageName]
+    CertificateArn: Arn | None
+    DomainName: DomainNameString | None
+    SubjectAlternativeNames: DomainList | None
+    ManagedBy: CertificateManagedBy | None
+    DomainValidationOptions: DomainValidationList | None
+    Serial: String | None
+    Subject: String | None
+    Issuer: String | None
+    CreatedAt: TStamp | None
+    IssuedAt: TStamp | None
+    ImportedAt: TStamp | None
+    Status: CertificateStatus | None
+    RevokedAt: TStamp | None
+    RevocationReason: RevocationReason | None
+    NotBefore: TStamp | None
+    NotAfter: TStamp | None
+    KeyAlgorithm: KeyAlgorithm | None
+    SignatureAlgorithm: String | None
+    InUseBy: InUseList | None
+    FailureReason: FailureReason | None
+    Type: CertificateType | None
+    RenewalSummary: RenewalSummary | None
+    KeyUsages: KeyUsageList | None
+    ExtendedKeyUsages: ExtendedKeyUsageList | None
+    CertificateAuthorityArn: Arn | None
+    RenewalEligibility: RenewalEligibility | None
+    Options: CertificateOptions | None
+
+
+CertificateStatuses = list[CertificateStatus]
+ExtendedKeyUsageNames = list[ExtendedKeyUsageName]
+KeyUsageNames = list[KeyUsageName]
 
 
 class CertificateSummary(TypedDict, total=False):
-    CertificateArn: Optional[Arn]
-    DomainName: Optional[DomainNameString]
-    SubjectAlternativeNameSummaries: Optional[DomainList]
-    HasAdditionalSubjectAlternativeNames: Optional[NullableBoolean]
-    Status: Optional[CertificateStatus]
-    Type: Optional[CertificateType]
-    KeyAlgorithm: Optional[KeyAlgorithm]
-    KeyUsages: Optional[KeyUsageNames]
-    ExtendedKeyUsages: Optional[ExtendedKeyUsageNames]
-    ExportOption: Optional[CertificateExport]
-    InUse: Optional[NullableBoolean]
-    Exported: Optional[NullableBoolean]
-    RenewalEligibility: Optional[RenewalEligibility]
-    NotBefore: Optional[TStamp]
-    NotAfter: Optional[TStamp]
-    CreatedAt: Optional[TStamp]
-    IssuedAt: Optional[TStamp]
-    ImportedAt: Optional[TStamp]
-    RevokedAt: Optional[TStamp]
-    ManagedBy: Optional[CertificateManagedBy]
-
-
-CertificateSummaryList = List[CertificateSummary]
+    CertificateArn: Arn | None
+    DomainName: DomainNameString | None
+    SubjectAlternativeNameSummaries: DomainList | None
+    HasAdditionalSubjectAlternativeNames: NullableBoolean | None
+    Status: CertificateStatus | None
+    Type: CertificateType | None
+    KeyAlgorithm: KeyAlgorithm | None
+    KeyUsages: KeyUsageNames | None
+    ExtendedKeyUsages: ExtendedKeyUsageNames | None
+    ExportOption: CertificateExport | None
+    InUse: NullableBoolean | None
+    Exported: NullableBoolean | None
+    RenewalEligibility: RenewalEligibility | None
+    NotBefore: TStamp | None
+    NotAfter: TStamp | None
+    CreatedAt: TStamp | None
+    IssuedAt: TStamp | None
+    ImportedAt: TStamp | None
+    RevokedAt: TStamp | None
+    ManagedBy: CertificateManagedBy | None
+
+
+CertificateSummaryList = list[CertificateSummary]
 
 
 class DeleteCertificateRequest(ServiceRequest):
@@ -405,7 +405,7 @@ class DescribeCertificateRequest(ServiceRequest):
 
 
 class DescribeCertificateResponse(TypedDict, total=False):
-    Certificate: Optional[CertificateDetail]
+    Certificate: CertificateDetail | None
 
 
 class DomainValidationOption(TypedDict, total=False):
@@ -413,11 +413,11 @@ class DomainValidationOption(TypedDict, total=False):
     ValidationDomain: DomainNameString
 
 
-DomainValidationOptionList = List[DomainValidationOption]
+DomainValidationOptionList = list[DomainValidationOption]
 
 
 class ExpiryEventsConfiguration(TypedDict, total=False):
-    DaysBeforeExpiry: Optional[PositiveInteger]
+    DaysBeforeExpiry: PositiveInteger | None
 
 
 PassphraseBlob = bytes
@@ -429,26 +429,26 @@ class ExportCertificateRequest(ServiceRequest):
 
 
 class ExportCertificateResponse(TypedDict, total=False):
-    Certificate: Optional[CertificateBody]
-    CertificateChain: Optional[CertificateChain]
-    PrivateKey: Optional[PrivateKey]
+    Certificate: CertificateBody | None
+    CertificateChain: CertificateChain | None
+    PrivateKey: PrivateKey | None
 
 
-ExtendedKeyUsageFilterList = List[ExtendedKeyUsageName]
-KeyAlgorithmList = List[KeyAlgorithm]
-KeyUsageFilterList = List[KeyUsageName]
+ExtendedKeyUsageFilterList = list[ExtendedKeyUsageName]
+KeyAlgorithmList = list[KeyAlgorithm]
+KeyUsageFilterList = list[KeyUsageName]
 
 
 class Filters(TypedDict, total=False):
-    extendedKeyUsage: Optional[ExtendedKeyUsageFilterList]
-    keyUsage: Optional[KeyUsageFilterList]
-    keyTypes: Optional[KeyAlgorithmList]
-    exportOption: Optional[CertificateExport]
-    managedBy: Optional[CertificateManagedBy]
+    extendedKeyUsage: ExtendedKeyUsageFilterList | None
+    keyUsage: KeyUsageFilterList | None
+    keyTypes: KeyAlgorithmList | None
+    exportOption: CertificateExport | None
+    managedBy: CertificateManagedBy | None
 
 
 class GetAccountConfigurationResponse(TypedDict, total=False):
-    ExpiryEvents: Optional[ExpiryEventsConfiguration]
+    ExpiryEvents: ExpiryEventsConfiguration | None
 
 
 class GetCertificateRequest(ServiceRequest):
@@ -456,37 +456,37 @@ class GetCertificateRequest(ServiceRequest):
 
 
 class GetCertificateResponse(TypedDict, total=False):
-    Certificate: Optional[CertificateBody]
-    CertificateChain: Optional[CertificateChain]
+    Certificate: CertificateBody | None
+    CertificateChain: CertificateChain | None
 
 
 PrivateKeyBlob = bytes
 
 
 class ImportCertificateRequest(ServiceRequest):
-    CertificateArn: Optional[Arn]
+    CertificateArn: Arn | None
     Certificate: CertificateBodyBlob
     PrivateKey: PrivateKeyBlob
-    CertificateChain: Optional[CertificateChainBlob]
-    Tags: Optional[TagList]
+    CertificateChain: CertificateChainBlob | None
+    Tags: TagList | None
 
 
 class ImportCertificateResponse(TypedDict, total=False):
-    CertificateArn: Optional[Arn]
+    CertificateArn: Arn | None
 
 
 class ListCertificatesRequest(ServiceRequest):
-    CertificateStatuses: Optional[CertificateStatuses]
-    Includes: Optional[Filters]
-    NextToken: Optional[NextToken]
-    MaxItems: Optional[MaxItems]
-    SortBy: Optional[SortBy]
-    SortOrder: Optional[SortOrder]
+    CertificateStatuses: CertificateStatuses | None
+    Includes: Filters | None
+    NextToken: NextToken | None
+    MaxItems: MaxItems | None
+    SortBy: SortBy | None
+    SortOrder: SortOrder | None
 
 
 class ListCertificatesResponse(TypedDict, total=False):
-    NextToken: Optional[NextToken]
-    CertificateSummaryList: Optional[CertificateSummaryList]
+    NextToken: NextToken | None
+    CertificateSummaryList: CertificateSummaryList | None
 
 
 class ListTagsForCertificateRequest(ServiceRequest):
@@ -494,11 +494,11 @@ class ListTagsForCertificateRequest(ServiceRequest):
 
 
 class ListTagsForCertificateResponse(TypedDict, total=False):
-    Tags: Optional[TagList]
+    Tags: TagList | None
 
 
 class PutAccountConfigurationRequest(ServiceRequest):
-    ExpiryEvents: Optional[ExpiryEventsConfiguration]
+    ExpiryEvents: ExpiryEventsConfiguration | None
     IdempotencyToken: IdempotencyToken
 
 
@@ -513,19 +513,19 @@ class RenewCertificateRequest(ServiceRequest):
 
 class RequestCertificateRequest(ServiceRequest):
     DomainName: DomainNameString
-    ValidationMethod: Optional[ValidationMethod]
-    SubjectAlternativeNames: Optional[DomainList]
-    IdempotencyToken: Optional[IdempotencyToken]
-    DomainValidationOptions: Optional[DomainValidationOptionList]
-    Options: Optional[CertificateOptions]
-    CertificateAuthorityArn: Optional[PcaArn]
-    Tags: Optional[TagList]
-    KeyAlgorithm: Optional[KeyAlgorithm]
-    ManagedBy: Optional[CertificateManagedBy]
+    ValidationMethod: ValidationMethod | None
+    SubjectAlternativeNames: DomainList | None
+    IdempotencyToken: IdempotencyToken | None
+    DomainValidationOptions: DomainValidationOptionList | None
+    Options: CertificateOptions | None
+    CertificateAuthorityArn: PcaArn | None
+    Tags: TagList | None
+    KeyAlgorithm: KeyAlgorithm | None
+    ManagedBy: CertificateManagedBy | None
 
 
 class RequestCertificateResponse(TypedDict, total=False):
-    CertificateArn: Optional[Arn]
+    CertificateArn: Arn | None
 
 
 class ResendValidationEmailRequest(ServiceRequest):
@@ -540,7 +540,7 @@ class RevokeCertificateRequest(ServiceRequest):
 
 
 class RevokeCertificateResponse(TypedDict, total=False):
-    CertificateArn: Optional[Arn]
+    CertificateArn: Arn | None
 
 
 class UpdateCertificateOptionsRequest(ServiceRequest):
@@ -549,8 +549,8 @@ class UpdateCertificateOptionsRequest(ServiceRequest):
 
 
 class AcmApi:
-    service = "acm"
-    version = "2015-12-08"
+    service: str = "acm"
+    version: str = "2015-12-08"
 
     @handler("AddTagsToCertificate")
     def add_tags_to_certificate(