@jjrawlins/cdk-ami-builder 0.0.72 → 0.0.74

package/node_modules/@aws-sdk/client-s3/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-s3",
   "description": "AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-s3",
@@ -29,25 +29,24 @@
     "@aws-crypto/sha1-browser": "5.2.0",
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
-    "@aws-sdk/credential-provider-node": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
+    "@aws-sdk/credential-provider-node": "3.932.0",
     "@aws-sdk/middleware-bucket-endpoint": "3.930.0",
     "@aws-sdk/middleware-expect-continue": "3.930.0",
-    "@aws-sdk/middleware-flexible-checksums": "3.930.0",
+    "@aws-sdk/middleware-flexible-checksums": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-location-constraint": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
-    "@aws-sdk/middleware-sdk-s3": "3.930.0",
+    "@aws-sdk/middleware-sdk-s3": "3.932.0",
     "@aws-sdk/middleware-ssec": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
-    "@aws-sdk/signature-v4-multi-region": "3.930.0",
+    "@aws-sdk/signature-v4-multi-region": "3.932.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
-    "@aws-sdk/xml-builder": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/eventstream-serde-browser": "^4.2.5",
@@ -81,11 +80,10 @@
     "@smithy/util-stream": "^4.5.6",
     "@smithy/util-utf8": "^4.2.0",
     "@smithy/util-waiter": "^4.2.5",
-    "@smithy/uuid": "^1.1.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@aws-sdk/signature-v4-crt": "3.930.0",
+    "@aws-sdk/signature-v4-crt": "3.932.0",
     "@tsconfig/node18": "18.2.4",
     "@types/node": "^18.19.69",
     "concurrently": "7.0.0",

package/node_modules/@aws-sdk/client-secrets-manager/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-secrets-manager",
   "description": "AWS SDK for JavaScript Secrets Manager Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-secrets-manager",
@@ -20,17 +20,17 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
-    "@aws-sdk/credential-provider-node": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
+    "@aws-sdk/credential-provider-node": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/fetch-http-handler": "^5.3.6",

package/node_modules/@aws-sdk/client-sfn/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-sfn",
   "description": "AWS SDK for JavaScript Sfn Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sfn",
@@ -20,17 +20,17 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
-    "@aws-sdk/credential-provider-node": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
+    "@aws-sdk/credential-provider-node": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/fetch-http-handler": "^5.3.6",

package/node_modules/@aws-sdk/client-sns/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-sns",
   "description": "AWS SDK for JavaScript Sns Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sns",
@@ -20,17 +20,17 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
-    "@aws-sdk/credential-provider-node": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
+    "@aws-sdk/credential-provider-node": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/fetch-http-handler": "^5.3.6",

package/node_modules/@aws-sdk/client-sqs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-sqs",
   "description": "AWS SDK for JavaScript Sqs Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sqs",
@@ -20,18 +20,18 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
-    "@aws-sdk/credential-provider-node": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
+    "@aws-sdk/credential-provider-node": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
     "@aws-sdk/middleware-sdk-sqs": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/fetch-http-handler": "^5.3.6",

package/node_modules/@aws-sdk/client-ssm/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-ssm",
   "description": "AWS SDK for JavaScript Ssm Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-ssm",
@@ -20,17 +20,17 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
-    "@aws-sdk/credential-provider-node": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
+    "@aws-sdk/credential-provider-node": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/fetch-http-handler": "^5.3.6",

package/node_modules/@aws-sdk/client-sso/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-sso",
   "description": "AWS SDK for JavaScript Sso Client for Node.js, Browser and React Native",
-  "version": "3.930.0",
+  "version": "3.932.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sso",
@@ -20,16 +20,16 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.930.0",
+    "@aws-sdk/core": "3.932.0",
     "@aws-sdk/middleware-host-header": "3.930.0",
     "@aws-sdk/middleware-logger": "3.930.0",
     "@aws-sdk/middleware-recursion-detection": "3.930.0",
-    "@aws-sdk/middleware-user-agent": "3.930.0",
+    "@aws-sdk/middleware-user-agent": "3.932.0",
     "@aws-sdk/region-config-resolver": "3.930.0",
     "@aws-sdk/types": "3.930.0",
     "@aws-sdk/util-endpoints": "3.930.0",
     "@aws-sdk/util-user-agent-browser": "3.930.0",
-    "@aws-sdk/util-user-agent-node": "3.930.0",
+    "@aws-sdk/util-user-agent-node": "3.932.0",
     "@smithy/config-resolver": "^4.4.3",
     "@smithy/core": "^3.18.2",
     "@smithy/fetch-http-handler": "^5.3.6",

package/node_modules/@aws-sdk/core/dist-cjs/index.js

@@ -7,10 +7,10 @@ var client = require('@aws-sdk/core/client');
 var signatureV4 = require('@smithy/signature-v4');
 var cbor = require('@smithy/core/cbor');
 var schema = require('@smithy/core/schema');
+var smithyClient = require('@smithy/smithy-client');
 var protocols = require('@smithy/core/protocols');
 var serde = require('@smithy/core/serde');
 var utilBase64 = require('@smithy/util-base64');
-var smithyClient = require('@smithy/smithy-client');
 var utilUtf8 = require('@smithy/util-utf8');
 var xmlBuilder = require('@aws-sdk/xml-builder');
 
@@ -340,6 +340,10 @@ function bindCallerConfig(config, credentialsProvider) {
 }
 
 class ProtocolLib {
+    queryCompat;
+    constructor(queryCompat = false) {
+        this.queryCompat = queryCompat;
+    }
     resolveRestContentType(defaultContentType, inputSchema) {
         const members = inputSchema.getMemberSchemas();
         const httpPayloadMember = Object.values(members).find((m) => {
@@ -379,7 +383,6 @@ class ProtocolLib {
         }
         const errorMetadata = {
             $metadata: metadata,
-            $response: response,
             $fault: response.statusCode < 500 ? "client" : "server",
         };
         const registry = schema.TypeRegistry.for(namespace);
@@ -393,11 +396,23 @@ class ProtocolLib {
             const baseExceptionSchema = synthetic.getBaseException();
             if (baseExceptionSchema) {
                 const ErrorCtor = synthetic.getErrorCtor(baseExceptionSchema) ?? Error;
-                throw Object.assign(new ErrorCtor({ name: errorName }), errorMetadata, dataObject);
+                throw this.decorateServiceException(Object.assign(new ErrorCtor({ name: errorName }), errorMetadata), dataObject);
             }
-            throw Object.assign(new Error(errorName), errorMetadata, dataObject);
+            throw this.decorateServiceException(Object.assign(new Error(errorName), errorMetadata), dataObject);
         }
     }
+    decorateServiceException(exception, additions = {}) {
+        if (this.queryCompat) {
+            const msg = exception.Message ?? additions.Message;
+            const error = smithyClient.decorateServiceException(exception, additions);
+            if (msg) {
+                error.Message = msg;
+                error.message = msg;
+            }
+            return error;
+        }
+        return smithyClient.decorateServiceException(exception, additions);
+    }
     setQueryCompatError(output, response) {
         const queryErrorHeader = response.headers?.["x-amzn-query-error"];
         if (output !== undefined && queryErrorHeader != null) {
@@ -430,10 +445,11 @@ class ProtocolLib {
 
 class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
     awsQueryCompatible;
-    mixin = new ProtocolLib();
+    mixin;
     constructor({ defaultNamespace, awsQueryCompatible, }) {
         super({ defaultNamespace });
         this.awsQueryCompatible = !!awsQueryCompatible;
+        this.mixin = new ProtocolLib(this.awsQueryCompatible);
     }
     async serializeRequest(operationSchema, input, context) {
         const request = await super.serializeRequest(operationSchema, input, context);
@@ -459,10 +475,10 @@ class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
 }
 
@@ -907,7 +923,7 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
     deserializer;
     serviceTarget;
     codec;
-    mixin = new ProtocolLib();
+    mixin;
     awsQueryCompatible;
     constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, }) {
         super({
@@ -924,6 +940,7 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
         this.serializer = this.codec.createSerializer();
         this.deserializer = this.codec.createDeserializer();
         this.awsQueryCompatible = !!awsQueryCompatible;
+        this.mixin = new ProtocolLib(this.awsQueryCompatible);
     }
     async serializeRequest(operationSchema, input, context) {
         const request = await super.serializeRequest(operationSchema, input, context);
@@ -963,10 +980,10 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
 }
 
@@ -1048,11 +1065,21 @@ class AwsRestJsonProtocol extends protocols.HttpBindingProtocol {
                 request.headers["content-type"] = contentType;
             }
         }
-        if (request.headers["content-type"] && !request.body) {
+        if (request.body == null && request.headers["content-type"] === this.getDefaultContentType()) {
             request.body = "{}";
         }
         return request;
     }
+    async deserializeResponse(operationSchema, context, response) {
+        const output = await super.deserializeResponse(operationSchema, context, response);
+        const outputSchema = schema.NormalizedSchema.of(operationSchema.output);
+        for (const [name, member] of outputSchema.structIterator()) {
+            if (member.getMemberTraits().httpPayload && !(name in output)) {
+                output[name] = null;
+            }
+        }
+        return output;
+    }
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
@@ -1066,10 +1093,10 @@ class AwsRestJsonProtocol extends protocols.HttpBindingProtocol {
             const target = member.getMergedTraits().jsonName ?? name;
             output[name] = this.codec.createDeserializer().readObject(member, dataObject[target]);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
     getDefaultContentType() {
         return "application/json";
@@ -1485,10 +1512,10 @@ class AwsQueryProtocol extends protocols.RpcProtocol {
             const value = errorData[target] ?? dataObject[target];
             output[name] = this.deserializer.readSchema(member, value);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
     loadQueryErrorCode(output, data) {
         const code = (data.Errors?.[0]?.Error ?? data.Errors?.Error ?? data.Error)?.Code;
@@ -1922,10 +1949,10 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
             const value = dataObject.Error?.[target] ?? dataObject[target];
             output[name] = this.codec.createDeserializer().readSchema(member, value);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
     getDefaultContentType() {
         return "application/xml";

package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js

@@ -2,14 +2,18 @@
 
 var cbor = require('@smithy/core/cbor');
 var schema = require('@smithy/core/schema');
+var smithyClient = require('@smithy/smithy-client');
 var protocols = require('@smithy/core/protocols');
 var serde = require('@smithy/core/serde');
 var utilBase64 = require('@smithy/util-base64');
-var smithyClient = require('@smithy/smithy-client');
 var utilUtf8 = require('@smithy/util-utf8');
 var xmlBuilder = require('@aws-sdk/xml-builder');
 
 class ProtocolLib {
+    queryCompat;
+    constructor(queryCompat = false) {
+        this.queryCompat = queryCompat;
+    }
     resolveRestContentType(defaultContentType, inputSchema) {
         const members = inputSchema.getMemberSchemas();
         const httpPayloadMember = Object.values(members).find((m) => {
@@ -49,7 +53,6 @@ class ProtocolLib {
         }
         const errorMetadata = {
             $metadata: metadata,
-            $response: response,
             $fault: response.statusCode < 500 ? "client" : "server",
         };
         const registry = schema.TypeRegistry.for(namespace);
@@ -63,11 +66,23 @@ class ProtocolLib {
             const baseExceptionSchema = synthetic.getBaseException();
             if (baseExceptionSchema) {
                 const ErrorCtor = synthetic.getErrorCtor(baseExceptionSchema) ?? Error;
-                throw Object.assign(new ErrorCtor({ name: errorName }), errorMetadata, dataObject);
+                throw this.decorateServiceException(Object.assign(new ErrorCtor({ name: errorName }), errorMetadata), dataObject);
             }
-            throw Object.assign(new Error(errorName), errorMetadata, dataObject);
+            throw this.decorateServiceException(Object.assign(new Error(errorName), errorMetadata), dataObject);
         }
     }
+    decorateServiceException(exception, additions = {}) {
+        if (this.queryCompat) {
+            const msg = exception.Message ?? additions.Message;
+            const error = smithyClient.decorateServiceException(exception, additions);
+            if (msg) {
+                error.Message = msg;
+                error.message = msg;
+            }
+            return error;
+        }
+        return smithyClient.decorateServiceException(exception, additions);
+    }
     setQueryCompatError(output, response) {
         const queryErrorHeader = response.headers?.["x-amzn-query-error"];
         if (output !== undefined && queryErrorHeader != null) {
@@ -100,10 +115,11 @@ class ProtocolLib {
 
 class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
     awsQueryCompatible;
-    mixin = new ProtocolLib();
+    mixin;
     constructor({ defaultNamespace, awsQueryCompatible, }) {
         super({ defaultNamespace });
         this.awsQueryCompatible = !!awsQueryCompatible;
+        this.mixin = new ProtocolLib(this.awsQueryCompatible);
     }
     async serializeRequest(operationSchema, input, context) {
         const request = await super.serializeRequest(operationSchema, input, context);
@@ -129,10 +145,10 @@ class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
 }
 
@@ -577,7 +593,7 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
     deserializer;
     serviceTarget;
     codec;
-    mixin = new ProtocolLib();
+    mixin;
     awsQueryCompatible;
     constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, }) {
         super({
@@ -594,6 +610,7 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
         this.serializer = this.codec.createSerializer();
         this.deserializer = this.codec.createDeserializer();
         this.awsQueryCompatible = !!awsQueryCompatible;
+        this.mixin = new ProtocolLib(this.awsQueryCompatible);
     }
     async serializeRequest(operationSchema, input, context) {
         const request = await super.serializeRequest(operationSchema, input, context);
@@ -633,10 +650,10 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
 }
 
@@ -718,11 +735,21 @@ class AwsRestJsonProtocol extends protocols.HttpBindingProtocol {
                 request.headers["content-type"] = contentType;
             }
         }
-        if (request.headers["content-type"] && !request.body) {
+        if (request.body == null && request.headers["content-type"] === this.getDefaultContentType()) {
             request.body = "{}";
         }
         return request;
     }
+    async deserializeResponse(operationSchema, context, response) {
+        const output = await super.deserializeResponse(operationSchema, context, response);
+        const outputSchema = schema.NormalizedSchema.of(operationSchema.output);
+        for (const [name, member] of outputSchema.structIterator()) {
+            if (member.getMemberTraits().httpPayload && !(name in output)) {
+                output[name] = null;
+            }
+        }
+        return output;
+    }
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
@@ -736,10 +763,10 @@ class AwsRestJsonProtocol extends protocols.HttpBindingProtocol {
             const target = member.getMergedTraits().jsonName ?? name;
             output[name] = this.codec.createDeserializer().readObject(member, dataObject[target]);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
     getDefaultContentType() {
         return "application/json";
@@ -1155,10 +1182,10 @@ class AwsQueryProtocol extends protocols.RpcProtocol {
             const value = errorData[target] ?? dataObject[target];
             output[name] = this.deserializer.readSchema(member, value);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
     loadQueryErrorCode(output, data) {
         const code = (data.Errors?.[0]?.Error ?? data.Errors?.Error ?? data.Error)?.Code;
@@ -1592,10 +1619,10 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
             const value = dataObject.Error?.[target] ?? dataObject[target];
             output[name] = this.codec.createDeserializer().readSchema(member, value);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
     getDefaultContentType() {
         return "application/xml";

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/ProtocolLib.js

@@ -1,5 +1,10 @@
 import { TypeRegistry } from "@smithy/core/schema";
+import { decorateServiceException } from "@smithy/smithy-client";
 export class ProtocolLib {
+    queryCompat;
+    constructor(queryCompat = false) {
+        this.queryCompat = queryCompat;
+    }
     resolveRestContentType(defaultContentType, inputSchema) {
         const members = inputSchema.getMemberSchemas();
         const httpPayloadMember = Object.values(members).find((m) => {
@@ -39,7 +44,6 @@ export class ProtocolLib {
         }
         const errorMetadata = {
             $metadata: metadata,
-            $response: response,
             $fault: response.statusCode < 500 ? "client" : "server",
         };
         const registry = TypeRegistry.for(namespace);
@@ -53,10 +57,22 @@ export class ProtocolLib {
             const baseExceptionSchema = synthetic.getBaseException();
             if (baseExceptionSchema) {
                 const ErrorCtor = synthetic.getErrorCtor(baseExceptionSchema) ?? Error;
-                throw Object.assign(new ErrorCtor({ name: errorName }), errorMetadata, dataObject);
+                throw this.decorateServiceException(Object.assign(new ErrorCtor({ name: errorName }), errorMetadata), dataObject);
+            }
+            throw this.decorateServiceException(Object.assign(new Error(errorName), errorMetadata), dataObject);
+        }
+    }
+    decorateServiceException(exception, additions = {}) {
+        if (this.queryCompat) {
+            const msg = exception.Message ?? additions.Message;
+            const error = decorateServiceException(exception, additions);
+            if (msg) {
+                error.Message = msg;
+                error.message = msg;
             }
-            throw Object.assign(new Error(errorName), errorMetadata, dataObject);
+            return error;
         }
+        return decorateServiceException(exception, additions);
     }
     setQueryCompatError(output, response) {
         const queryErrorHeader = response.headers?.["x-amzn-query-error"];

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/cbor/AwsSmithyRpcV2CborProtocol.js

@@ -3,10 +3,11 @@ import { NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
     awsQueryCompatible;
-    mixin = new ProtocolLib();
+    mixin;
     constructor({ defaultNamespace, awsQueryCompatible, }) {
         super({ defaultNamespace });
         this.awsQueryCompatible = !!awsQueryCompatible;
+        this.mixin = new ProtocolLib(this.awsQueryCompatible);
     }
     async serializeRequest(operationSchema, input, context) {
         const request = await super.serializeRequest(operationSchema, input, context);
@@ -32,9 +33,9 @@ export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
-        throw Object.assign(exception, errorMetadata, {
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-        }, output);
+        }, output), dataObject);
     }
 }