m

Author: Lucas McDonald

TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBResource.py

@@ -109,11 +109,11 @@ def query(self, **kwargs):
         # Resources don't have query, but our EncryptedResources can provide EncryptedTables that do support query.
         # This path tests that the EncryptedTables provided by EncryptedResources can used for query.
         table_name = kwargs["TableName"]
-        table_input = self._client_shape_to_resource_shape_converter.put_item_request(kwargs)
+        table_input = self._client_shape_to_resource_shape_converter.query_request(kwargs)
         encrypted_table = self._resource.Table(table_name)
         table_output = encrypted_table.query(**table_input)
         table_shape_converter = ResourceShapeToClientShapeConverter(table_name=table_name)
-        client_output = table_shape_converter.put_item_response(table_output)
+        client_output = table_shape_converter.query_response(table_output)
         return client_output
 
     def transact_get_items(self, **kwargs):

TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBTable.py

@@ -129,14 +129,18 @@ def get_item(self, **kwargs):
         return client_output
 
     def batch_write_item(self, **kwargs):
+        # There isn't a resource shape for this;
         table_input = self._client_shape_to_resource_shape_converter.batch_write_item_request(kwargs)
         # table_output = self._table.batch_write_item(**table_input)
         batch_writer = self._table.batch_writer()
-        for item in table_input["Items"]:
-            if "PutRequest" in item:
-                batch_writer.put_item(item["PutRequest"]["Item"])
-            elif "DeleteRequest" in item:
-                batch_writer.delete_item(item["DeleteRequest"]["Key"])
+        for _, items in table_input["RequestItems"].items():
+            for item in items:
+                if "PutRequest" in item:
+                    batch_writer.put_item(item["PutRequest"]["Item"])
+                elif "DeleteRequest" in item:
+                    batch_writer.delete_item(item["DeleteRequest"]["Key"])
+                else:
+                    raise ValueError(f"Unknown request type: {item}")
         table_output = batch_writer.close()
         client_output = self._resource_shape_to_client_shape_converter.batch_write_item_response(table_output)
         return client_output