Skip to content

Update ASF APIs #12859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2025
Merged

Update ASF APIs #12859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 122 additions & 1 deletion localstack-core/localstack/aws/api/ec2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
BurstablePerformanceFlag = bool
CancelCapacityReservationFleetErrorCode = str
CancelCapacityReservationFleetErrorMessage = str
CapacityBlockId = str
CapacityReservationFleetId = str
CapacityReservationId = str
CarrierGatewayId = str
Expand Down Expand Up @@ -67,6 +68,8 @@
DescribeByoipCidrsMaxResults = int
DescribeCapacityBlockExtensionOfferingsMaxResults = int
DescribeCapacityBlockOfferingsMaxResults = int
DescribeCapacityBlockStatusMaxResults = int
DescribeCapacityBlocksMaxResults = int
DescribeCapacityReservationBillingRequestsRequestMaxResults = int
DescribeCapacityReservationFleetsMaxResults = int
DescribeCapacityReservationsMaxResults = int
Expand Down Expand Up @@ -679,6 +682,23 @@ class CapacityBlockExtensionStatus(StrEnum):
payment_succeeded = "payment-succeeded"


class CapacityBlockInterconnectStatus(StrEnum):
ok = "ok"
impaired = "impaired"
insufficient_data = "insufficient-data"


class CapacityBlockResourceState(StrEnum):
active = "active"
expired = "expired"
unavailable = "unavailable"
cancelled = "cancelled"
failed = "failed"
scheduled = "scheduled"
payment_pending = "payment-pending"
payment_failed = "payment-failed"


class CapacityReservationBillingRequestStatus(StrEnum):
pending = "pending"
accepted = "accepted"
Expand Down Expand Up @@ -744,6 +764,7 @@ class CapacityReservationState(StrEnum):
assessing = "assessing"
delayed = "delayed"
unsupported = "unsupported"
unavailable = "unavailable"


class CapacityReservationTenancy(StrEnum):
Expand Down Expand Up @@ -3154,6 +3175,7 @@ class ResourceType(StrEnum):
instance_connect_endpoint = "instance-connect-endpoint"
verified_access_endpoint_target = "verified-access-endpoint-target"
ipam_external_resource_verification_token = "ipam-external-resource-verification-token"
capacity_block = "capacity-block"
mac_modification_task = "mac-modification-task"


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


CapacityAllocations = List[CapacityAllocation]
CapacityReservationIdSet = List[CapacityReservationId]


class CapacityBlock(TypedDict, total=False):
CapacityBlockId: Optional[CapacityBlockId]
UltraserverType: Optional[String]
AvailabilityZone: Optional[String]
AvailabilityZoneId: Optional[String]
CapacityReservationIds: Optional[CapacityReservationIdSet]
StartDate: Optional[MillisecondDateTime]
EndDate: Optional[MillisecondDateTime]
CreateDate: Optional[MillisecondDateTime]
State: Optional[CapacityBlockResourceState]
Tags: Optional[TagList]


class CapacityBlockExtension(TypedDict, total=False):
Expand Down Expand Up @@ -6027,6 +6063,7 @@ class CapacityBlockExtensionOffering(TypedDict, total=False):

CapacityBlockExtensionOfferingSet = List[CapacityBlockExtensionOffering]
CapacityBlockExtensionSet = List[CapacityBlockExtension]
CapacityBlockIds = List[CapacityBlockId]


class CapacityBlockOffering(TypedDict, total=False):
Expand All @@ -6040,10 +6077,35 @@ class CapacityBlockOffering(TypedDict, total=False):
UpfrontFee: Optional[String]
CurrencyCode: Optional[String]
Tenancy: Optional[CapacityReservationTenancy]
UltraserverType: Optional[String]
UltraserverCount: Optional[BoxedInteger]
CapacityBlockDurationMinutes: Optional[Integer]


CapacityBlockOfferingSet = List[CapacityBlockOffering]
CapacityBlockSet = List[CapacityBlock]


class CapacityReservationStatus(TypedDict, total=False):
CapacityReservationId: Optional[CapacityReservationId]
TotalCapacity: Optional[Integer]
TotalAvailableCapacity: Optional[Integer]
TotalUnavailableCapacity: Optional[Integer]


CapacityReservationStatusSet = List[CapacityReservationStatus]


class CapacityBlockStatus(TypedDict, total=False):
CapacityBlockId: Optional[CapacityBlockId]
InterconnectStatus: Optional[CapacityBlockInterconnectStatus]
TotalCapacity: Optional[Integer]
TotalAvailableCapacity: Optional[Integer]
TotalUnavailableCapacity: Optional[Integer]
CapacityReservationStatuses: Optional[CapacityReservationStatusSet]


CapacityBlockStatusSet = List[CapacityBlockStatus]


class CapacityReservationCommitmentInfo(TypedDict, total=False):
Expand Down Expand Up @@ -6079,6 +6141,7 @@ class CapacityReservation(TypedDict, total=False):
UnusedReservationBillingOwnerId: Optional[AccountID]
CommitmentInfo: Optional[CapacityReservationCommitmentInfo]
DeliveryPreference: Optional[CapacityReservationDeliveryPreference]
CapacityBlockId: Optional[CapacityBlockId]


class CapacityReservationInfo(TypedDict, total=False):
Expand Down Expand Up @@ -6143,7 +6206,6 @@ class CapacityReservationGroup(TypedDict, total=False):


CapacityReservationGroupSet = List[CapacityReservationGroup]
CapacityReservationIdSet = List[CapacityReservationId]


class CapacityReservationOptions(TypedDict, total=False):
Expand Down Expand Up @@ -11583,13 +11645,41 @@ class DescribeCapacityBlockOfferingsRequest(ServiceRequest):
CapacityDurationHours: Integer
NextToken: Optional[String]
MaxResults: Optional[DescribeCapacityBlockOfferingsMaxResults]
UltraserverType: Optional[String]
UltraserverCount: Optional[Integer]


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


class DescribeCapacityBlockStatusRequest(ServiceRequest):
CapacityBlockIds: Optional[CapacityBlockIds]
NextToken: Optional[String]
MaxResults: Optional[DescribeCapacityBlockStatusMaxResults]
Filters: Optional[FilterList]
DryRun: Optional[Boolean]


class DescribeCapacityBlockStatusResult(TypedDict, total=False):
CapacityBlockStatuses: Optional[CapacityBlockStatusSet]
NextToken: Optional[String]


class DescribeCapacityBlocksRequest(ServiceRequest):
CapacityBlockIds: Optional[CapacityBlockIds]
NextToken: Optional[String]
MaxResults: Optional[DescribeCapacityBlocksMaxResults]
Filters: Optional[FilterList]
DryRun: Optional[Boolean]


class DescribeCapacityBlocksResult(TypedDict, total=False):
CapacityBlocks: Optional[CapacityBlockSet]
NextToken: Optional[String]


class DescribeCapacityReservationBillingRequestsRequest(ServiceRequest):
CapacityReservationIds: Optional[CapacityReservationIdSet]
Role: CallerRole
Expand Down Expand Up @@ -12803,6 +12893,7 @@ class InstanceTopology(TypedDict, total=False):
NetworkNodes: Optional[NetworkNodesList]
AvailabilityZone: Optional[String]
ZoneId: Optional[String]
CapacityBlockId: Optional[String]


InstanceSet = List[InstanceTopology]
Expand Down Expand Up @@ -13296,6 +13387,7 @@ class Instance(TypedDict, total=False):
Tags: Optional[TagList]
VirtualizationType: Optional[VirtualizationType]
CpuOptions: Optional[CpuOptions]
CapacityBlockId: Optional[String]
CapacityReservationId: Optional[String]
CapacityReservationSpecification: Optional[CapacityReservationSpecificationResponse]
HibernationOptions: Optional[HibernationOptions]
Expand Down Expand Up @@ -19692,6 +19784,7 @@ class PurchaseCapacityBlockRequest(ServiceRequest):

class PurchaseCapacityBlockResult(TypedDict, total=False):
CapacityReservation: Optional[CapacityReservation]
CapacityBlocks: Optional[CapacityBlockSet]


class PurchaseHostReservationRequest(ServiceRequest):
Expand Down Expand Up @@ -23758,10 +23851,38 @@ def describe_capacity_block_offerings(
end_date_range: MillisecondDateTime | None = None,
next_token: String | None = None,
max_results: DescribeCapacityBlockOfferingsMaxResults | None = None,
ultraserver_type: String | None = None,
ultraserver_count: Integer | None = None,
**kwargs,
) -> DescribeCapacityBlockOfferingsResult:
raise NotImplementedError

@handler("DescribeCapacityBlockStatus")
def describe_capacity_block_status(
self,
context: RequestContext,
capacity_block_ids: CapacityBlockIds | None = None,
next_token: String | None = None,
max_results: DescribeCapacityBlockStatusMaxResults | None = None,
filters: FilterList | None = None,
dry_run: Boolean | None = None,
**kwargs,
) -> DescribeCapacityBlockStatusResult:
raise NotImplementedError

@handler("DescribeCapacityBlocks")
def describe_capacity_blocks(
self,
context: RequestContext,
capacity_block_ids: CapacityBlockIds | None = None,
next_token: String | None = None,
max_results: DescribeCapacityBlocksMaxResults | None = None,
filters: FilterList | None = None,
dry_run: Boolean | None = None,
**kwargs,
) -> DescribeCapacityBlocksResult:
raise NotImplementedError

@handler("DescribeCapacityReservationBillingRequests")
def describe_capacity_reservation_billing_requests(
self,
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ Issues = "https://github.com/localstack/localstack/issues"
# minimal required to actually run localstack on the host for services natively implemented in python
base-runtime = [
# pinned / updated by ASF update action
"boto3==1.39.3",
"boto3==1.39.4",
# pinned / updated by ASF update action
"botocore==1.39.3",
"botocore==1.39.4",
"awscrt>=0.13.14,!=0.27.1",
"cbor2>=5.5.0",
"dnspython>=1.16.0",
Expand Down
4 changes: 2 additions & 2 deletions requirements-base-runtime.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ attrs==25.3.0
# referencing
awscrt==0.27.4
# via localstack-core (pyproject.toml)
boto3==1.39.3
boto3==1.39.4
# via localstack-core (pyproject.toml)
botocore==1.39.3
botocore==1.39.4
# via
# boto3
# localstack-core (pyproject.toml)
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ aws-sam-translator==1.99.0
# localstack-core
aws-xray-sdk==2.14.0
# via moto-ext
awscli==1.41.3
awscli==1.41.4
# via localstack-core
awscrt==0.27.4
# via localstack-core
boto3==1.39.3
boto3==1.39.4
# via
# aws-sam-translator
# kclpy-ext
# localstack-core
# moto-ext
botocore==1.39.3
botocore==1.39.4
# via
# aws-xray-sdk
# awscli
Expand Down
6 changes: 3 additions & 3 deletions requirements-runtime.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ aws-sam-translator==1.99.0
# localstack-core (pyproject.toml)
aws-xray-sdk==2.14.0
# via moto-ext
awscli==1.41.3
awscli==1.41.4
# via localstack-core (pyproject.toml)
awscrt==0.27.4
# via localstack-core
boto3==1.39.3
boto3==1.39.4
# via
# aws-sam-translator
# kclpy-ext
# localstack-core
# moto-ext
botocore==1.39.3
botocore==1.39.4
# via
# aws-xray-sdk
# awscli
Expand Down
6 changes: 3 additions & 3 deletions requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ aws-sam-translator==1.99.0
# localstack-core
aws-xray-sdk==2.14.0
# via moto-ext
awscli==1.41.3
awscli==1.41.4
# via localstack-core
awscrt==0.27.4
# via localstack-core
boto3==1.39.3
boto3==1.39.4
# via
# aws-sam-translator
# kclpy-ext
# localstack-core
# moto-ext
botocore==1.39.3
botocore==1.39.4
# via
# aws-xray-sdk
# awscli
Expand Down
6 changes: 3 additions & 3 deletions requirements-typehint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ aws-sam-translator==1.99.0
# localstack-core
aws-xray-sdk==2.14.0
# via moto-ext
awscli==1.41.3
awscli==1.41.4
# via localstack-core
awscrt==0.27.4
# via localstack-core
boto3==1.39.3
boto3==1.39.4
# via
# aws-sam-translator
# kclpy-ext
# localstack-core
# moto-ext
boto3-stubs==1.39.3
# via localstack-core (pyproject.toml)
botocore==1.39.3
botocore==1.39.4
# via
# aws-xray-sdk
# awscli
Expand Down
Loading