Skip to content

Commit c491303

Browse files
MEPalmaMEPalma
committed
conflicts, providers
2 parents 6e6407c + b164a71 commit c491303

File tree

31 files changed

+483
-353
lines changed

31 files changed

+483
-353
lines changed

‎localstack/aws/api/ec2/__init__.py‎

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3168,7 +3168,7 @@ class AcceptVpcEndpointConnectionsResult(TypedDict, total=False):
31683168

31693169
class AcceptVpcPeeringConnectionRequest(ServiceRequest):
31703170
DryRun: Optional[Boolean]
3171-
VpcPeeringConnectionId: Optional[VpcPeeringConnectionIdWithResolver]
3171+
VpcPeeringConnectionId: VpcPeeringConnectionIdWithResolver
31723172

31733173

31743174
class VpcPeeringConnectionStateReason(TypedDict, total=False):
@@ -3799,8 +3799,8 @@ class AssociateDhcpOptionsRequest(ServiceRequest):
37993799

38003800

38013801
class AssociateEnclaveCertificateIamRoleRequest(ServiceRequest):
3802-
CertificateArn: Optional[CertificateId]
3803-
RoleArn: Optional[RoleId]
3802+
CertificateArn: CertificateId
3803+
RoleArn: RoleId
38043804
DryRun: Optional[Boolean]
38053805

38063806

@@ -3963,9 +3963,9 @@ class AssociateSubnetCidrBlockResult(TypedDict, total=False):
39633963

39643964

39653965
class AssociateTransitGatewayMulticastDomainRequest(ServiceRequest):
3966-
TransitGatewayMulticastDomainId: Optional[TransitGatewayMulticastDomainId]
3967-
TransitGatewayAttachmentId: Optional[TransitGatewayAttachmentId]
3968-
SubnetIds: Optional[TransitGatewaySubnetIdList]
3966+
TransitGatewayMulticastDomainId: TransitGatewayMulticastDomainId
3967+
TransitGatewayAttachmentId: TransitGatewayAttachmentId
3968+
SubnetIds: TransitGatewaySubnetIdList
39693969
DryRun: Optional[Boolean]
39703970

39713971

@@ -8076,7 +8076,7 @@ class CreateVpcPeeringConnectionRequest(ServiceRequest):
80768076
DryRun: Optional[Boolean]
80778077
PeerOwnerId: Optional[String]
80788078
PeerVpcId: Optional[String]
8079-
VpcId: Optional[VpcId]
8079+
VpcId: VpcId
80808080
PeerRegion: Optional[String]
80818081
TagSpecifications: Optional[TagSpecificationList]
80828082

@@ -13524,8 +13524,8 @@ class DisassociateClientVpnTargetNetworkResult(TypedDict, total=False):
1352413524

1352513525

1352613526
class DisassociateEnclaveCertificateIamRoleRequest(ServiceRequest):
13527-
CertificateArn: Optional[CertificateId]
13528-
RoleArn: Optional[RoleId]
13527+
CertificateArn: CertificateId
13528+
RoleArn: RoleId
1352913529
DryRun: Optional[Boolean]
1353013530

1353113531

@@ -13596,9 +13596,9 @@ class DisassociateSubnetCidrBlockResult(TypedDict, total=False):
1359613596

1359713597

1359813598
class DisassociateTransitGatewayMulticastDomainRequest(ServiceRequest):
13599-
TransitGatewayMulticastDomainId: Optional[TransitGatewayMulticastDomainId]
13600-
TransitGatewayAttachmentId: Optional[TransitGatewayAttachmentId]
13601-
SubnetIds: Optional[TransitGatewaySubnetIdList]
13599+
TransitGatewayMulticastDomainId: TransitGatewayMulticastDomainId
13600+
TransitGatewayAttachmentId: TransitGatewayAttachmentId
13601+
SubnetIds: TransitGatewaySubnetIdList
1360213602
DryRun: Optional[Boolean]
1360313603

1360413604

@@ -13935,7 +13935,7 @@ class ExportTransitGatewayRoutesResult(TypedDict, total=False):
1393513935

1393613936

1393713937
class GetAssociatedEnclaveCertificateIamRolesRequest(ServiceRequest):
13938-
CertificateArn: Optional[CertificateId]
13938+
CertificateArn: CertificateId
1393913939
DryRun: Optional[Boolean]
1394013940

1394113941

@@ -14536,7 +14536,7 @@ class GetTransitGatewayAttachmentPropagationsResult(TypedDict, total=False):
1453614536

1453714537

1453814538
class GetTransitGatewayMulticastDomainAssociationsRequest(ServiceRequest):
14539-
TransitGatewayMulticastDomainId: Optional[TransitGatewayMulticastDomainId]
14539+
TransitGatewayMulticastDomainId: TransitGatewayMulticastDomainId
1454014540
Filters: Optional[FilterList]
1454114541
MaxResults: Optional[TransitGatewayMaxResults]
1454214542
NextToken: Optional[String]
@@ -14951,7 +14951,7 @@ class InstanceBlockDeviceMappingSpecification(TypedDict, total=False):
1495114951

1495214952

1495314953
class InstanceCreditSpecificationRequest(TypedDict, total=False):
14954-
InstanceId: Optional[InstanceId]
14954+
InstanceId: InstanceId
1495514955
CpuCredits: Optional[String]
1495614956

1495714957

@@ -15510,7 +15510,7 @@ class ModifyNetworkInterfaceAttributeRequest(ServiceRequest):
1551015510

1551115511
class ModifyPrivateDnsNameOptionsRequest(ServiceRequest):
1551215512
DryRun: Optional[Boolean]
15513-
InstanceId: Optional[InstanceId]
15513+
InstanceId: InstanceId
1551415514
PrivateDnsHostnameType: Optional[HostnameType]
1551515515
EnableResourceNameDnsARecord: Optional[Boolean]
1551615516
EnableResourceNameDnsAAAARecord: Optional[Boolean]
@@ -15545,7 +15545,7 @@ class SecurityGroupRuleRequest(TypedDict, total=False):
1554515545

1554615546

1554715547
class SecurityGroupRuleUpdate(TypedDict, total=False):
15548-
SecurityGroupRuleId: Optional[SecurityGroupRuleId]
15548+
SecurityGroupRuleId: SecurityGroupRuleId
1554915549
SecurityGroupRule: Optional[SecurityGroupRuleRequest]
1555015550

1555115551

@@ -16228,9 +16228,9 @@ class RegisterInstanceEventNotificationAttributesResult(TypedDict, total=False):
1622816228

1622916229

1623016230
class RegisterTransitGatewayMulticastGroupMembersRequest(ServiceRequest):
16231-
TransitGatewayMulticastDomainId: Optional[TransitGatewayMulticastDomainId]
16231+
TransitGatewayMulticastDomainId: TransitGatewayMulticastDomainId
1623216232
GroupIpAddress: Optional[String]
16233-
NetworkInterfaceIds: Optional[TransitGatewayNetworkInterfaceIdList]
16233+
NetworkInterfaceIds: TransitGatewayNetworkInterfaceIdList
1623416234
DryRun: Optional[Boolean]
1623516235

1623616236

@@ -16245,9 +16245,9 @@ class RegisterTransitGatewayMulticastGroupMembersResult(TypedDict, total=False):
1624516245

1624616246

1624716247
class RegisterTransitGatewayMulticastGroupSourcesRequest(ServiceRequest):
16248-
TransitGatewayMulticastDomainId: Optional[TransitGatewayMulticastDomainId]
16248+
TransitGatewayMulticastDomainId: TransitGatewayMulticastDomainId
1624916249
GroupIpAddress: Optional[String]
16250-
NetworkInterfaceIds: Optional[TransitGatewayNetworkInterfaceIdList]
16250+
NetworkInterfaceIds: TransitGatewayNetworkInterfaceIdList
1625116251
DryRun: Optional[Boolean]
1625216252

1625316253

@@ -16783,7 +16783,7 @@ class SearchLocalGatewayRoutesResult(TypedDict, total=False):
1678316783

1678416784

1678516785
class SearchTransitGatewayMulticastGroupsRequest(ServiceRequest):
16786-
TransitGatewayMulticastDomainId: Optional[TransitGatewayMulticastDomainId]
16786+
TransitGatewayMulticastDomainId: TransitGatewayMulticastDomainId
1678716787
Filters: Optional[FilterList]
1678816788
MaxResults: Optional[TransitGatewayMaxResults]
1678916789
NextToken: Optional[String]
@@ -17065,8 +17065,8 @@ def accept_vpc_endpoint_connections(
1706517065
def accept_vpc_peering_connection(
1706617066
self,
1706717067
context: RequestContext,
17068+
vpc_peering_connection_id: VpcPeeringConnectionIdWithResolver,
1706817069
dry_run: Boolean = None,
17069-
vpc_peering_connection_id: VpcPeeringConnectionIdWithResolver = None,
1707017070
) -> AcceptVpcPeeringConnectionResult:
1707117071
raise NotImplementedError
1707217072

@@ -17207,8 +17207,8 @@ def associate_dhcp_options(
1720717207
def associate_enclave_certificate_iam_role(
1720817208
self,
1720917209
context: RequestContext,
17210-
certificate_arn: CertificateId = None,
17211-
role_arn: RoleId = None,
17210+
certificate_arn: CertificateId,
17211+
role_arn: RoleId,
1721217212
dry_run: Boolean = None,
1721317213
) -> AssociateEnclaveCertificateIamRoleResult:
1721417214
raise NotImplementedError
@@ -17276,9 +17276,9 @@ def associate_subnet_cidr_block(
1727617276
def associate_transit_gateway_multicast_domain(
1727717277
self,
1727817278
context: RequestContext,
17279-
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId = None,
17280-
transit_gateway_attachment_id: TransitGatewayAttachmentId = None,
17281-
subnet_ids: TransitGatewaySubnetIdList = None,
17279+
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId,
17280+
transit_gateway_attachment_id: TransitGatewayAttachmentId,
17281+
subnet_ids: TransitGatewaySubnetIdList,
1728217282
dry_run: Boolean = None,
1728317283
) -> AssociateTransitGatewayMulticastDomainResult:
1728417284
raise NotImplementedError
@@ -18631,10 +18631,10 @@ def create_vpc_endpoint_service_configuration(
1863118631
def create_vpc_peering_connection(
1863218632
self,
1863318633
context: RequestContext,
18634+
vpc_id: VpcId,
1863418635
dry_run: Boolean = None,
1863518636
peer_owner_id: String = None,
1863618637
peer_vpc_id: String = None,
18637-
vpc_id: VpcId = None,
1863818638
peer_region: String = None,
1863918639
tag_specifications: TagSpecificationList = None,
1864018640
) -> CreateVpcPeeringConnectionResult:
@@ -21195,8 +21195,8 @@ def disassociate_client_vpn_target_network(
2119521195
def disassociate_enclave_certificate_iam_role(
2119621196
self,
2119721197
context: RequestContext,
21198-
certificate_arn: CertificateId = None,
21199-
role_arn: RoleId = None,
21198+
certificate_arn: CertificateId,
21199+
role_arn: RoleId,
2120021200
dry_run: Boolean = None,
2120121201
) -> DisassociateEnclaveCertificateIamRoleResult:
2120221202
raise NotImplementedError
@@ -21256,9 +21256,9 @@ def disassociate_subnet_cidr_block(
2125621256
def disassociate_transit_gateway_multicast_domain(
2125721257
self,
2125821258
context: RequestContext,
21259-
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId = None,
21260-
transit_gateway_attachment_id: TransitGatewayAttachmentId = None,
21261-
subnet_ids: TransitGatewaySubnetIdList = None,
21259+
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId,
21260+
transit_gateway_attachment_id: TransitGatewayAttachmentId,
21261+
subnet_ids: TransitGatewaySubnetIdList,
2126221262
dry_run: Boolean = None,
2126321263
) -> DisassociateTransitGatewayMulticastDomainResult:
2126421264
raise NotImplementedError
@@ -21463,10 +21463,7 @@ def export_transit_gateway_routes(
2146321463

2146421464
@handler("GetAssociatedEnclaveCertificateIamRoles")
2146521465
def get_associated_enclave_certificate_iam_roles(
21466-
self,
21467-
context: RequestContext,
21468-
certificate_arn: CertificateId = None,
21469-
dry_run: Boolean = None,
21466+
self, context: RequestContext, certificate_arn: CertificateId, dry_run: Boolean = None
2147021467
) -> GetAssociatedEnclaveCertificateIamRolesResult:
2147121468
raise NotImplementedError
2147221469

@@ -21803,7 +21800,7 @@ def get_transit_gateway_attachment_propagations(
2180321800
def get_transit_gateway_multicast_domain_associations(
2180421801
self,
2180521802
context: RequestContext,
21806-
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId = None,
21803+
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId,
2180721804
filters: FilterList = None,
2180821805
max_results: TransitGatewayMaxResults = None,
2180921806
next_token: String = None,
@@ -22397,8 +22394,8 @@ def modify_network_interface_attribute(
2239722394
def modify_private_dns_name_options(
2239822395
self,
2239922396
context: RequestContext,
22397+
instance_id: InstanceId,
2240022398
dry_run: Boolean = None,
22401-
instance_id: InstanceId = None,
2240222399
private_dns_hostname_type: HostnameType = None,
2240322400
enable_resource_name_dns_a_record: Boolean = None,
2240422401
enable_resource_name_dns_aaaa_record: Boolean = None,
@@ -22949,9 +22946,9 @@ def register_instance_event_notification_attributes(
2294922946
def register_transit_gateway_multicast_group_members(
2295022947
self,
2295122948
context: RequestContext,
22952-
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId = None,
22949+
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId,
22950+
network_interface_ids: TransitGatewayNetworkInterfaceIdList,
2295322951
group_ip_address: String = None,
22954-
network_interface_ids: TransitGatewayNetworkInterfaceIdList = None,
2295522952
dry_run: Boolean = None,
2295622953
) -> RegisterTransitGatewayMulticastGroupMembersResult:
2295722954
raise NotImplementedError
@@ -22960,9 +22957,9 @@ def register_transit_gateway_multicast_group_members(
2296022957
def register_transit_gateway_multicast_group_sources(
2296122958
self,
2296222959
context: RequestContext,
22963-
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId = None,
22960+
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId,
22961+
network_interface_ids: TransitGatewayNetworkInterfaceIdList,
2296422962
group_ip_address: String = None,
22965-
network_interface_ids: TransitGatewayNetworkInterfaceIdList = None,
2296622963
dry_run: Boolean = None,
2296722964
) -> RegisterTransitGatewayMulticastGroupSourcesResult:
2296822965
raise NotImplementedError
@@ -23382,7 +23379,7 @@ def search_local_gateway_routes(
2338223379
def search_transit_gateway_multicast_groups(
2338323380
self,
2338423381
context: RequestContext,
23385-
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId = None,
23382+
transit_gateway_multicast_domain_id: TransitGatewayMulticastDomainId,
2338623383
filters: FilterList = None,
2338723384
max_results: TransitGatewayMaxResults = None,
2338823385
next_token: String = None,

‎localstack/aws/api/s3/__init__.py‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,11 +2253,6 @@ class ListBucketMetricsConfigurationsRequest(ServiceRequest):
22532253
ExpectedBucketOwner: Optional[AccountId]
22542254

22552255

2256-
class ListBucketsOutput(TypedDict, total=False):
2257-
Buckets: Optional[Buckets]
2258-
Owner: Optional[Owner]
2259-
2260-
22612256
class MultipartUpload(TypedDict, total=False):
22622257
UploadId: Optional[MultipartUploadId]
22632258
Key: Optional[ObjectKey]
@@ -2339,6 +2334,17 @@ class ListObjectVersionsRequest(ServiceRequest):
23392334
ExpectedBucketOwner: Optional[AccountId]
23402335

23412336

2337+
class ListObjectsRequest(ServiceRequest):
2338+
Bucket: BucketName
2339+
Delimiter: Optional[Delimiter]
2340+
EncodingType: Optional[EncodingType]
2341+
Marker: Optional[Marker]
2342+
MaxKeys: Optional[MaxKeys]
2343+
Prefix: Optional[Prefix]
2344+
RequestPayer: Optional[RequestPayer]
2345+
ExpectedBucketOwner: Optional[AccountId]
2346+
2347+
23422348
class Object(TypedDict, total=False):
23432349
Key: Optional[ObjectKey]
23442350
LastModified: Optional[LastModified]
@@ -2352,31 +2358,6 @@ class Object(TypedDict, total=False):
23522358
ObjectList = List[Object]
23532359

23542360

2355-
class ListObjectsOutput(TypedDict, total=False):
2356-
IsTruncated: Optional[IsTruncated]
2357-
Marker: Optional[Marker]
2358-
NextMarker: Optional[NextMarker]
2359-
Contents: Optional[ObjectList]
2360-
Name: Optional[BucketName]
2361-
Prefix: Optional[Prefix]
2362-
Delimiter: Optional[Delimiter]
2363-
MaxKeys: Optional[MaxKeys]
2364-
CommonPrefixes: Optional[CommonPrefixList]
2365-
EncodingType: Optional[EncodingType]
2366-
BucketRegion: Optional[BucketRegion]
2367-
2368-
2369-
class ListObjectsRequest(ServiceRequest):
2370-
Bucket: BucketName
2371-
Delimiter: Optional[Delimiter]
2372-
EncodingType: Optional[EncodingType]
2373-
Marker: Optional[Marker]
2374-
MaxKeys: Optional[MaxKeys]
2375-
Prefix: Optional[Prefix]
2376-
RequestPayer: Optional[RequestPayer]
2377-
ExpectedBucketOwner: Optional[AccountId]
2378-
2379-
23802361
class ListObjectsV2Output(TypedDict, total=False):
23812362
IsTruncated: Optional[IsTruncated]
23822363
Contents: Optional[ObjectList]
@@ -3097,6 +3078,25 @@ class PostResponse(TypedDict, total=False):
30973078
RequestCharged: Optional[RequestCharged]
30983079

30993080

3081+
class ListAllMyBucketsResult(TypedDict, total=False):
3082+
Buckets: Optional[Buckets]
3083+
Owner: Optional[Owner]
3084+
3085+
3086+
class ListBucketResult(TypedDict, total=False):
3087+
IsTruncated: Optional[IsTruncated]
3088+
Marker: Optional[Marker]
3089+
NextMarker: Optional[NextMarker]
3090+
Contents: Optional[ObjectList]
3091+
Name: Optional[BucketName]
3092+
Prefix: Optional[Prefix]
3093+
Delimiter: Optional[Delimiter]
3094+
MaxKeys: Optional[MaxKeys]
3095+
CommonPrefixes: Optional[CommonPrefixList]
3096+
EncodingType: Optional[EncodingType]
3097+
BucketRegion: Optional[BucketRegion]
3098+
3099+
31003100
class S3Api:
31013101

31023102
service = "s3"
@@ -3700,7 +3700,7 @@ def list_bucket_metrics_configurations(
37003700
def list_buckets(
37013701
self,
37023702
context: RequestContext,
3703-
) -> ListBucketsOutput:
3703+
) -> ListAllMyBucketsResult:
37043704
raise NotImplementedError
37053705

37063706
@handler("ListMultipartUploads")
@@ -3745,7 +3745,7 @@ def list_objects(
37453745
prefix: Prefix = None,
37463746
request_payer: RequestPayer = None,
37473747
expected_bucket_owner: AccountId = None,
3748-
) -> ListObjectsOutput:
3748+
) -> ListBucketResult:
37493749
raise NotImplementedError
37503750

37513751
@handler("ListObjectsV2")

0 commit comments

Comments
 (0)