@cdk8s/awscdk-resolver 0.0.421 → 0.0.422

package/node_modules/@aws-sdk/client-sso/dist-types/auth/httpAuthSchemeProvider.d.ts

@@ -1,6 +1,6 @@
 import { AwsSdkSigV4AuthInputConfig, AwsSdkSigV4AuthResolvedConfig, AwsSdkSigV4PreviouslyResolved } from "@aws-sdk/core";
-import { HandlerExecutionContext, HttpAuthScheme, HttpAuthSchemeParameters, HttpAuthSchemeParametersProvider, HttpAuthSchemeProvider, Provider } from "@smithy/types";
-import { SSOClientResolvedConfig } from "../SSOClient";
+import type { HandlerExecutionContext, HttpAuthScheme, HttpAuthSchemeParameters, HttpAuthSchemeParametersProvider, HttpAuthSchemeProvider, Provider } from "@smithy/types";
+import { type SSOClientResolvedConfig } from "../SSOClient";
 /**
  * @internal
  */

package/node_modules/@aws-sdk/client-sso/dist-types/commands/GetRoleCredentialsCommand.d.ts

@@ -1,7 +1,7 @@
 import { Command as $Command } from "@smithy/smithy-client";
-import { MetadataBearer as __MetadataBearer } from "@smithy/types";
-import { GetRoleCredentialsRequest, GetRoleCredentialsResponse } from "../models/models_0";
-import { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
+import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
+import type { GetRoleCredentialsRequest, GetRoleCredentialsResponse } from "../models/models_0";
+import type { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
 /**
  * @public
  */

package/node_modules/@aws-sdk/client-sso/dist-types/commands/ListAccountRolesCommand.d.ts

@@ -1,7 +1,7 @@
 import { Command as $Command } from "@smithy/smithy-client";
-import { MetadataBearer as __MetadataBearer } from "@smithy/types";
-import { ListAccountRolesRequest, ListAccountRolesResponse } from "../models/models_0";
-import { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
+import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
+import type { ListAccountRolesRequest, ListAccountRolesResponse } from "../models/models_0";
+import type { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
 /**
  * @public
  */

package/node_modules/@aws-sdk/client-sso/dist-types/commands/ListAccountsCommand.d.ts

@@ -1,7 +1,7 @@
 import { Command as $Command } from "@smithy/smithy-client";
-import { MetadataBearer as __MetadataBearer } from "@smithy/types";
-import { ListAccountsRequest, ListAccountsResponse } from "../models/models_0";
-import { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
+import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
+import type { ListAccountsRequest, ListAccountsResponse } from "../models/models_0";
+import type { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
 /**
  * @public
  */

package/node_modules/@aws-sdk/client-sso/dist-types/commands/LogoutCommand.d.ts

@@ -1,7 +1,7 @@
 import { Command as $Command } from "@smithy/smithy-client";
-import { MetadataBearer as __MetadataBearer } from "@smithy/types";
-import { LogoutRequest } from "../models/models_0";
-import { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
+import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
+import type { LogoutRequest } from "../models/models_0";
+import type { ServiceInputTypes, ServiceOutputTypes, SSOClientResolvedConfig } from "../SSOClient";
 /**
  * @public
  */

package/node_modules/@aws-sdk/client-sso/dist-types/endpoint/EndpointParameters.d.ts

@@ -1,4 +1,4 @@
-import { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2, Provider } from "@smithy/types";
+import type { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2, Provider } from "@smithy/types";
 /**
  * @public
  */
@@ -8,10 +8,19 @@ export interface ClientInputEndpointParameters {
     useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
     endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
 }
+/**
+ * @public
+ */
 export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
     defaultSigningName: string;
 };
+/**
+ * @internal
+ */
 export declare const resolveClientEndpointParameters: <T>(options: T & ClientInputEndpointParameters) => T & ClientResolvedEndpointParameters;
+/**
+ * @internal
+ */
 export declare const commonParams: {
     readonly UseFIPS: {
         readonly type: "builtInParams";
@@ -30,6 +39,9 @@ export declare const commonParams: {
         readonly name: "useDualstackEndpoint";
     };
 };
+/**
+ * @internal
+ */
 export interface EndpointParameters extends __EndpointParameters {
     Region?: string | undefined;
     UseDualStack?: boolean | undefined;

package/node_modules/@aws-sdk/client-sso/dist-types/endpoint/endpointResolver.d.ts

@@ -1,5 +1,8 @@
-import { EndpointV2, Logger } from "@smithy/types";
-import { EndpointParameters } from "./EndpointParameters";
+import type { EndpointV2, Logger } from "@smithy/types";
+import type { EndpointParameters } from "./EndpointParameters";
+/**
+ * @internal
+ */
 export declare const defaultEndpointResolver: (endpointParams: EndpointParameters, context?: {
     logger?: Logger;
 }) => EndpointV2;

package/node_modules/@aws-sdk/client-sso/dist-types/extensionConfiguration.d.ts

@@ -1,7 +1,7 @@
-import { AwsRegionExtensionConfiguration } from "@aws-sdk/types";
-import { HttpHandlerExtensionConfiguration } from "@smithy/protocol-http";
-import { DefaultExtensionConfiguration } from "@smithy/types";
-import { HttpAuthExtensionConfiguration } from "./auth/httpAuthExtensionConfiguration";
+import type { AwsRegionExtensionConfiguration } from "@aws-sdk/types";
+import type { HttpHandlerExtensionConfiguration } from "@smithy/protocol-http";
+import type { DefaultExtensionConfiguration } from "@smithy/types";
+import type { HttpAuthExtensionConfiguration } from "./auth/httpAuthExtensionConfiguration";
 /**
  * @internal
  */

package/node_modules/@aws-sdk/client-sso/dist-types/models/SSOServiceException.d.ts

@@ -1,4 +1,4 @@
-import { ServiceException as __ServiceException, ServiceExceptionOptions as __ServiceExceptionOptions } from "@smithy/smithy-client";
+import { type ServiceExceptionOptions as __ServiceExceptionOptions, ServiceException as __ServiceException } from "@smithy/smithy-client";
 export type { __ServiceExceptionOptions };
 export { __ServiceException };
 /**

package/node_modules/@aws-sdk/client-sso/dist-types/models/errors.d.ts

@@ -1,4 +1,4 @@
-import { ExceptionOptionType as __ExceptionOptionType } from "@smithy/smithy-client";
+import type { ExceptionOptionType as __ExceptionOptionType } from "@smithy/smithy-client";
 import { SSOServiceException as __BaseException } from "./SSOServiceException";
 /**
  * <p>Indicates that a problem occurred with the input to the request. For example, a required

package/node_modules/@aws-sdk/client-sso/dist-types/pagination/Interfaces.d.ts

@@ -1,4 +1,4 @@
-import { PaginationConfiguration } from "@smithy/types";
+import type { PaginationConfiguration } from "@smithy/types";
 import { SSOClient } from "../SSOClient";
 /**
  * @public

package/node_modules/@aws-sdk/client-sso/dist-types/pagination/ListAccountRolesPaginator.d.ts

@@ -1,4 +1,4 @@
-import { Paginator } from "@smithy/types";
+import type { Paginator } from "@smithy/types";
 import { ListAccountRolesCommandInput, ListAccountRolesCommandOutput } from "../commands/ListAccountRolesCommand";
 import { SSOPaginationConfiguration } from "./Interfaces";
 /**

package/node_modules/@aws-sdk/client-sso/dist-types/pagination/ListAccountsPaginator.d.ts

@@ -1,4 +1,4 @@
-import { Paginator } from "@smithy/types";
+import type { Paginator } from "@smithy/types";
 import { ListAccountsCommandInput, ListAccountsCommandOutput } from "../commands/ListAccountsCommand";
 import { SSOPaginationConfiguration } from "./Interfaces";
 /**

package/node_modules/@aws-sdk/client-sso/dist-types/runtimeConfig.browser.d.ts

@@ -1,5 +1,5 @@
 import { FetchHttpHandler as RequestHandler } from "@smithy/fetch-http-handler";
-import { SSOClientConfig } from "./SSOClient";
+import type { SSOClientConfig } from "./SSOClient";
 /**
  * @internal
  */

package/node_modules/@aws-sdk/client-sso/dist-types/runtimeConfig.d.ts

@@ -1,5 +1,5 @@
 import { NodeHttpHandler as RequestHandler } from "@smithy/node-http-handler";
-import { SSOClientConfig } from "./SSOClient";
+import type { SSOClientConfig } from "./SSOClient";
 /**
  * @internal
  */

package/node_modules/@aws-sdk/client-sso/dist-types/runtimeConfig.native.d.ts

@@ -1,4 +1,4 @@
-import { SSOClientConfig } from "./SSOClient";
+import type { SSOClientConfig } from "./SSOClient";
 /**
  * @internal
  */

package/node_modules/@aws-sdk/client-sso/dist-types/runtimeConfig.shared.d.ts

@@ -1,7 +1,7 @@
 import { AwsSdkSigV4Signer } from "@aws-sdk/core";
 import { NoAuthSigner } from "@smithy/core";
-import { IdentityProviderConfig } from "@smithy/types";
-import { SSOClientConfig } from "./SSOClient";
+import type { IdentityProviderConfig } from "@smithy/types";
+import type { SSOClientConfig } from "./SSOClient";
 /**
  * @internal
  */

package/node_modules/@aws-sdk/client-sso/dist-types/runtimeExtensions.d.ts

@@ -1,4 +1,4 @@
-import { SSOExtensionConfiguration } from "./extensionConfiguration";
+import type { SSOExtensionConfiguration } from "./extensionConfiguration";
 /**
  * @public
  */

package/node_modules/@aws-sdk/client-sso/dist-types/schemas/schemas_0.d.ts

@@ -1,4 +1,4 @@
-import { StaticErrorSchema, StaticListSchema, StaticOperationSchema, StaticSimpleSchema, StaticStructureSchema } from "@smithy/types";
+import type { StaticErrorSchema, StaticListSchema, StaticOperationSchema, StaticSimpleSchema, StaticStructureSchema } from "@smithy/types";
 export declare var AccessTokenType: StaticSimpleSchema;
 export declare var SecretAccessKeyType: StaticSimpleSchema;
 export declare var SessionTokenType: StaticSimpleSchema;

package/node_modules/@aws-sdk/client-sso/dist-types/ts3.4/SSOClient.d.ts

@@ -20,10 +20,10 @@ import {
 } from "@smithy/middleware-retry";
 import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
 import {
-  Client as __Client,
   DefaultsMode as __DefaultsMode,
   SmithyConfiguration as __SmithyConfiguration,
   SmithyResolvedConfiguration as __SmithyResolvedConfiguration,
+  Client as __Client,
 } from "@smithy/smithy-client";
 import {
   BodyLengthCalculator as __BodyLengthCalculator,
@@ -38,9 +38,9 @@ import {
   HttpResponse,
   Logger as __Logger,
   Provider as __Provider,
-  Provider,
   StreamCollector as __StreamCollector,
   UrlParser as __UrlParser,
+  Provider,
   UserAgent as __UserAgent,
 } from "@smithy/types";
 import {

package/node_modules/@aws-sdk/client-sso/dist-types/ts3.4/auth/httpAuthExtensionConfiguration.d.ts

@@ -1,7 +1,7 @@
 import {
+  HttpAuthScheme,
   AwsCredentialIdentity,
   AwsCredentialIdentityProvider,
-  HttpAuthScheme,
 } from "@smithy/types";
 import { SSOHttpAuthSchemeProvider } from "./httpAuthSchemeProvider";
 export interface HttpAuthExtensionConfiguration {

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

@@ -1,6 +1,6 @@
 import {
-  ServiceException as __ServiceException,
   ServiceExceptionOptions as __ServiceExceptionOptions,
+  ServiceException as __ServiceException,
 } from "@smithy/smithy-client";
 export { __ServiceExceptionOptions };
 export { __ServiceException };

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.943.0",
+  "version": "3.946.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sso",
@@ -11,7 +11,8 @@
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
     "extract:docs": "api-extractor run --local",
-    "generate:client": "node ../../scripts/generate-clients/single-service --solo sso"
+    "generate:client": "node ../../scripts/generate-clients/single-service --solo sso",
+    "test:index": "tsc --noEmit ./test/index-types.ts && node ./test/index-objects.spec.mjs"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
@@ -20,37 +21,37 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.943.0",
+    "@aws-sdk/core": "3.946.0",
     "@aws-sdk/middleware-host-header": "3.936.0",
     "@aws-sdk/middleware-logger": "3.936.0",
     "@aws-sdk/middleware-recursion-detection": "3.936.0",
-    "@aws-sdk/middleware-user-agent": "3.943.0",
+    "@aws-sdk/middleware-user-agent": "3.946.0",
     "@aws-sdk/region-config-resolver": "3.936.0",
     "@aws-sdk/types": "3.936.0",
     "@aws-sdk/util-endpoints": "3.936.0",
     "@aws-sdk/util-user-agent-browser": "3.936.0",
-    "@aws-sdk/util-user-agent-node": "3.943.0",
+    "@aws-sdk/util-user-agent-node": "3.946.0",
     "@smithy/config-resolver": "^4.4.3",
-    "@smithy/core": "^3.18.5",
+    "@smithy/core": "^3.18.7",
     "@smithy/fetch-http-handler": "^5.3.6",
     "@smithy/hash-node": "^4.2.5",
     "@smithy/invalid-dependency": "^4.2.5",
     "@smithy/middleware-content-length": "^4.2.5",
-    "@smithy/middleware-endpoint": "^4.3.12",
-    "@smithy/middleware-retry": "^4.4.12",
+    "@smithy/middleware-endpoint": "^4.3.14",
+    "@smithy/middleware-retry": "^4.4.14",
     "@smithy/middleware-serde": "^4.2.6",
     "@smithy/middleware-stack": "^4.2.5",
     "@smithy/node-config-provider": "^4.3.5",
     "@smithy/node-http-handler": "^4.4.5",
     "@smithy/protocol-http": "^5.3.5",
-    "@smithy/smithy-client": "^4.9.8",
+    "@smithy/smithy-client": "^4.9.10",
     "@smithy/types": "^4.9.0",
     "@smithy/url-parser": "^4.2.5",
     "@smithy/util-base64": "^4.3.0",
     "@smithy/util-body-length-browser": "^4.2.0",
     "@smithy/util-body-length-node": "^4.2.1",
-    "@smithy/util-defaults-mode-browser": "^4.3.11",
-    "@smithy/util-defaults-mode-node": "^4.2.14",
+    "@smithy/util-defaults-mode-browser": "^4.3.13",
+    "@smithy/util-defaults-mode-node": "^4.2.16",
     "@smithy/util-endpoints": "^3.2.5",
     "@smithy/util-middleware": "^4.2.5",
     "@smithy/util-retry": "^4.2.5",

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

@@ -406,9 +406,18 @@ class ProtocolLib {
             const msg = exception.Message ?? additions.Message;
             const error = smithyClient.decorateServiceException(exception, additions);
             if (msg) {
-                error.Message = msg;
                 error.message = msg;
             }
+            error.Error = {
+                ...error.Error,
+                Type: error.Error.Type,
+                Code: error.Error.Code,
+                Message: error.Error.message ?? error.Error.Message ?? msg,
+            };
+            const reqId = error.$metadata.requestId;
+            if (reqId) {
+                error.RequestId = reqId;
+            }
             return error;
         }
         return smithyClient.decorateServiceException(exception, additions);
@@ -424,7 +433,7 @@ class ProtocolLib {
             };
             Object.assign(output, Error);
             for (const [k, v] of entries) {
-                Error[k] = v;
+                Error[k === "message" ? "Message" : k] = v;
             }
             delete Error.__type;
             output.Error = Error;
@@ -441,6 +450,14 @@ class ProtocolLib {
             errorData.Code = queryCompatErrorData.Code;
         }
     }
+    findQueryCompatibleError(registry, errorName) {
+        try {
+            return registry.getSchema(errorName);
+        }
+        catch (e) {
+            return registry.find((schema$1) => schema.NormalizedSchema.of(schema$1).getMergedTraits().awsQueryError?.[0] === errorName);
+        }
+    }
 }
 
 class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
@@ -462,15 +479,23 @@ class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.setQueryCompatError(dataObject, response);
         }
-        const errorName = cbor.loadSmithyRpcV2CborErrorCode(response, dataObject) ?? "Unknown";
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata);
+        const errorName = (() => {
+            const compatHeader = response.headers["x-amzn-query-error"];
+            if (compatHeader && this.awsQueryCompatible) {
+                return compatHeader.split(";")[0];
+            }
+            return cbor.loadSmithyRpcV2CborErrorCode(response, dataObject) ?? "Unknown";
+        })();
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
         const ErrorCtor = schema.TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
-            output[name] = this.deserializer.readValue(member, dataObject[name]);
+            if (dataObject[name] != null) {
+                output[name] = this.deserializer.readValue(member, dataObject[name]);
+            }
         }
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
@@ -1035,15 +1060,16 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
             this.mixin.setQueryCompatError(dataObject, response);
         }
         const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
         const ErrorCtor = schema.TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
-            const target = member.getMergedTraits().jsonName ?? name;
-            output[name] = this.codec.createDeserializer().readObject(member, dataObject[target]);
+            if (dataObject[name] != null) {
+                output[name] = this.codec.createDeserializer().readObject(member, dataObject[name]);
+            }
         }
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
@@ -1563,18 +1589,13 @@ class AwsQueryProtocol extends protocols.RpcProtocol {
             Code: errorData.Code,
             Message: message,
         };
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, (registry, errorName) => {
-            try {
-                return registry.getSchema(errorName);
-            }
-            catch (e) {
-                return registry.find((schema$1) => schema.NormalizedSchema.of(schema$1).getMergedTraits().awsQueryError?.[0] === errorName);
-            }
-        });
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, this.mixin.findQueryCompatibleError);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const ErrorCtor = schema.TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {
+            Type: errorData.Error.Type,
+            Code: errorData.Error.Code,
             Error: errorData.Error,
         };
         for (const [name, member] of ns.structIterator()) {
@@ -1997,7 +2018,9 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
         }
         if (request.headers["content-type"] === this.getDefaultContentType()) {
             if (typeof request.body === "string") {
-                request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
+                if (!request.body.startsWith("<?xml ")) {
+                    request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
+                }
             }
         }
         return request;

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

@@ -76,9 +76,18 @@ class ProtocolLib {
             const msg = exception.Message ?? additions.Message;
             const error = smithyClient.decorateServiceException(exception, additions);
             if (msg) {
-                error.Message = msg;
                 error.message = msg;
             }
+            error.Error = {
+                ...error.Error,
+                Type: error.Error.Type,
+                Code: error.Error.Code,
+                Message: error.Error.message ?? error.Error.Message ?? msg,
+            };
+            const reqId = error.$metadata.requestId;
+            if (reqId) {
+                error.RequestId = reqId;
+            }
             return error;
         }
         return smithyClient.decorateServiceException(exception, additions);
@@ -94,7 +103,7 @@ class ProtocolLib {
             };
             Object.assign(output, Error);
             for (const [k, v] of entries) {
-                Error[k] = v;
+                Error[k === "message" ? "Message" : k] = v;
             }
             delete Error.__type;
             output.Error = Error;
@@ -111,6 +120,14 @@ class ProtocolLib {
             errorData.Code = queryCompatErrorData.Code;
         }
     }
+    findQueryCompatibleError(registry, errorName) {
+        try {
+            return registry.getSchema(errorName);
+        }
+        catch (e) {
+            return registry.find((schema$1) => schema.NormalizedSchema.of(schema$1).getMergedTraits().awsQueryError?.[0] === errorName);
+        }
+    }
 }
 
 class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
@@ -132,15 +149,23 @@ class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.setQueryCompatError(dataObject, response);
         }
-        const errorName = cbor.loadSmithyRpcV2CborErrorCode(response, dataObject) ?? "Unknown";
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata);
+        const errorName = (() => {
+            const compatHeader = response.headers["x-amzn-query-error"];
+            if (compatHeader && this.awsQueryCompatible) {
+                return compatHeader.split(";")[0];
+            }
+            return cbor.loadSmithyRpcV2CborErrorCode(response, dataObject) ?? "Unknown";
+        })();
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
         const ErrorCtor = schema.TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
-            output[name] = this.deserializer.readValue(member, dataObject[name]);
+            if (dataObject[name] != null) {
+                output[name] = this.deserializer.readValue(member, dataObject[name]);
+            }
         }
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
@@ -705,15 +730,16 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
             this.mixin.setQueryCompatError(dataObject, response);
         }
         const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
         const ErrorCtor = schema.TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
-            const target = member.getMergedTraits().jsonName ?? name;
-            output[name] = this.codec.createDeserializer().readObject(member, dataObject[target]);
+            if (dataObject[name] != null) {
+                output[name] = this.codec.createDeserializer().readObject(member, dataObject[name]);
+            }
         }
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
@@ -1233,18 +1259,13 @@ class AwsQueryProtocol extends protocols.RpcProtocol {
             Code: errorData.Code,
             Message: message,
         };
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, (registry, errorName) => {
-            try {
-                return registry.getSchema(errorName);
-            }
-            catch (e) {
-                return registry.find((schema$1) => schema.NormalizedSchema.of(schema$1).getMergedTraits().awsQueryError?.[0] === errorName);
-            }
-        });
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, this.mixin.findQueryCompatibleError);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const ErrorCtor = schema.TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {
+            Type: errorData.Error.Type,
+            Code: errorData.Error.Code,
             Error: errorData.Error,
         };
         for (const [name, member] of ns.structIterator()) {
@@ -1667,7 +1688,9 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
         }
         if (request.headers["content-type"] === this.getDefaultContentType()) {
             if (typeof request.body === "string") {
-                request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
+                if (!request.body.startsWith("<?xml ")) {
+                    request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
+                }
             }
         }
         return request;

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

@@ -1,4 +1,4 @@
-import { TypeRegistry } from "@smithy/core/schema";
+import { NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
 import { decorateServiceException } from "@smithy/smithy-client";
 export class ProtocolLib {
     queryCompat;
@@ -67,9 +67,18 @@ export class ProtocolLib {
             const msg = exception.Message ?? additions.Message;
             const error = decorateServiceException(exception, additions);
             if (msg) {
-                error.Message = msg;
                 error.message = msg;
             }
+            error.Error = {
+                ...error.Error,
+                Type: error.Error.Type,
+                Code: error.Error.Code,
+                Message: error.Error.message ?? error.Error.Message ?? msg,
+            };
+            const reqId = error.$metadata.requestId;
+            if (reqId) {
+                error.RequestId = reqId;
+            }
             return error;
         }
         return decorateServiceException(exception, additions);
@@ -85,7 +94,7 @@ export class ProtocolLib {
             };
             Object.assign(output, Error);
             for (const [k, v] of entries) {
-                Error[k] = v;
+                Error[k === "message" ? "Message" : k] = v;
             }
             delete Error.__type;
             output.Error = Error;
@@ -102,4 +111,12 @@ export class ProtocolLib {
             errorData.Code = queryCompatErrorData.Code;
         }
     }
+    findQueryCompatibleError(registry, errorName) {
+        try {
+            return registry.getSchema(errorName);
+        }
+        catch (e) {
+            return registry.find((schema) => NormalizedSchema.of(schema).getMergedTraits().awsQueryError?.[0] === errorName);
+        }
+    }
 }

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

@@ -20,15 +20,23 @@ export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
         if (this.awsQueryCompatible) {
             this.mixin.setQueryCompatError(dataObject, response);
         }
-        const errorName = loadSmithyRpcV2CborErrorCode(response, dataObject) ?? "Unknown";
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata);
+        const errorName = (() => {
+            const compatHeader = response.headers["x-amzn-query-error"];
+            if (compatHeader && this.awsQueryCompatible) {
+                return compatHeader.split(";")[0];
+            }
+            return loadSmithyRpcV2CborErrorCode(response, dataObject) ?? "Unknown";
+        })();
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorName, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "Unknown";
         const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {};
         for (const [name, member] of ns.structIterator()) {
-            output[name] = this.deserializer.readValue(member, dataObject[name]);
+            if (dataObject[name] != null) {
+                output[name] = this.deserializer.readValue(member, dataObject[name]);
+            }
         }
         if (this.awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);