8000 Update ASF APIs, S3 provider signature (#12696) · localstack/localstack@3d1a754 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3d1a754

Browse files
localstack-botsilv-io
localstack-bot
and
silv-io
authored
Update ASF APIs, S3 provider signature (#12696)
Co-authored-by: LocalStack Bot <localstack-bot@users.noreply.github.com> Co-authored-by: Silvio Vasiljevic <silvio.vasiljevic@gmail.com>
1 parent 2c2c7bf commit 3d1a754

File tree

9 files changed

+91
-20
lines changed

9 files changed

+91
-20
lines changed

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

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3342,6 +3342,14 @@ class SnapshotLocationEnum(StrEnum):
33423342
local = "local"
33433343

33443344

3345+
class SnapshotReturnCodes(StrEnum):
3346+
success = "success"
3347+
skipped = "skipped"
3348+
missing_permissions = "missing-permissions"
3349+
internal_error = "internal-error"
3350+
client_error = "client-error"
3351+
3352+
33453353
class SnapshotState(StrEnum):
33463354
pending = "pending"
33473355
completed = "completed"
@@ -3905,6 +3913,12 @@ class VpnStaticRouteSource(StrEnum):
39053913
Static = "Static"
39063914

39073915

3916+
class VpnTunnelProvisioningStatus(StrEnum):
3917+
available = "available"
3918+
pending = "pending"
3919+
failed = "failed"
3920+
3921+
39083922
class WeekDay(StrEnum):
39093923
sunday = "sunday"
39103924
monday = "monday"
@@ -4538,6 +4552,18 @@ class ActiveInstance(TypedDict, total=False):
45384552
ActiveInstanceSet = List[ActiveInstance]
45394553

45404554

4555+
class ActiveVpnTunnelStatus(TypedDict, total=False):
4556+
Phase1EncryptionAlgorithm: Optional[String]
4557+
Phase2EncryptionAlgorithm: Optional[String]
4558+
Phase1IntegrityAlgorithm: Optional[String]
4559+
Phase2IntegrityAlgorithm: Optional[String]
4560+
Phase1DHGroup: Optional[Integer]
4561+
Phase2DHGroup: Optional[Integer]
4562+
IkeVersion: Optional[String]
4563+
ProvisioningStatus: Optional[VpnTunnelProvisioningStatus]
4564+
ProvisioningStatusReason: Optional[String]
4565+
4566+
45414567
class AddIpamOperatingRegion(TypedDict, total=False):
45424568
RegionName: Optional[String]
45434569

@@ -10236,6 +10262,7 @@ class CreateVpnConnectionRequest(ServiceRequest):
1023610262
VpnGatewayId: Optional[VpnGatewayId]
1023710263
TransitGatewayId: Optional[TransitGatewayId]
1023810264
TagSpecifications: Optional[TagSpecificationList]
10265+
PreSharedKeyStorage: Optional[String]
1023910266
DryRun: Optional[Boolean]
1024010267
Options: Optional[VpnConnectionOptionsSpecification]
1024110268

@@ -10364,6 +10391,7 @@ class VpnConnection(TypedDict, total=False):
1036410391
Routes: Optional[VpnStaticRouteList]
1036510392
Tags: Optional[TagList]
1036610393
VgwTelemetry: Optional[VgwTelemetryList]
10394+
PreSharedKeyArn: Optional[String]
1036710395
VpnConnectionId: Optional[String]
1036810396
State: Optional[VpnState]
1036910397
CustomerGatewayConfiguration: Optional[customerGatewayConfiguration]
@@ -10968,6 +10996,14 @@ class DeleteSnapshotRequest(ServiceRequest):
1096810996
DryRun: Optional[Boolean]
1096910997

1097010998

10999+
class DeleteSnapshotReturnCode(TypedDict, total=False):
11000+
SnapshotId: Optional[SnapshotId]
11001+
ReturnCode: Optional[SnapshotReturnCodes]
11002+
11003+
11004+
DeleteSnapshotResultSet = List[DeleteSnapshotReturnCode]
11005+
11006+
1097111007
class DeleteSpotDatafeedSubscriptionRequest(ServiceRequest):
1097211008
DryRun: Optional[Boolean]
1097311009

@@ -11300,11 +11336,13 @@ class DeprovisionPublicIpv4PoolCidrResult(TypedDict, total=False):
1130011336

1130111337
class DeregisterImageRequest(ServiceRequest):
1130211338
ImageId: ImageId
11339+
DeleteAssociatedSnapshots: Optional[Boolean]
1130311340
DryRun: Optional[Boolean]
1130411341

1130511342

1130611343
class DeregisterImageResult(TypedDict, total=False):
11307-
pass
11344+
Return: Optional[Boolean]
11345+
DeleteSnapshotResults: Optional[DeleteSnapshotResultSet]
1130811346

1130911347

1131011348
InstanceTagKeySet = List[String]
@@ -16904,6 +16942,16 @@ class ExportVerifiedAccessInstanceClientConfigurationResult(TypedDict, total=Fal
1690416942
OpenVpnConfigurations: Optional[VerifiedAccessInstanceOpenVpnClientConfigurationList]
1690516943

1690616944

16945+
class GetActiveVpnTunnelStatusRequest(ServiceRequest):
16946+
VpnConnectionId: VpnConnectionId
16947+
VpnTunnelOutsideIpAddress: String
16948+
DryRun: Optional[Boolean]
16949+
16950+
16951+
class GetActiveVpnTunnelStatusResult(TypedDict, total=False):
16952+
ActiveVpnTunnelStatus: Optional[ActiveVpnTunnelStatus]
16953+
16954+
1690716955
class GetAllowedImagesSettingsRequest(ServiceRequest):
1690816956
DryRun: Optional[Boolean]
1690916957

@@ -17930,6 +17978,7 @@ class GetVpnConnectionDeviceSampleConfigurationRequest(ServiceRequest):
1793017978
VpnConnectionId: VpnConnectionId
1793117979
VpnConnectionDeviceTypeId: VpnConnectionDeviceTypeId
1793217980
InternetKeyExchangeVersion: Optional[String]
17981+
SampleType: Optional[String]
1793317982
DryRun: Optional[Boolean]
1793417983

1793517984

@@ -19487,6 +19536,7 @@ class ModifyVpnTunnelOptionsRequest(ServiceRequest):
1948719536
TunnelOptions: ModifyVpnTunnelOptionsSpecification
1948819537
DryRun: Optional[Boolean]
1948919538
SkipTunnelReplacement: Optional[Boolean]
19539+
PreSharedKeyStorage: Optional[String]
1949019540

1949119541

1949219542
class ModifyVpnTunnelOptionsResult(TypedDict, total=False):
@@ -23506,7 +23556,12 @@ def deprovision_public_ipv4_pool_cidr(
2350623556

2350723557
@handler("DeregisterImage")
2350823558
def deregister_image(
23509-
self, context: RequestContext, image_id: ImageId, dry_run: Boolean | None = None, **kwargs
23559+
self,
23560+
context: RequestContext,
23561+
image_id: ImageId,
23562+
delete_associated_snapshots: Boolean | None = None,
23563+
dry_run: Boolean | None = None,
23564+
**kwargs,
2351023565
) -> DeregisterImageResult:
2351123566
raise NotImplementedError
2351223567

@@ -26315,6 +26370,17 @@ def export_verified_access_instance_client_configuration(
2631526370
) -> ExportVerifiedAccessInstanceClientConfigurationResult:
2631626371
raise NotImplementedError
2631726372

26373+
@handler("GetActiveVpnTunnelStatus")
26374+
def get_active_vpn_tunnel_status(
26375+
self,
26376+
context: RequestContext,
26377+
vpn_connection_id: VpnConnectionId,
26378+
vpn_tunnel_outside_ip_address: String,
26379+
dry_run: Boolean | None = None,
26380+
**kwargs,
26381+
) -> GetActiveVpnTunnelStatusResult:
26382+
raise NotImplementedError
26383+
2631826384
@handler("GetAllowedImagesSettings")
2631926385
def get_allowed_images_settings(
2632026386
self, context: RequestContext, dry_run: Boolean | None = None, **kwargs
@@ -26918,6 +26984,7 @@ def get_vpn_connection_device_sample_configuration(
2691826984
vpn_connection_id: VpnConnectionId,
2691926985
vpn_connection_device_type_id: VpnConnectionDeviceTypeId,
2692026986
internet_key_exchange_version: String | None = None,
26987+
sample_type: String | None = None,
2692126988
dry_run: Boolean | None = None,
2692226989
**kwargs,
2692326990
) -> GetVpnConnectionDeviceSampleConfigurationResult:
@@ -28036,6 +28103,7 @@ def modify_vpn_tunnel_options(
2803628103
tunnel_options: ModifyVpnTunnelOptionsSpecification,
2803728104
dry_run: Boolean | None = None,
2803828105
skip_tunnel_replacement: Boolean | None = None,
28106+
pre_shared_key_storage: String | None = None,
2803928107
**kwargs,
2804028108
) -> ModifyVpnTunnelOptionsResult:
2804128109
raise NotImplementedError

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,6 +3139,7 @@ class PutBucketOwnershipControlsRequest(ServiceRequest):
31393139
ContentMD5: Optional[ContentMD5]
31403140
ExpectedBucketOwner: Optional[AccountId]
31413141
OwnershipControls: OwnershipControls
3142+
ChecksumAlgorithm: Optional[ChecksumAlgorithm]
31423143

31433144

31443145
class PutBucketPolicyRequest(ServiceRequest):
@@ -4695,6 +4696,7 @@ def put_bucket_ownership_controls(
46954696
ownership_controls: OwnershipControls,
46964697
content_md5: ContentMD5 | None = None,
46974698
expected_bucket_owner: AccountId | None = None,
4699+
checksum_algorithm: ChecksumAlgorithm | None = None,
46984700
**kwargs,
46994701
) -> None:
47004702
raise NotImplementedError

‎localstack-core/localstack/services/s3/provider.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3815,8 +3815,9 @@ def put_bucket_ownership_controls(
38153815
context: RequestContext,
38163816
bucket: BucketName,
38173817
ownership_controls: OwnershipControls,
3818-
content_md5: ContentMD5 = None,
3819-
expected_bucket_owner: AccountId = None,
3818+
content_md5: ContentMD5 | None = None,
3819+
expected_bucket_owner: AccountId | None = None,
3820+
checksum_algorithm: ChecksumAlgorithm | None = None,
38203821
**kwargs,
38213822
) -> None:
38223823
# TODO: this currently only mock the operation, but its actual effect is not emulated

‎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.38.23",
56+
"boto3==1.38.27",
5757
# pinned / updated by ASF update action
58-
"botocore==1.38.23",
58+
"botocore==1.38.27",
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.2
1313
# via localstack-core (pyproject.toml)
14-
boto3==1.38.23
14+
boto3==1.38.27
1515
# via localstack-core (pyproject.toml)
16-
botocore==1.38.23
16+
botocore==1.38.27
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.97.0
3939
# localstack-core
4040
aws-xray-sdk==2.14.0
4141
# via moto-ext
42-
awscli==1.40.22
42+
awscli==1.40.26
4343
# via localstack-core
4444
awscrt==0.27.2
4545
# via localstack-core
46-
boto3==1.38.23
46+
boto3==1.38.27
4747
# via
4848
# aws-sam-translator
4949
# kclpy-ext
5050
# localstack-core
5151
# moto-ext
52-
botocore==1.38.23
52+
botocore==1.38.27
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.97.0
2727
# localstack-core (pyproject.toml)
2828
aws-xray-sdk==2.14.0
2929
# via moto-ext
30-
awscli==1.40.22
30+
awscli==1.40.26
3131
# via localstack-core (pyproject.toml)
3232
awscrt==0.27.2
3333
# via localstack-core
34-
boto3==1.38.23
34+
boto3==1.38.27
3535
# via
3636
# aws-sam-translator
3737
# kclpy-ext
3838
# localstack-core
3939
# moto-ext
40-
botocore==1.38.23
40+
botocore==1.38.27
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.97.0
3939
# localstack-core
4040
aws-xray-sdk==2.14.0
4141
# via moto-ext
42-
awscli==1.40.22
42+
awscli==1.40.26
4343
# via localstack-core
4444
awscrt==0.27.2
4545
# via localstack-core
46-
boto3==1.38.23
46+
boto3==1.38.27
4747
# via
4848
# aws-sam-translator
4949
# kclpy-ext
5050
# localstack-core
5151
# moto-ext
52-
botocore==1.38.23
52+
botocore==1.38.27
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.97.0
3939
# localstack-core
4040
aws-xray-sdk==2.14.0
4141
# via moto-ext
42-
awscli==1.40.22
42+
awscli==1.40.26
4343
# via localstack-core
4444
awscrt==0.27.2
4545
# via localstack-core
46-
boto3==1.38.23
46+
boto3==1.38.27
4747
# via
4848
# aws-sam-translator
4949
# kclpy-ext
5050
# localstack-core
5151
# moto-ext
5252
boto3-stubs==1.38.23
5353
# via localstack-core (pyproject.toml)
54-
botocore==1.38.23
54+
botocore==1.38.27
5555
# via
5656
# aws-xray-sdk
5757
# awscli

0 commit comments

Comments
 (0)
0