Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(deps): bump botocore to 1.43.111 and regenerate the vendored AWS data (#5498)

Kenshin Okinaka94a801e05f1b
diff --git a/src/main/resources/aws/dynamodb-request-shapes.json b/src/main/resources/aws/dynamodb-request-shapes.json
index 08ab80996c..f3b84375c2 100644
--- a/src/main/resources/aws/dynamodb-request-shapes.json
+++ b/src/main/resources/aws/dynamodb-request-shapes.json
@@ -1,7 +1,7 @@
{
"_source": {
"generator": "tools/aws/regen_dynamodb_shapes.py",
- "botocore": "botocore 1.43.98 (installed package)"
+ "botocore": "botocore 1.43.111 (installed package)"
},
"operations": {
"BatchExecuteStatement": "BatchExecuteStatementInput",
@@ -591,7 +591,8 @@
"S3SseKmsKeyId": "S3SseKmsKeyId",
"ExportFormat": "ExportFormat",
"ExportType": "ExportType",
- "IncrementalExportSpecification": "IncrementalExportSpecification"
+ "IncrementalExportSpecification": "IncrementalExportSpecification",
+ "FilterSpecification": "FilterSpecification"
}
},
"ExportTime": {
@@ -618,6 +619,16 @@
"type": "map",
"value": "Condition"
},
+ "FilterSpecification": {
+ "type": "structure",
+ "members": {
+ "FilterExpression": "ConditionExpression",
+ "ProjectionExpression": "ProjectionExpression",
+ "KeyConditionExpression": "KeyExpression",
+ "ExpressionAttributeNames": "ExpressionAttributeNameMap",
+ "ExpressionAttributeValues": "ExpressionAttributeValueMap"
+ }
+ },
"Get": {
"type": "structure",
"members": {
diff --git a/src/main/resources/aws/partitions.json b/src/main/resources/aws/partitions.json
index fe1494f0b4..d204656649 100644
--- a/src/main/resources/aws/partitions.json
+++ b/src/main/resources/aws/partitions.json
@@ -1,10 +1,10 @@
{
"_source": {
"generator": "tools/aws/regen_partitions.py",
- "botocore": "botocore 1.43.98 (local/aws/botocore)",
+ "botocore": "botocore 1.43.111 (installed package)",
"partitionsJsonVersion": "1.1",
"endpointsJsonVersion": 3,
- "regionFlags": "aws-cdk region-info/lib/aws-entities.ts rules"
+ "regionFlags": "carried over from the previous file (no aws-cdk checkout)"
},
"signingNames": {
"IoTSecuredTunneling": [
@@ -51,6 +51,9 @@
"cloudsearch": [
"cloudsearchdomain"
],
+ "cloudwatch": [
+ "cloudwatch-omni"
+ ],
"connect": [
"contact-lens"
],
@@ -66,6 +69,9 @@
"ecr-public": [
"api.ecr-public"
],
+ "events": [
+ "eventsv2"
+ ],
"forecast": [
"forecastquery"
],
@@ -501,6 +507,7 @@
"entitlement.marketplace",
"es",
"events",
+ "eventsv2",
"finspace",
"finspace-api",
"firehose",
@@ -1641,6 +1648,7 @@
"route53",
"route53profiles",
"route53resolver",
+ "runtime.sagemaker",
"s3",
"savingsplans",
"scheduler",
@@ -1925,6 +1933,7 @@
"databrew",
"datasync",
"datazone",
+ "dax",
"directconnect",
"dlm",
"dms",
diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbRequestShapesTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbRequestShapesTest.java
index 095f479c71..3094cb2f8e 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbRequestShapesTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbRequestShapesTest.java
@@ -80,6 +80,18 @@ class DynamoDbRequestShapesTest {
"NUMBER_VALUE cannot be converted to String");
}
+ @Test
+ void exportFilterSpecificationIsChecked() {
+ String prefix = "{\"TableArn\":\"t\",\"S3Bucket\":\"b\",\"FilterSpecification\":";
+ assertAccepted("ExportTableToPointInTime", prefix + "{\"FilterExpression\":\"#a = :v\","
+ + "\"ExpressionAttributeNames\":{\"#a\":\"a\"},\"ExpressionAttributeValues\":{\":v\":{\"S\":\"x\"}}}}");
+ assertRejected("ExportTableToPointInTime", prefix + "\"a\"}", "Unexpected field type");
+ assertRejected("ExportTableToPointInTime", prefix + "{\"FilterExpression\":5}}",
+ "NUMBER_VALUE cannot be converted to String");
+ assertRejected("ExportTableToPointInTime", prefix + "{\"ExpressionAttributeValues\":{\":v\":{\"S\":5}}}}",
+ "NUMBER_VALUE cannot be converted to String");
+ }
+
@Test
void firstBadMemberInBodyOrderWins() {
assertRejected("Scan", "{\"TableName\":\"t\",\"Limit\":\"5\",\"IndexName\":5}", "STRING_VALUE cannot be converted to Integer");
diff --git a/tools/aws/requirements.txt b/tools/aws/requirements.txt
index fe9ad4e9f1..947790a522 100644
--- a/tools/aws/requirements.txt
+++ b/tools/aws/requirements.txt
@@ -1,2 +1,2 @@
-botocore==1.43.98
+botocore==1.43.111
pytest>=7.0