Skip to content

Commit d46cf41

Browse files
Update ASF APIs (#12859)
Co-authored-by: LocalStack Bot <[email protected]>
1 parent bf54841 commit d46cf41

File tree

7 files changed

+138
-17
lines changed

7 files changed

+138
-17
lines changed

localstack-core/localstack/aws/api/ec2/__init__.py

Lines changed: 122 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
BurstablePerformanceFlag = bool
3232
CancelCapacityReservationFleetErrorCode = str
3333
CancelCapacityReservationFleetErrorMessage = str
34+
CapacityBlockId = str
3435
CapacityReservationFleetId = str
3536
CapacityReservationId = str
3637
CarrierGatewayId = str
@@ -67,6 +68,8 @@
6768
DescribeByoipCidrsMaxResults = int
6869
DescribeCapacityBlockExtensionOfferingsMaxResults = int
6970
DescribeCapacityBlockOfferingsMaxResults = int
71+
DescribeCapacityBlockStatusMaxResults = int
72+
DescribeCapacityBlocksMaxResults = int
7073
DescribeCapacityReservationBillingRequestsRequestMaxResults = int
7174
DescribeCapacityReservationFleetsMaxResults = int
7275
DescribeCapacityReservationsMaxResults = int
@@ -679,6 +682,23 @@ class CapacityBlockExtensionStatus(StrEnum):
679682
payment_succeeded = "payment-succeeded"
680683

681684

685+
class CapacityBlockInterconnectStatus(StrEnum):
686+
ok = "ok"
687+
impaired = "impaired"
688+
insufficient_data = "insufficient-data"
689+
690+
691+
class CapacityBlockResourceState(StrEnum):
692+
active = "active"
693+
expired = "expired"
694+
unavailable = "unavailable"
695+
cancelled = "cancelled"
696+
failed = "failed"
697+
scheduled = "scheduled"
698+
payment_pending = "payment-pending"
699+
payment_failed = "payment-failed"
700+
701+
682702
class CapacityReservationBillingRequestStatus(StrEnum):
683703
pending = "pending"
684704
accepted = "accepted"
@@ -744,6 +764,7 @@ class CapacityReservationState(StrEnum):
744764
assessing = "assessing"
745765
delayed = "delayed"
746766
unsupported = "unsupported"
767+
unavailable = "unavailable"
747768

748769

749770
class CapacityReservationTenancy(StrEnum):
@@ -3154,6 +3175,7 @@ class ResourceType(StrEnum):
31543175
instance_connect_endpoint = "instance-connect-endpoint"
31553176
verified_access_endpoint_target = "verified-access-endpoint-target"
31563177
ipam_external_resource_verification_token = "ipam-external-resource-verification-token"
3178+
capacity_block = "capacity-block"
31573179
mac_modification_task = "mac-modification-task"
31583180

31593181

@@ -5992,6 +6014,20 @@ class CapacityAllocation(TypedDict, total=False):
59926014

59936015

59946016
CapacityAllocations = List[CapacityAllocation]
6017+
CapacityReservationIdSet = List[CapacityReservationId]
6018+
6019+
6020+
class CapacityBlock(TypedDict, total=False):
6021+
CapacityBlockId: Optional[CapacityBlockId]
6022+
UltraserverType: Optional[String]
6023+
AvailabilityZone: Optional[String]
6024+
AvailabilityZoneId: Optional[String]
6025+
CapacityReservationIds: Optional[CapacityReservationIdSet]
6026+
StartDate: Optional[MillisecondDateTime]
6027+
EndDate: Optional[MillisecondDateTime]
6028+
CreateDate: Optional[MillisecondDateTime]
6029+
State: Optional[CapacityBlockResourceState]
6030+
Tags: Optional[TagList]
59956031

59966032

59976033
class CapacityBlockExtension(TypedDict, total=False):
@@ -6027,6 +6063,7 @@ class CapacityBlockExtensionOffering(TypedDict, total=False):
60276063

60286064
CapacityBlockExtensionOfferingSet = List[CapacityBlockExtensionOffering]
60296065
CapacityBlockExtensionSet = List[CapacityBlockExtension]
6066+
CapacityBlockIds = List[CapacityBlockId]
60306067

60316068

60326069
class CapacityBlockOffering(TypedDict, total=False):
@@ -6040,10 +6077,35 @@ class CapacityBlockOffering(TypedDict, total=False):
60406077
UpfrontFee: Optional[String]
60416078
CurrencyCode: Optional[String]
60426079
Tenancy: Optional[CapacityReservationTenancy]
6080+
UltraserverType: Optional[String]
6081+
UltraserverCount: Optional[BoxedInteger]
60436082
CapacityBlockDurationMinutes: Optional[Integer]
60446083

60456084

60466085
CapacityBlockOfferingSet = List[CapacityBlockOffering]
6086+
CapacityBlockSet = List[CapacityBlock]
6087+
6088+
6089+
class CapacityReservationStatus(TypedDict, total=False):
6090+
CapacityReservationId: Optional[CapacityReservationId]
6091+
TotalCapacity: Optional[Integer]
6092+
TotalAvailableCapacity: Optional[Integer]
6093+
TotalUnavailableCapacity: Optional[Integer]
6094+
6095+
6096+
CapacityReservationStatusSet = List[CapacityReservationStatus]
6097+
6098+
6099+
class CapacityBlockStatus(TypedDict, total=False):
6100+
CapacityBlockId: Optional[CapacityBlockId]
6101+
InterconnectStatus: Optional[CapacityBlockInterconnectStatus]
6102+
TotalCapacity: Optional[Integer]
6103+
TotalAvailableCapacity: Optional[Integer]
6104+
TotalUnavailableCapacity: Optional[Integer]
6105+
CapacityReservationStatuses: Optional[CapacityReservationStatusSet]
6106+
6107+
6108+
CapacityBlockStatusSet = List[CapacityBlockStatus]
60476109

60486110

60496111
class CapacityReservationCommitmentInfo(TypedDict, total=False):
@@ -6079,6 +6141,7 @@ class CapacityReservation(TypedDict, total=False):
60796141
UnusedReservationBillingOwnerId: Optional[AccountID]
60806142
CommitmentInfo: Optional[CapacityReservationCommitmentInfo]
60816143
DeliveryPreference: Optional[CapacityReservationDeliveryPreference]
6144+
CapacityBlockId: Optional[CapacityBlockId]
60826145

60836146

60846147
class CapacityReservationInfo(TypedDict, total=False):
@@ -6143,7 +6206,6 @@ class CapacityReservationGroup(TypedDict, total=False):
61436206

61446207

61456208
CapacityReservationGroupSet = List[CapacityReservationGroup]
6146-
CapacityReservationIdSet = List[CapacityReservationId]
61476209

61486210

61496211
class CapacityReservationOptions(TypedDict, total=False):
@@ -11583,13 +11645,41 @@ class DescribeCapacityBlockOfferingsRequest(ServiceRequest):
1158311645
CapacityDurationHours: Integer
1158411646
NextToken: Optional[String]
1158511647
MaxResults: Optional[DescribeCapacityBlockOfferingsMaxResults]
11648+
UltraserverType: Optional[String]
11649+
UltraserverCount: Optional[Integer]
1158611650

1158711651

1158811652
class DescribeCapacityBlockOfferingsResult(TypedDict, total=False):
1158911653
CapacityBlockOfferings: Optional[CapacityBlockOfferingSet]
1159011654
NextToken: Optional[String]
1159111655

1159211656

11657+
class DescribeCapacityBlockStatusRequest(ServiceRequest):
11658+
CapacityBlockIds: Optional[CapacityBlockIds]
11659+
NextToken: Optional[String]
11660+
MaxResults: Optional[DescribeCapacityBlockStatusMaxResults]
11661+
Filters: Optional[FilterList]
11662+
DryRun: Optional[Boolean]
11663+
11664+
11665+
class DescribeCapacityBlockStatusResult(TypedDict, total=False):
11666+
CapacityBlockStatuses: Optional[CapacityBlockStatusSet]
11667+
NextToken: Optional[String]
11668+
11669+
11670+
class DescribeCapacityBlocksRequest(ServiceRequest):
11671+
CapacityBlockIds: Optional[CapacityBlockIds]
11672+
NextToken: Optional[String]
11673+
MaxResults: Optional[DescribeCapacityBlocksMaxResults]
11674+
Filters: Optional[FilterList]
11675+
DryRun: Optional[Boolean]
11676+
11677+
11678+
class DescribeCapacityBlocksResult(TypedDict, total=False):
11679+
CapacityBlocks: Optional[CapacityBlockSet]
11680+
NextToken: Optional[String]
11681+
11682+
1159311683
class DescribeCapacityReservationBillingRequestsRequest(ServiceRequest):
1159411684
CapacityReservationIds: Optional[CapacityReservationIdSet]
1159511685
Role: CallerRole
@@ -12803,6 +12893,7 @@ class InstanceTopology(TypedDict, total=False):
1280312893
NetworkNodes: Optional[NetworkNodesList]
1280412894
AvailabilityZone: Optional[String]
1280512895
ZoneId: Optional[String]
12896+
CapacityBlockId: Optional[String]
1280612897

1280712898

1280812899
InstanceSet = List[InstanceTopology]
@@ -13296,6 +13387,7 @@ class Instance(TypedDict, total=False):
1329613387
Tags: Optional[TagList]
1329713388
VirtualizationType: Optional[VirtualizationType]
1329813389
CpuOptions: Optional[CpuOptions]
13390+
CapacityBlockId: Optional[String]
1329913391
CapacityReservationId: Optional[String]
1330013392
CapacityReservationSpecification: Optional[CapacityReservationSpecificationResponse]
1330113393
HibernationOptions: Optional[HibernationOptions]
@@ -19692,6 +19784,7 @@ class PurchaseCapacityBlockRequest(ServiceRequest):
1969219784

1969319785
class PurchaseCapacityBlockResult(TypedDict, total=False):
1969419786
CapacityReservation: Optional[CapacityReservation]
19787+
CapacityBlocks: Optional[CapacityBlockSet]
1969519788

1969619789

1969719790
class PurchaseHostReservationRequest(ServiceRequest):
@@ -23758,10 +23851,38 @@ def describe_capacity_block_offerings(
2375823851
end_date_range: MillisecondDateTime | None = None,
2375923852
next_token: String | None = None,
2376023853
max_results: DescribeCapacityBlockOfferingsMaxResults | None = None,
23854+
ultraserver_type: String | None = None,
23855+
ultraserver_count: Integer | None = None,
2376123856
**kwargs,
2376223857
) -> DescribeCapacityBlockOfferingsResult:
2376323858
raise NotImplementedError
2376423859

23860+
@handler("DescribeCapacityBlockStatus")
23861+
def describe_capacity_block_status(
23862+
self,
23863+
context: RequestContext,
23864+
capacity_block_ids: CapacityBlockIds | None = None,
23865+
next_token: String | None = None,
23866+
max_results: DescribeCapacityBlockStatusMaxResults | None = None,
23867+
filters: FilterList | None = None,
23868+
dry_run: Boolean | None = None,
23869+
**kwargs,
23870+
) -> DescribeCapacityBlockStatusResult:
23871+
raise NotImplementedError
23872+
23873+
@handler("DescribeCapacityBlocks")
23874+
def describe_capacity_blocks(
23875+
self,
23876+
context: RequestContext,
23877+
capacity_block_ids: CapacityBlockIds | None = None,
23878+
next_token: String | None = None,
23879+
max_results: DescribeCapacityBlocksMaxResults | None = None,
23880+
filters: FilterList | None = None,
23881+
dry_run: Boolean | None = None,
23882+
**kwargs,
23883+
) -> DescribeCapacityBlocksResult:
23884+
raise NotImplementedError
23885+
2376523886
@handler("DescribeCapacityReservationBillingRequests")
2376623887
def describe_capacity_reservation_billing_requests(
2376723888
self,

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ Issues = "https://github.com/localstack/localstack/issues"
5353
# minimal required to actually run localstack on the host for services natively implemented in python
5454
base-runtime = [
5555
# pinned / updated by ASF update action
56-
"boto3==1.39.3",
56+
"boto3==1.39.4",
5757
# pinned / updated by ASF update action
58-
"botocore==1.39.3",
58+
"botocore==1.39.4",
5959
"awscrt>=0.13.14,!=0.27.1",
6060
"cbor2>=5.5.0",
6161
"dnspython>=1.16.0",

requirements-base-runtime.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ attrs==25.3.0
1111
# referencing
1212
awscrt==0.27.4
1313
# via localstack-core (pyproject.toml)
14-
boto3==1.39.3
14+
boto3==1.39.4
1515
# via localstack-core (pyproject.toml)
16-
botocore==1.39.3
16+
botocore==1.39.4
1717
# via
1818
# boto3
1919
# localstack-core (pyproject.toml)

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ aws-sam-translator==1.99.0
3939
# localstack-core
4040
aws-xray-sdk==2.14.0
4141
# via moto-ext
42-
awscli==1.41.3
42+
awscli==1.41.4
4343
# via localstack-core
4444
awscrt==0.27.4
4545
# via localstack-core
46-
boto3==1.39.3
46+
boto3==1.39.4
4747
# via
4848
# aws-sam-translator
4949
# kclpy-ext
5050
# localstack-core
5151
# moto-ext
52-
botocore==1.39.3
52+
botocore==1.39.4
5353
# via
5454
# aws-xray-sdk
5555
# awscli

requirements-runtime.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ aws-sam-translator==1.99.0
2727
# localstack-core (pyproject.toml)
2828
aws-xray-sdk==2.14.0
2929
# via moto-ext
30-
awscli==1.41.3
30+
awscli==1.41.4
3131
# via localstack-core (pyproject.toml)
3232
awscrt==0.27.4
3333
# via localstack-core
34-
boto3==1.39.3
34+
boto3==1.39.4
3535
# via
3636
# aws-sam-translator
3737
# kclpy-ext
3838
# localstack-core
3939
# moto-ext
40-
botocore==1.39.3
40+
botocore==1.39.4
4141
# via
4242
# aws-xray-sdk
4343
# awscli

requirements-test.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ aws-sam-translator==1.99.0
3939
# localstack-core
4040
aws-xray-sdk==2.14.0
4141
# via moto-ext
42-
awscli==1.41.3
42+
awscli==1.41.4
4343
# via localstack-core
4444
awscrt==0.27.4
4545
# via localstack-core
46-
boto3==1.39.3
46+
boto3==1.39.4
4747
# via
4848
# aws-sam-translator
4949
# kclpy-ext
5050
# localstack-core
5151
# moto-ext
52-
botocore==1.39.3
52+
botocore==1.39.4
5353
# via
5454
# aws-xray-sdk
5555
# awscli

requirements-typehint.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ aws-sam-translator==1.99.0
3939
# localstack-core
4040
aws-xray-sdk==2.14.0
4141
# via moto-ext
42-
awscli==1.41.3
42+
awscli==1.41.4
4343
# via localstack-core
4444
awscrt==0.27.4
4545
# via localstack-core
46-
boto3==1.39.3
46+
boto3==1.39.4
4747
# via
4848
# aws-sam-translator
4949
# kclpy-ext
5050
# localstack-core
5151
# moto-ext
5252
boto3-stubs==1.39.3
5353
# via localstack-core (pyproject.toml)
54-
botocore==1.39.3
54+
botocore==1.39.4
5555
# via
5656
# aws-xray-sdk
5757
# awscli

0 commit comments

Comments
 (0)