cloudstructs 0.12.8 → 0.12.9

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

@@ -0,0 +1,5 @@
+export {
+  DeprecatedObject,
+  ParameterObject,
+  RuleSetObject,
+} from "@smithy/util-endpoints";

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

@@ -0,0 +1 @@
+export { RuleSetRules, TreeRuleObject } from "@smithy/util-endpoints";

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

@@ -0,0 +1,6 @@
+export * from "./EndpointError";
+export * from "./EndpointRuleObject";
+export * from "./ErrorRuleObject";
+export * from "./RuleSetObject";
+export * from "./TreeRuleObject";
+export * from "./shared";

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

@@ -0,0 +1,12 @@
+export {
+  ReferenceObject,
+  FunctionObject,
+  FunctionArgv,
+  FunctionReturn,
+  ConditionObject,
+  Expression,
+  EndpointParams,
+  EndpointResolverOptions,
+  ReferenceRecord,
+  EvaluateOptions,
+} from "@smithy/util-endpoints";

package/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints/dist-types/types/EndpointError.d.ts

@@ -0,0 +1 @@
+export { EndpointError } from "@smithy/util-endpoints";

package/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints/dist-types/types/EndpointRuleObject.d.ts

@@ -0,0 +1 @@
+export { EndpointObjectProperties, EndpointObjectHeaders, EndpointObject, EndpointRuleObject, } from "@smithy/util-endpoints";

package/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints/dist-types/types/ErrorRuleObject.d.ts

@@ -0,0 +1 @@
+export { ErrorRuleObject } from "@smithy/util-endpoints";

package/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints/dist-types/types/RuleSetObject.d.ts

@@ -0,0 +1 @@
+export { DeprecatedObject, ParameterObject, RuleSetObject } from "@smithy/util-endpoints";

package/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints/dist-types/types/TreeRuleObject.d.ts

@@ -0,0 +1 @@
+export { RuleSetRules, TreeRuleObject } from "@smithy/util-endpoints";

package/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints/dist-types/types/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./EndpointError";
+export * from "./EndpointRuleObject";
+export * from "./ErrorRuleObject";
+export * from "./RuleSetObject";
+export * from "./TreeRuleObject";
+export * from "./shared";

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

@@ -0,0 +1 @@
+export { ReferenceObject, FunctionObject, FunctionArgv, FunctionReturn, ConditionObject, Expression, EndpointParams, EndpointResolverOptions, ReferenceRecord, EvaluateOptions, } from "@smithy/util-endpoints";

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

@@ -0,0 +1,60 @@
+{
+  "name": "@aws-sdk/util-endpoints",
+  "version": "3.990.0",
+  "description": "Utilities to help with endpoint resolution",
+  "main": "./dist-cjs/index.js",
+  "module": "./dist-es/index.js",
+  "types": "./dist-types/index.d.ts",
+  "scripts": {
+    "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
+    "build:cjs": "node ../../scripts/compilation/inline util-endpoints",
+    "build:es": "tsc -p tsconfig.es.json",
+    "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
+    "build:types": "tsc -p tsconfig.types.json",
+    "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
+    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "test": "yarn g:vitest run",
+    "test:integration": "yarn g:vitest run -c vitest.config.integ.mts",
+    "test:watch": "yarn g:vitest watch",
+    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
+  },
+  "sideEffects": true,
+  "author": {
+    "name": "AWS SDK for JavaScript Team",
+    "url": "https://aws.amazon.com/javascript/"
+  },
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@aws-sdk/types": "^3.973.1",
+    "@smithy/types": "^4.12.0",
+    "@smithy/url-parser": "^4.2.8",
+    "@smithy/util-endpoints": "^3.2.8",
+    "tslib": "^2.6.2"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "typesVersions": {
+    "<4.0": {
+      "dist-types/*": [
+        "dist-types/ts3.4/*"
+      ]
+    }
+  },
+  "files": [
+    "dist-*/**"
+  ],
+  "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/util-endpoints",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aws/aws-sdk-js-v3.git",
+    "directory": "packages/util-endpoints"
+  },
+  "devDependencies": {
+    "@tsconfig/recommended": "1.0.1",
+    "concurrently": "7.0.0",
+    "downlevel-dts": "0.10.1",
+    "premove": "4.0.0",
+    "typescript": "~5.8.3"
+  }
+}

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.972.0",
+  "version": "3.990.0",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline client-sso",
@@ -21,37 +21,37 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.972.0",
-    "@aws-sdk/middleware-host-header": "3.972.0",
-    "@aws-sdk/middleware-logger": "3.972.0",
-    "@aws-sdk/middleware-recursion-detection": "3.972.0",
-    "@aws-sdk/middleware-user-agent": "3.972.0",
-    "@aws-sdk/region-config-resolver": "3.972.0",
-    "@aws-sdk/types": "3.972.0",
-    "@aws-sdk/util-endpoints": "3.972.0",
-    "@aws-sdk/util-user-agent-browser": "3.972.0",
-    "@aws-sdk/util-user-agent-node": "3.972.0",
+    "@aws-sdk/core": "^3.973.10",
+    "@aws-sdk/middleware-host-header": "^3.972.3",
+    "@aws-sdk/middleware-logger": "^3.972.3",
+    "@aws-sdk/middleware-recursion-detection": "^3.972.3",
+    "@aws-sdk/middleware-user-agent": "^3.972.10",
+    "@aws-sdk/region-config-resolver": "^3.972.3",
+    "@aws-sdk/types": "^3.973.1",
+    "@aws-sdk/util-endpoints": "3.990.0",
+    "@aws-sdk/util-user-agent-browser": "^3.972.3",
+    "@aws-sdk/util-user-agent-node": "^3.972.8",
     "@smithy/config-resolver": "^4.4.6",
-    "@smithy/core": "^3.20.6",
+    "@smithy/core": "^3.23.0",
     "@smithy/fetch-http-handler": "^5.3.9",
     "@smithy/hash-node": "^4.2.8",
     "@smithy/invalid-dependency": "^4.2.8",
     "@smithy/middleware-content-length": "^4.2.8",
-    "@smithy/middleware-endpoint": "^4.4.7",
-    "@smithy/middleware-retry": "^4.4.23",
+    "@smithy/middleware-endpoint": "^4.4.14",
+    "@smithy/middleware-retry": "^4.4.31",
     "@smithy/middleware-serde": "^4.2.9",
     "@smithy/middleware-stack": "^4.2.8",
     "@smithy/node-config-provider": "^4.3.8",
-    "@smithy/node-http-handler": "^4.4.8",
+    "@smithy/node-http-handler": "^4.4.10",
     "@smithy/protocol-http": "^5.3.8",
-    "@smithy/smithy-client": "^4.10.8",
+    "@smithy/smithy-client": "^4.11.3",
     "@smithy/types": "^4.12.0",
     "@smithy/url-parser": "^4.2.8",
     "@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.22",
-    "@smithy/util-defaults-mode-node": "^4.2.25",
+    "@smithy/util-defaults-mode-browser": "^4.3.30",
+    "@smithy/util-defaults-mode-node": "^4.2.33",
     "@smithy/util-endpoints": "^3.2.8",
     "@smithy/util-middleware": "^4.2.8",
     "@smithy/util-retry": "^4.2.8",

package/node_modules/@aws-sdk/core/account-id-endpoint.js

@@ -1,4 +1,3 @@
-
 /**
  * Do not edit:
  * This is a compatibility redirect for contexts that do not understand package.json exports field.

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

@@ -572,46 +572,6 @@ class SerdeContextConfig {
     }
 }
 
-function* serializingStructIterator(ns, sourceObject) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    for (let i = 0; i < struct[4].length; ++i) {
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        if (!(key in sourceObject) && !memberNs.isIdempotencyToken()) {
-            continue;
-        }
-        yield [key, memberNs];
-    }
-}
-function* deserializingStructIterator(ns, sourceObject, nameTrait) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    let keysRemaining = Object.keys(sourceObject).filter((k) => k !== "__type").length;
-    for (let i = 0; i < struct[4].length; ++i) {
-        if (keysRemaining === 0) {
-            break;
-        }
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        let serializationKey = key;
-        if (nameTrait) {
-            serializationKey = memberNs.getMergedTraits()[nameTrait] ?? key;
-        }
-        if (!(serializationKey in sourceObject)) {
-            continue;
-        }
-        yield [key, memberNs];
-        keysRemaining -= 1;
-    }
-}
-
 class UnionSerde {
     from;
     to;
@@ -739,7 +699,7 @@ class JsonShapeDeserializer extends SerdeContextConfig {
                 if (union) {
                     unionSerde = new UnionSerde(record, out);
                 }
-                for (const [memberName, memberSchema] of deserializingStructIterator(ns, record, jsonName ? "jsonName" : false)) {
+                for (const [memberName, memberSchema] of ns.structIterator()) {
                     let fromKey = memberName;
                     if (jsonName) {
                         fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
@@ -948,7 +908,7 @@ class JsonShapeSerializer extends SerdeContextConfig {
                 if (jsonName) {
                     nameMap = {};
                 }
-                for (const [memberName, memberSchema] of serializingStructIterator(ns, record)) {
+                for (const [memberName, memberSchema] of ns.structIterator()) {
                     const serializableValue = this._write(memberSchema, record[memberName], ns);
                     if (serializableValue !== undefined) {
                         let targetKey = memberName;
@@ -1536,7 +1496,8 @@ class QueryShapeSerializer extends SerdeContextConfig {
                         if (item == null) {
                             continue;
                         }
-                        const suffix = this.getKey("member", member.getMergedTraits().xmlName);
+                        const traits = member.getMergedTraits();
+                        const suffix = this.getKey("member", traits.xmlName, traits.ec2QueryName);
                         const key = flat ? `${prefix}${i}` : `${prefix}${suffix}.${i}`;
                         this.write(member, item, key);
                         ++i;
@@ -1554,9 +1515,11 @@ class QueryShapeSerializer extends SerdeContextConfig {
                     if (v == null) {
                         continue;
                     }
-                    const keySuffix = this.getKey("key", keySchema.getMergedTraits().xmlName);
+                    const keyTraits = keySchema.getMergedTraits();
+                    const keySuffix = this.getKey("key", keyTraits.xmlName, keyTraits.ec2QueryName);
                     const key = flat ? `${prefix}${i}.${keySuffix}` : `${prefix}entry.${i}.${keySuffix}`;
-                    const valueSuffix = this.getKey("value", memberSchema.getMergedTraits().xmlName);
+                    const valTraits = memberSchema.getMergedTraits();
+                    const valueSuffix = this.getKey("value", valTraits.xmlName, valTraits.ec2QueryName);
                     const valueKey = flat ? `${prefix}${i}.${valueSuffix}` : `${prefix}entry.${i}.${valueSuffix}`;
                     this.write(keySchema, k, key);
                     this.write(memberSchema, v, valueKey);
@@ -1567,11 +1530,12 @@ class QueryShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             if (value && typeof value === "object") {
                 let didWriteMember = false;
-                for (const [memberName, member] of serializingStructIterator(ns, value)) {
+                for (const [memberName, member] of ns.structIterator()) {
                     if (value[memberName] == null && !member.isIdempotencyToken()) {
                         continue;
                     }
-                    const suffix = this.getKey(memberName, member.getMergedTraits().xmlName);
+                    const traits = member.getMergedTraits();
+                    const suffix = this.getKey(memberName, traits.xmlName, traits.ec2QueryName, "struct");
                     const key = `${prefix}${suffix}`;
                     this.write(member, value[memberName], key);
                     didWriteMember = true;
@@ -1599,9 +1563,13 @@ class QueryShapeSerializer extends SerdeContextConfig {
         delete this.buffer;
         return str;
     }
-    getKey(memberName, xmlName) {
+    getKey(memberName, xmlName, ec2QueryName, keySource) {
+        const { ec2, capitalizeKeys } = this.settings;
+        if (ec2 && ec2QueryName) {
+            return ec2QueryName;
+        }
         const key = xmlName ?? memberName;
-        if (this.settings.capitalizeKeys) {
+        if (capitalizeKeys && keySource === "struct") {
             return key[0].toUpperCase() + key.slice(1);
         }
         return key;
@@ -1758,6 +1726,7 @@ class AwsEc2QueryProtocol extends AwsQueryProtocol {
             capitalizeKeys: true,
             flattenLists: true,
             serializeEmptyLists: false,
+            ec2: true,
         };
         Object.assign(this.serializer.settings, ec2Settings);
     }
@@ -1868,7 +1837,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
         }
         const structXmlNode = xmlBuilder.XmlNode.of(name);
         const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
-        for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
+        for (const [memberName, memberSchema] of ns.structIterator()) {
             const val = value[memberName];
             if (val != null || memberSchema.isIdempotencyToken()) {
                 if (memberSchema.getMergedTraits().xmlAttribute) {
@@ -2165,6 +2134,17 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = loadRestXmlErrorCode(response, dataObject) ?? "Unknown";
+        if (dataObject.Error && typeof dataObject.Error === "object") {
+            for (const key of Object.keys(dataObject.Error)) {
+                dataObject[key] = dataObject.Error[key];
+                if (key.toLowerCase() === "message") {
+                    dataObject.message = dataObject.Error[key];
+                }
+            }
+        }
+        if (dataObject.RequestId && !metadata.requestId) {
+            metadata.requestId = dataObject.RequestId;
+        }
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.Error?.message ?? dataObject.Error?.Message ?? dataObject.message ?? dataObject.Message ?? "Unknown";

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

@@ -234,46 +234,6 @@ class SerdeContextConfig {
     }
 }
 
-function* serializingStructIterator(ns, sourceObject) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    for (let i = 0; i < struct[4].length; ++i) {
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        if (!(key in sourceObject) && !memberNs.isIdempotencyToken()) {
-            continue;
-        }
-        yield [key, memberNs];
-    }
-}
-function* deserializingStructIterator(ns, sourceObject, nameTrait) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    let keysRemaining = Object.keys(sourceObject).filter((k) => k !== "__type").length;
-    for (let i = 0; i < struct[4].length; ++i) {
-        if (keysRemaining === 0) {
-            break;
-        }
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        let serializationKey = key;
-        if (nameTrait) {
-            serializationKey = memberNs.getMergedTraits()[nameTrait] ?? key;
-        }
-        if (!(serializationKey in sourceObject)) {
-            continue;
-        }
-        yield [key, memberNs];
-        keysRemaining -= 1;
-    }
-}
-
 class UnionSerde {
     from;
     to;
@@ -401,7 +361,7 @@ class JsonShapeDeserializer extends SerdeContextConfig {
                 if (union) {
                     unionSerde = new UnionSerde(record, out);
                 }
-                for (const [memberName, memberSchema] of deserializingStructIterator(ns, record, jsonName ? "jsonName" : false)) {
+                for (const [memberName, memberSchema] of ns.structIterator()) {
                     let fromKey = memberName;
                     if (jsonName) {
                         fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
@@ -610,7 +570,7 @@ class JsonShapeSerializer extends SerdeContextConfig {
                 if (jsonName) {
                     nameMap = {};
                 }
-                for (const [memberName, memberSchema] of serializingStructIterator(ns, record)) {
+                for (const [memberName, memberSchema] of ns.structIterator()) {
                     const serializableValue = this._write(memberSchema, record[memberName], ns);
                     if (serializableValue !== undefined) {
                         let targetKey = memberName;
@@ -1198,7 +1158,8 @@ class QueryShapeSerializer extends SerdeContextConfig {
                         if (item == null) {
                             continue;
                         }
-                        const suffix = this.getKey("member", member.getMergedTraits().xmlName);
+                        const traits = member.getMergedTraits();
+                        const suffix = this.getKey("member", traits.xmlName, traits.ec2QueryName);
                         const key = flat ? `${prefix}${i}` : `${prefix}${suffix}.${i}`;
                         this.write(member, item, key);
                         ++i;
@@ -1216,9 +1177,11 @@ class QueryShapeSerializer extends SerdeContextConfig {
                     if (v == null) {
                         continue;
                     }
-                    const keySuffix = this.getKey("key", keySchema.getMergedTraits().xmlName);
+                    const keyTraits = keySchema.getMergedTraits();
+                    const keySuffix = this.getKey("key", keyTraits.xmlName, keyTraits.ec2QueryName);
                     const key = flat ? `${prefix}${i}.${keySuffix}` : `${prefix}entry.${i}.${keySuffix}`;
-                    const valueSuffix = this.getKey("value", memberSchema.getMergedTraits().xmlName);
+                    const valTraits = memberSchema.getMergedTraits();
+                    const valueSuffix = this.getKey("value", valTraits.xmlName, valTraits.ec2QueryName);
                     const valueKey = flat ? `${prefix}${i}.${valueSuffix}` : `${prefix}entry.${i}.${valueSuffix}`;
                     this.write(keySchema, k, key);
                     this.write(memberSchema, v, valueKey);
@@ -1229,11 +1192,12 @@ class QueryShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             if (value && typeof value === "object") {
                 let didWriteMember = false;
-                for (const [memberName, member] of serializingStructIterator(ns, value)) {
+                for (const [memberName, member] of ns.structIterator()) {
                     if (value[memberName] == null && !member.isIdempotencyToken()) {
                         continue;
                     }
-                    const suffix = this.getKey(memberName, member.getMergedTraits().xmlName);
+                    const traits = member.getMergedTraits();
+                    const suffix = this.getKey(memberName, traits.xmlName, traits.ec2QueryName, "struct");
                     const key = `${prefix}${suffix}`;
                     this.write(member, value[memberName], key);
                     didWriteMember = true;
@@ -1261,9 +1225,13 @@ class QueryShapeSerializer extends SerdeContextConfig {
         delete this.buffer;
         return str;
     }
-    getKey(memberName, xmlName) {
+    getKey(memberName, xmlName, ec2QueryName, keySource) {
+        const { ec2, capitalizeKeys } = this.settings;
+        if (ec2 && ec2QueryName) {
+            return ec2QueryName;
+        }
         const key = xmlName ?? memberName;
-        if (this.settings.capitalizeKeys) {
+        if (capitalizeKeys && keySource === "struct") {
             return key[0].toUpperCase() + key.slice(1);
         }
         return key;
@@ -1420,6 +1388,7 @@ class AwsEc2QueryProtocol extends AwsQueryProtocol {
             capitalizeKeys: true,
             flattenLists: true,
             serializeEmptyLists: false,
+            ec2: true,
         };
         Object.assign(this.serializer.settings, ec2Settings);
     }
@@ -1530,7 +1499,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
         }
         const structXmlNode = xmlBuilder.XmlNode.of(name);
         const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
-        for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
+        for (const [memberName, memberSchema] of ns.structIterator()) {
             const val = value[memberName];
             if (val != null || memberSchema.isIdempotencyToken()) {
                 if (memberSchema.getMergedTraits().xmlAttribute) {
@@ -1827,6 +1796,17 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = loadRestXmlErrorCode(response, dataObject) ?? "Unknown";
+        if (dataObject.Error && typeof dataObject.Error === "object") {
+            for (const key of Object.keys(dataObject.Error)) {
+                dataObject[key] = dataObject.Error[key];
+                if (key.toLowerCase() === "message") {
+                    dataObject.message = dataObject.Error[key];
+                }
+            }
+        }
+        if (dataObject.RequestId && !metadata.requestId) {
+            metadata.requestId = dataObject.RequestId;
+        }
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.Error?.message ?? dataObject.Error?.Message ?? dataObject.message ?? dataObject.Message ?? "Unknown";

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

@@ -3,7 +3,6 @@ import { NormalizedSchema } from "@smithy/core/schema";
 import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
 import { fromBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { deserializingStructIterator } from "../structIterator";
 import { UnionSerde } from "../UnionSerde";
 import { jsonReviver } from "./jsonReviver";
 import { parseJsonBody } from "./parseJsonBody";
@@ -36,7 +35,7 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
                 if (union) {
                     unionSerde = new UnionSerde(record, out);
                 }
-                for (const [memberName, memberSchema] of deserializingStructIterator(ns, record, jsonName ? "jsonName" : false)) {
+                for (const [memberName, memberSchema] of ns.structIterator()) {
                     let fromKey = memberName;
                     if (jsonName) {
                         fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;

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

@@ -3,7 +3,6 @@ import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
 import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../structIterator";
 import { JsonReplacer } from "./jsonReplacer";
 export class JsonShapeSerializer extends SerdeContextConfig {
     settings;
@@ -49,7 +48,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
                 if (jsonName) {
                     nameMap = {};
                 }
-                for (const [memberName, memberSchema] of serializingStructIterator(ns, record)) {
+                for (const [memberName, memberSchema] of ns.structIterator()) {
                     const serializableValue = this._write(memberSchema, record[memberName], ns);
                     if (serializableValue !== undefined) {
                         let targetKey = memberName;

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/experimental/SinglePassJsonShapeSerializer.js

@@ -3,7 +3,6 @@ import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
 import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../../structIterator";
 export class SinglePassJsonShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
@@ -46,7 +45,7 @@ export class SinglePassJsonShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             b += "{";
             let didWriteMember = false;
-            for (const [name, member] of serializingStructIterator(ns, value)) {
+            for (const [name, member] of ns.structIterator()) {
                 const item = value[name];
                 const targetKey = this.settings.jsonName ? member.getMergedTraits().jsonName ?? name : name;
                 const serializableValue = this.writeValue(member, item);

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

@@ -8,6 +8,7 @@ export class AwsEc2QueryProtocol extends AwsQueryProtocol {
             capitalizeKeys: true,
             flattenLists: true,
             serializeEmptyLists: false,
+            ec2: true,
         };
         Object.assign(this.serializer.settings, ec2Settings);
     }

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

@@ -4,7 +4,6 @@ import { generateIdempotencyToken, NumericValue } from "@smithy/core/serde";
 import { dateToUtcString } from "@smithy/smithy-client";
 import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../structIterator";
 export class QueryShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
@@ -99,7 +98,8 @@ export class QueryShapeSerializer extends SerdeContextConfig {
                         if (item == null) {
                             continue;
                         }
-                        const suffix = this.getKey("member", member.getMergedTraits().xmlName);
+                        const traits = member.getMergedTraits();
+                        const suffix = this.getKey("member", traits.xmlName, traits.ec2QueryName);
                         const key = flat ? `${prefix}${i}` : `${prefix}${suffix}.${i}`;
                         this.write(member, item, key);
                         ++i;
@@ -117,9 +117,11 @@ export class QueryShapeSerializer extends SerdeContextConfig {
                     if (v == null) {
                         continue;
                     }
-                    const keySuffix = this.getKey("key", keySchema.getMergedTraits().xmlName);
+                    const keyTraits = keySchema.getMergedTraits();
+                    const keySuffix = this.getKey("key", keyTraits.xmlName, keyTraits.ec2QueryName);
                     const key = flat ? `${prefix}${i}.${keySuffix}` : `${prefix}entry.${i}.${keySuffix}`;
-                    const valueSuffix = this.getKey("value", memberSchema.getMergedTraits().xmlName);
+                    const valTraits = memberSchema.getMergedTraits();
+                    const valueSuffix = this.getKey("value", valTraits.xmlName, valTraits.ec2QueryName);
                     const valueKey = flat ? `${prefix}${i}.${valueSuffix}` : `${prefix}entry.${i}.${valueSuffix}`;
                     this.write(keySchema, k, key);
                     this.write(memberSchema, v, valueKey);
@@ -130,11 +132,12 @@ export class QueryShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             if (value && typeof value === "object") {
                 let didWriteMember = false;
-                for (const [memberName, member] of serializingStructIterator(ns, value)) {
+                for (const [memberName, member] of ns.structIterator()) {
                     if (value[memberName] == null && !member.isIdempotencyToken()) {
                         continue;
                     }
-                    const suffix = this.getKey(memberName, member.getMergedTraits().xmlName);
+                    const traits = member.getMergedTraits();
+                    const suffix = this.getKey(memberName, traits.xmlName, traits.ec2QueryName, "struct");
                     const key = `${prefix}${suffix}`;
                     this.write(member, value[memberName], key);
                     didWriteMember = true;
@@ -163,9 +166,13 @@ export class QueryShapeSerializer extends SerdeContextConfig {
         delete this.buffer;
         return str;
     }
-    getKey(memberName, xmlName) {
+    getKey(memberName, xmlName, ec2QueryName, keySource) {
+        const { ec2, capitalizeKeys } = this.settings;
+        if (ec2 && ec2QueryName) {
+            return ec2QueryName;
+        }
         const key = xmlName ?? memberName;
-        if (this.settings.capitalizeKeys) {
+        if (capitalizeKeys && keySource === "struct") {
             return key[0].toUpperCase() + key.slice(1);
         }
         return key;

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

@@ -51,6 +51,17 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = loadRestXmlErrorCode(response, dataObject) ?? "Unknown";
+        if (dataObject.Error && typeof dataObject.Error === "object") {
+            for (const key of Object.keys(dataObject.Error)) {
+                dataObject[key] = dataObject.Error[key];
+                if (key.toLowerCase() === "message") {
+                    dataObject.message = dataObject.Error[key];
+                }
+            }
+        }
+        if (dataObject.RequestId && !metadata.requestId) {
+            metadata.requestId = dataObject.RequestId;
+        }
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.Error?.message ?? dataObject.Error?.Message ?? dataObject.message ?? dataObject.Message ?? "Unknown";