@cdk8s/awscdk-resolver 0.0.405 → 0.0.407

package/node_modules/@aws-sdk/client-cloudformation/dist-types/ts3.4/models/models_0.d.ts

@@ -96,6 +96,30 @@ export declare class AlreadyExistsException extends __BaseException {
     opts: __ExceptionOptionType<AlreadyExistsException, __BaseException>
   );
 }
+export declare const AnnotationSeverityLevel: {
+  readonly CRITICAL: "CRITICAL";
+  readonly HIGH: "HIGH";
+  readonly INFORMATIONAL: "INFORMATIONAL";
+  readonly LOW: "LOW";
+  readonly MEDIUM: "MEDIUM";
+};
+export type AnnotationSeverityLevel =
+  (typeof AnnotationSeverityLevel)[keyof typeof AnnotationSeverityLevel];
+export declare const AnnotationStatus: {
+  readonly FAILED: "FAILED";
+  readonly PASSED: "PASSED";
+  readonly SKIPPED: "SKIPPED";
+};
+export type AnnotationStatus =
+  (typeof AnnotationStatus)[keyof typeof AnnotationStatus];
+export interface Annotation {
+  AnnotationName?: string | undefined;
+  Status?: AnnotationStatus | undefined;
+  StatusMessage?: string | undefined;
+  RemediationMessage?: string | undefined;
+  RemediationLink?: string | undefined;
+  SeverityLevel?: AnnotationSeverityLevel | undefined;
+}
 export declare const AttributeChangeType: {
   readonly Add: "Add";
   readonly Modify: "Modify";
@@ -962,7 +986,7 @@ export interface DescribeStackDriftDetectionStatusOutput {
   Timestamp: Date | undefined;
 }
 export interface DescribeStackEventsInput {
-  StackName?: string | undefined;
+  StackName: string | undefined;
   NextToken?: string | undefined;
 }
 export declare const DetailedStatus: {
@@ -1543,6 +1567,46 @@ export interface GetGeneratedTemplateOutput {
   Status?: GeneratedTemplateStatus | undefined;
   TemplateBody?: string | undefined;
 }
+export interface GetHookResultInput {
+  HookResultId?: string | undefined;
+}
+export declare const HookTargetAction: {
+  readonly CREATE: "CREATE";
+  readonly DELETE: "DELETE";
+  readonly IMPORT: "IMPORT";
+  readonly UPDATE: "UPDATE";
+};
+export type HookTargetAction =
+  (typeof HookTargetAction)[keyof typeof HookTargetAction];
+export interface HookTarget {
+  TargetType: HookTargetType | undefined;
+  TargetTypeName: string | undefined;
+  TargetId: string | undefined;
+  Action: HookTargetAction | undefined;
+}
+export interface GetHookResultOutput {
+  HookResultId?: string | undefined;
+  InvocationPoint?: HookInvocationPoint | undefined;
+  FailureMode?: HookFailureMode | undefined;
+  TypeName?: string | undefined;
+  OriginalTypeName?: string | undefined;
+  TypeVersionId?: string | undefined;
+  TypeConfigurationVersionId?: string | undefined;
+  TypeArn?: string | undefined;
+  Status?: HookStatus | undefined;
+  HookStatusReason?: string | undefined;
+  InvokedAt?: Date | undefined;
+  Target?: HookTarget | undefined;
+  Annotations?: Annotation[] | undefined;
+}
+export declare class HookResultNotFoundException extends __BaseException {
+  readonly name: "HookResultNotFoundException";
+  readonly $fault: "client";
+  Message?: string | undefined;
+  constructor(
+    opts: __ExceptionOptionType<HookResultNotFoundException, __BaseException>
+  );
+}
 export interface GetStackPolicyInput {
   StackName: string | undefined;
 }
@@ -1662,14 +1726,6 @@ export interface ListGeneratedTemplatesOutput {
   Summaries?: TemplateSummary[] | undefined;
   NextToken?: string | undefined;
 }
-export declare class HookResultNotFoundException extends __BaseException {
-  readonly name: "HookResultNotFoundException";
-  readonly $fault: "client";
-  Message?: string | undefined;
-  constructor(
-    opts: __ExceptionOptionType<HookResultNotFoundException, __BaseException>
-  );
-}
 export declare const ListHookResultsTargetType: {
   readonly CHANGE_SET: "CHANGE_SET";
   readonly CLOUD_CONTROL: "CLOUD_CONTROL";
@@ -1969,52 +2025,3 @@ export interface OperationResultFilter {
   Name?: OperationResultFilterName | undefined;
   Values?: string | undefined;
 }
-export interface ListStackSetOperationResultsInput {
-  StackSetName: string | undefined;
-  OperationId: string | undefined;
-  NextToken?: string | undefined;
-  MaxResults?: number | undefined;
-  CallAs?: CallAs | undefined;
-  Filters?: OperationResultFilter[] | undefined;
-}
-export declare const StackSetOperationResultStatus: {
-  readonly CANCELLED: "CANCELLED";
-  readonly FAILED: "FAILED";
-  readonly PENDING: "PENDING";
-  readonly RUNNING: "RUNNING";
-  readonly SUCCEEDED: "SUCCEEDED";
-};
-export type StackSetOperationResultStatus =
-  (typeof StackSetOperationResultStatus)[keyof typeof StackSetOperationResultStatus];
-export interface StackSetOperationResultSummary {
-  Account?: string | undefined;
-  Region?: string | undefined;
-  Status?: StackSetOperationResultStatus | undefined;
-  StatusReason?: string | undefined;
-  AccountGateResult?: AccountGateResult | undefined;
-  OrganizationalUnitId?: string | undefined;
-}
-export interface ListStackSetOperationResultsOutput {
-  Summaries?: StackSetOperationResultSummary[] | undefined;
-  NextToken?: string | undefined;
-}
-export interface ListStackSetOperationsInput {
-  StackSetName: string | undefined;
-  NextToken?: string | undefined;
-  MaxResults?: number | undefined;
-  CallAs?: CallAs | undefined;
-}
-export interface StackSetOperationSummary {
-  OperationId?: string | undefined;
-  Action?: StackSetOperationAction | undefined;
-  Status?: StackSetOperationStatus | undefined;
-  CreationTimestamp?: Date | undefined;
-  EndTimestamp?: Date | undefined;
-  StatusReason?: string | undefined;
-  StatusDetails?: StackSetOperationStatusDetails | undefined;
-  OperationPreferences?: StackSetOperationPreferences | undefined;
-}
-export interface ListStackSetOperationsOutput {
-  Summaries?: StackSetOperationSummary[] | undefined;
-  NextToken?: string | undefined;
-}

package/node_modules/@aws-sdk/client-cloudformation/dist-types/ts3.4/models/models_1.d.ts

@@ -1,6 +1,7 @@
 import { ExceptionOptionType as __ExceptionOptionType } from "@smithy/smithy-client";
 import { CloudFormationServiceException as __BaseException } from "./CloudFormationServiceException";
 import {
+  AccountGateResult,
   AutoDeployment,
   CallAs,
   Capability,
@@ -10,6 +11,7 @@ import {
   IdentityProvider,
   LoggingConfig,
   ManagedExecution,
+  OperationResultFilter,
   Parameter,
   PermissionModels,
   ProvisioningType,
@@ -19,13 +21,65 @@ import {
   RollbackConfiguration,
   ScanFilter,
   StackDriftStatus,
+  StackSetOperationAction,
   StackSetOperationPreferences,
+  StackSetOperationStatus,
+  StackSetOperationStatusDetails,
   StackSetStatus,
   Tag,
   TemplateConfiguration,
   ThirdPartyType,
   Visibility,
 } from "./models_0";
+export interface ListStackSetOperationResultsInput {
+  StackSetName: string | undefined;
+  OperationId: string | undefined;
+  NextToken?: string | undefined;
+  MaxResults?: number | undefined;
+  CallAs?: CallAs | undefined;
+  Filters?: OperationResultFilter[] | undefined;
+}
+export declare const StackSetOperationResultStatus: {
+  readonly CANCELLED: "CANCELLED";
+  readonly FAILED: "FAILED";
+  readonly PENDING: "PENDING";
+  readonly RUNNING: "RUNNING";
+  readonly SUCCEEDED: "SUCCEEDED";
+};
+export type StackSetOperationResultStatus =
+  (typeof StackSetOperationResultStatus)[keyof typeof StackSetOperationResultStatus];
+export interface StackSetOperationResultSummary {
+  Account?: string | undefined;
+  Region?: string | undefined;
+  Status?: StackSetOperationResultStatus | undefined;
+  StatusReason?: string | undefined;
+  AccountGateResult?: AccountGateResult | undefined;
+  OrganizationalUnitId?: string | undefined;
+}
+export interface ListStackSetOperationResultsOutput {
+  Summaries?: StackSetOperationResultSummary[] | undefined;
+  NextToken?: string | undefined;
+}
+export interface ListStackSetOperationsInput {
+  StackSetName: string | undefined;
+  NextToken?: string | undefined;
+  MaxResults?: number | undefined;
+  CallAs?: CallAs | undefined;
+}
+export interface StackSetOperationSummary {
+  OperationId?: string | undefined;
+  Action?: StackSetOperationAction | undefined;
+  Status?: StackSetOperationStatus | undefined;
+  CreationTimestamp?: Date | undefined;
+  EndTimestamp?: Date | undefined;
+  StatusReason?: string | undefined;
+  StatusDetails?: StackSetOperationStatusDetails | undefined;
+  OperationPreferences?: StackSetOperationPreferences | undefined;
+}
+export interface ListStackSetOperationsOutput {
+  Summaries?: StackSetOperationSummary[] | undefined;
+  NextToken?: string | undefined;
+}
 export interface ListStackSetsInput {
   NextToken?: string | undefined;
   MaxResults?: number | undefined;

package/node_modules/@aws-sdk/client-cloudformation/dist-types/ts3.4/schemas/schemas_0.d.ts

@@ -11,6 +11,7 @@ export declare var ActivateOrganizationsAccessOutput: StaticStructureSchema;
 export declare var ActivateTypeInput: StaticStructureSchema;
 export declare var ActivateTypeOutput: StaticStructureSchema;
 export declare var AlreadyExistsException: StaticErrorSchema;
+export declare var Annotation: StaticStructureSchema;
 export declare var AutoDeployment: StaticStructureSchema;
 export declare var BatchDescribeTypeConfigurationsError: StaticStructureSchema;
 export declare var BatchDescribeTypeConfigurationsInput: StaticStructureSchema;
@@ -107,6 +108,8 @@ export declare var Export: StaticStructureSchema;
 export declare var GeneratedTemplateNotFoundException: StaticErrorSchema;
 export declare var GetGeneratedTemplateInput: StaticStructureSchema;
 export declare var GetGeneratedTemplateOutput: StaticStructureSchema;
+export declare var GetHookResultInput: StaticStructureSchema;
+export declare var GetHookResultOutput: StaticStructureSchema;
 export declare var GetStackPolicyInput: StaticStructureSchema;
 export declare var GetStackPolicyOutput: StaticStructureSchema;
 export declare var GetTemplateInput: StaticStructureSchema;
@@ -115,6 +118,7 @@ export declare var GetTemplateSummaryInput: StaticStructureSchema;
 export declare var GetTemplateSummaryOutput: StaticStructureSchema;
 export declare var HookResultNotFoundException: StaticErrorSchema;
 export declare var HookResultSummary: StaticStructureSchema;
+export declare var HookTarget: StaticStructureSchema;
 export declare var ImportStacksToStackSetInput: StaticStructureSchema;
 export declare var ImportStacksToStackSetOutput: StaticStructureSchema;
 export declare var InsufficientCapabilitiesException: StaticErrorSchema;
@@ -288,6 +292,7 @@ export declare var CloudFormationServiceException: StaticErrorSchema;
 export declare var AccountLimitList: StaticListSchema;
 export declare var AccountList: number;
 export declare var AllowedValues: number;
+export declare var AnnotationList: StaticListSchema;
 export declare var BatchDescribeTypeConfigurationsErrors: StaticListSchema;
 export declare var Capabilities: number;
 export declare var Changes: StaticListSchema;
@@ -410,6 +415,7 @@ export declare var EstimateTemplateCost: StaticOperationSchema;
 export declare var ExecuteChangeSet: StaticOperationSchema;
 export declare var ExecuteStackRefactor: StaticOperationSchema;
 export declare var GetGeneratedTemplate: StaticOperationSchema;
+export declare var GetHookResult: StaticOperationSchema;
 export declare var GetStackPolicy: StaticOperationSchema;
 export declare var GetTemplate: StaticOperationSchema;
 export declare var GetTemplateSummary: StaticOperationSchema;

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

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-cloudformation",
   "description": "AWS SDK for JavaScript Cloudformation 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-cloudformation",
@@ -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";