@jjrawlins/cdk-iam-policy-builder-helper 0.0.36 → 0.0.38

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

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-iam",
   "description": "AWS SDK for JavaScript Iam Client for Node.js, Browser and React Native",
-  "version": "3.891.0",
+  "version": "3.896.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-iam",
@@ -20,38 +20,38 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.890.0",
-    "@aws-sdk/credential-provider-node": "3.891.0",
-    "@aws-sdk/middleware-host-header": "3.891.0",
-    "@aws-sdk/middleware-logger": "3.891.0",
-    "@aws-sdk/middleware-recursion-detection": "3.891.0",
-    "@aws-sdk/middleware-user-agent": "3.891.0",
-    "@aws-sdk/region-config-resolver": "3.890.0",
-    "@aws-sdk/types": "3.887.0",
-    "@aws-sdk/util-endpoints": "3.891.0",
-    "@aws-sdk/util-user-agent-browser": "3.887.0",
-    "@aws-sdk/util-user-agent-node": "3.891.0",
+    "@aws-sdk/core": "3.896.0",
+    "@aws-sdk/credential-provider-node": "3.896.0",
+    "@aws-sdk/middleware-host-header": "3.893.0",
+    "@aws-sdk/middleware-logger": "3.893.0",
+    "@aws-sdk/middleware-recursion-detection": "3.893.0",
+    "@aws-sdk/middleware-user-agent": "3.896.0",
+    "@aws-sdk/region-config-resolver": "3.893.0",
+    "@aws-sdk/types": "3.893.0",
+    "@aws-sdk/util-endpoints": "3.895.0",
+    "@aws-sdk/util-user-agent-browser": "3.893.0",
+    "@aws-sdk/util-user-agent-node": "3.896.0",
     "@smithy/config-resolver": "^4.2.2",
-    "@smithy/core": "^3.11.0",
+    "@smithy/core": "^3.12.0",
     "@smithy/fetch-http-handler": "^5.2.1",
     "@smithy/hash-node": "^4.1.1",
     "@smithy/invalid-dependency": "^4.1.1",
     "@smithy/middleware-content-length": "^4.1.1",
-    "@smithy/middleware-endpoint": "^4.2.2",
-    "@smithy/middleware-retry": "^4.2.3",
+    "@smithy/middleware-endpoint": "^4.2.4",
+    "@smithy/middleware-retry": "^4.3.0",
     "@smithy/middleware-serde": "^4.1.1",
     "@smithy/middleware-stack": "^4.1.1",
     "@smithy/node-config-provider": "^4.2.2",
     "@smithy/node-http-handler": "^4.2.1",
     "@smithy/protocol-http": "^5.2.1",
-    "@smithy/smithy-client": "^4.6.2",
+    "@smithy/smithy-client": "^4.6.4",
     "@smithy/types": "^4.5.0",
     "@smithy/url-parser": "^4.1.1",
     "@smithy/util-base64": "^4.1.0",
     "@smithy/util-body-length-browser": "^4.1.0",
     "@smithy/util-body-length-node": "^4.1.0",
-    "@smithy/util-defaults-mode-browser": "^4.1.2",
-    "@smithy/util-defaults-mode-node": "^4.1.2",
+    "@smithy/util-defaults-mode-browser": "^4.1.4",
+    "@smithy/util-defaults-mode-node": "^4.1.4",
     "@smithy/util-endpoints": "^3.1.2",
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",

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.891.0",
+  "version": "3.896.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sso",
@@ -20,37 +20,37 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.890.0",
-    "@aws-sdk/middleware-host-header": "3.891.0",
-    "@aws-sdk/middleware-logger": "3.891.0",
-    "@aws-sdk/middleware-recursion-detection": "3.891.0",
-    "@aws-sdk/middleware-user-agent": "3.891.0",
-    "@aws-sdk/region-config-resolver": "3.890.0",
-    "@aws-sdk/types": "3.887.0",
-    "@aws-sdk/util-endpoints": "3.891.0",
-    "@aws-sdk/util-user-agent-browser": "3.887.0",
-    "@aws-sdk/util-user-agent-node": "3.891.0",
+    "@aws-sdk/core": "3.896.0",
+    "@aws-sdk/middleware-host-header": "3.893.0",
+    "@aws-sdk/middleware-logger": "3.893.0",
+    "@aws-sdk/middleware-recursion-detection": "3.893.0",
+    "@aws-sdk/middleware-user-agent": "3.896.0",
+    "@aws-sdk/region-config-resolver": "3.893.0",
+    "@aws-sdk/types": "3.893.0",
+    "@aws-sdk/util-endpoints": "3.895.0",
+    "@aws-sdk/util-user-agent-browser": "3.893.0",
+    "@aws-sdk/util-user-agent-node": "3.896.0",
     "@smithy/config-resolver": "^4.2.2",
-    "@smithy/core": "^3.11.0",
+    "@smithy/core": "^3.12.0",
     "@smithy/fetch-http-handler": "^5.2.1",
     "@smithy/hash-node": "^4.1.1",
     "@smithy/invalid-dependency": "^4.1.1",
     "@smithy/middleware-content-length": "^4.1.1",
-    "@smithy/middleware-endpoint": "^4.2.2",
-    "@smithy/middleware-retry": "^4.2.3",
+    "@smithy/middleware-endpoint": "^4.2.4",
+    "@smithy/middleware-retry": "^4.3.0",
     "@smithy/middleware-serde": "^4.1.1",
     "@smithy/middleware-stack": "^4.1.1",
     "@smithy/node-config-provider": "^4.2.2",
     "@smithy/node-http-handler": "^4.2.1",
     "@smithy/protocol-http": "^5.2.1",
-    "@smithy/smithy-client": "^4.6.2",
+    "@smithy/smithy-client": "^4.6.4",
     "@smithy/types": "^4.5.0",
     "@smithy/url-parser": "^4.1.1",
     "@smithy/util-base64": "^4.1.0",
     "@smithy/util-body-length-browser": "^4.1.0",
     "@smithy/util-body-length-node": "^4.1.0",
-    "@smithy/util-defaults-mode-browser": "^4.1.2",
-    "@smithy/util-defaults-mode-node": "^4.1.2",
+    "@smithy/util-defaults-mode-browser": "^4.1.4",
+    "@smithy/util-defaults-mode-node": "^4.1.4",
     "@smithy/util-endpoints": "^3.1.2",
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",

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

@@ -54,22 +54,10 @@ var import_schema2 = require("@smithy/core/schema");
 
 // src/submodules/protocols/ProtocolLib.ts
 var import_schema = require("@smithy/core/schema");
-var import_util_body_length_browser = require("@smithy/util-body-length-browser");
 var ProtocolLib = class {
   static {
     __name(this, "ProtocolLib");
   }
-  /**
-   * @param body - to be inspected.
-   * @param serdeContext - this is a subset type but in practice is the client.config having a property called bodyLengthChecker.
-   *
-   * @returns content-length value for the body if possible.
-   * @throws Error and should be caught and handled if not possible to determine length.
-   */
-  calculateContentLength(body, serdeContext) {
-    const bodyLengthCalculator = serdeContext?.bodyLengthChecker ?? import_util_body_length_browser.calculateBodyLength;
-    return String(bodyLengthCalculator(body));
-  }
   /**
    * This is only for REST protocols.
    *
@@ -127,9 +115,7 @@ var ProtocolLib = class {
       const errorSchema = getErrorSchema?.(registry, errorName) ?? registry.getSchema(errorIdentifier);
       return { errorSchema, errorMetadata };
     } catch (e) {
-      if (dataObject.Message) {
-        dataObject.message = dataObject.Message;
-      }
+      dataObject.message = dataObject.message ?? dataObject.Message ?? "UnknownError";
       const baseExceptionSchema = import_schema.TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace).getBaseException();
       if (baseExceptionSchema) {
         const ErrorCtor = baseExceptionSchema.ctor;
@@ -683,7 +669,7 @@ var JsonShapeSerializer = class extends SerdeContextConfig {
         return (0, import_serde4.generateIdempotencyToken)();
       }
       const mediaType = ns.getMergedTraits().mediaType;
-      if (typeof value === "string" && mediaType) {
+      if (value != null && mediaType) {
         const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
         if (isJson) {
           return import_serde4.LazyJsonString.from(value);
@@ -776,10 +762,6 @@ var AwsJsonRpcProtocol = class extends import_protocols3.RpcProtocol {
     if ((0, import_schema5.deref)(operationSchema.input) === "unit" || !request.body) {
       request.body = "{}";
     }
-    try {
-      request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-    } catch (e) {
-    }
     return request;
   }
   getPayloadCodec() {
@@ -929,12 +911,6 @@ var AwsRestJsonProtocol = class extends import_protocols4.HttpBindingProtocol {
     if (request.headers["content-type"] && !request.body) {
       request.body = "{}";
     }
-    if (request.body) {
-      try {
-        request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-      } catch (e) {
-      }
-    }
     return request;
   }
   async handleError(operationSchema, context, response, dataObject, metadata) {
@@ -990,11 +966,11 @@ var import_protocols7 = require("@smithy/core/protocols");
 var import_schema9 = require("@smithy/core/schema");
 
 // src/submodules/protocols/xml/XmlShapeDeserializer.ts
+var import_xml_builder = require("@aws-sdk/xml-builder");
 var import_protocols5 = require("@smithy/core/protocols");
 var import_schema7 = require("@smithy/core/schema");
 var import_smithy_client3 = require("@smithy/smithy-client");
 var import_util_utf82 = require("@smithy/util-utf8");
-var import_fast_xml_parser = require("fast-xml-parser");
 var XmlShapeDeserializer = class extends SerdeContextConfig {
   constructor(settings) {
     super();
@@ -1037,6 +1013,9 @@ var XmlShapeDeserializer = class extends SerdeContextConfig {
   }
   readSchema(_schema, value) {
     const ns = import_schema7.NormalizedSchema.of(_schema);
+    if (ns.isUnitSchema()) {
+      return;
+    }
     const traits = ns.getMergedTraits();
     if (ns.isListSchema() && !Array.isArray(value)) {
       return this.readSchema(ns, [value]);
@@ -1106,20 +1085,9 @@ var XmlShapeDeserializer = class extends SerdeContextConfig {
   }
   parseXml(xml) {
     if (xml.length) {
-      const parser = new import_fast_xml_parser.XMLParser({
-        attributeNamePrefix: "",
-        htmlEntities: true,
-        ignoreAttributes: false,
-        ignoreDeclaration: true,
-        parseTagValue: false,
-        trimValues: false,
-        tagValueProcessor: /* @__PURE__ */ __name((_, val) => val.trim() === "" && val.includes("\n") ? "" : void 0, "tagValueProcessor")
-      });
-      parser.addEntity("#xD", "\r");
-      parser.addEntity("#10", "\n");
       let parsedObj;
       try {
-        parsedObj = parser.parse(xml, true);
+        parsedObj = (0, import_xml_builder.parseXML)(xml);
       } catch (e) {
         if (e && typeof e === "object") {
           Object.defineProperty(e, "$responseBodyText", {
@@ -1340,10 +1308,6 @@ var AwsQueryProtocol = class extends import_protocols7.RpcProtocol {
     if (request.body.endsWith("&")) {
       request.body = request.body.slice(-1);
     }
-    try {
-      request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-    } catch (e) {
-    }
     return request;
   }
   async deserializeResponse(operationSchema, context, response) {
@@ -1383,6 +1347,13 @@ var AwsQueryProtocol = class extends import_protocols7.RpcProtocol {
   async handleError(operationSchema, context, response, dataObject, metadata) {
     const errorIdentifier = this.loadQueryErrorCode(response, dataObject) ?? "Unknown";
     const errorData = this.loadQueryError(dataObject);
+    const message = this.loadQueryErrorMessage(dataObject);
+    errorData.message = message;
+    errorData.Error = {
+      Type: errorData.Type,
+      Code: errorData.Code,
+      Message: message
+    };
     const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(
       errorIdentifier,
       this.options.defaultNamespace,
@@ -1394,9 +1365,10 @@ var AwsQueryProtocol = class extends import_protocols7.RpcProtocol {
       )
     );
     const ns = import_schema9.NormalizedSchema.of(errorSchema);
-    const message = this.loadQueryErrorMessage(dataObject);
     const exception = new errorSchema.ctor(message);
-    const output = {};
+    const output = {
+      Error: errorData.Error
+    };
     for (const [name, member] of ns.structIterator()) {
       const target = member.getMergedTraits().xmlName ?? name;
       const value = errorData[target] ?? dataObject[target];
@@ -1468,24 +1440,13 @@ var import_protocols9 = require("@smithy/core/protocols");
 var import_schema11 = require("@smithy/core/schema");
 
 // src/submodules/protocols/xml/parseXmlBody.ts
+var import_xml_builder2 = require("@aws-sdk/xml-builder");
 var import_smithy_client5 = require("@smithy/smithy-client");
-var import_fast_xml_parser2 = require("fast-xml-parser");
 var parseXmlBody = /* @__PURE__ */ __name((streamBody, context) => collectBodyString(streamBody, context).then((encoded) => {
   if (encoded.length) {
-    const parser = new import_fast_xml_parser2.XMLParser({
-      attributeNamePrefix: "",
-      htmlEntities: true,
-      ignoreAttributes: false,
-      ignoreDeclaration: true,
-      parseTagValue: false,
-      trimValues: false,
-      tagValueProcessor: /* @__PURE__ */ __name((_, val) => val.trim() === "" && val.includes("\n") ? "" : void 0, "tagValueProcessor")
-    });
-    parser.addEntity("#xD", "\r");
-    parser.addEntity("#10", "\n");
     let parsedObj;
     try {
-      parsedObj = parser.parse(encoded, true);
+      parsedObj = (0, import_xml_builder2.parseXML)(encoded);
     } catch (e) {
       if (e && typeof e === "object") {
         Object.defineProperty(e, "$responseBodyText", {
@@ -1525,7 +1486,7 @@ var loadRestXmlErrorCode = /* @__PURE__ */ __name((output, data) => {
 }, "loadRestXmlErrorCode");
 
 // src/submodules/protocols/xml/XmlShapeSerializer.ts
-var import_xml_builder = require("@aws-sdk/xml-builder");
+var import_xml_builder3 = require("@aws-sdk/xml-builder");
 var import_protocols8 = require("@smithy/core/protocols");
 var import_schema10 = require("@smithy/core/schema");
 var import_serde6 = require("@smithy/core/serde");
@@ -1586,7 +1547,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
         )}.`
       );
     }
-    const structXmlNode = import_xml_builder.XmlNode.of(name);
+    const structXmlNode = import_xml_builder3.XmlNode.of(name);
     const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
     for (const [memberName, memberSchema] of ns.structIterator()) {
       const val = value[memberName];
@@ -1605,7 +1566,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
         } else if (memberSchema.isStructSchema()) {
           structXmlNode.addChildNode(this.writeStruct(memberSchema, val, xmlns));
         } else {
-          const memberNode = import_xml_builder.XmlNode.of(memberSchema.getMergedTraits().xmlName ?? memberSchema.getMemberName());
+          const memberNode = import_xml_builder3.XmlNode.of(memberSchema.getMergedTraits().xmlName ?? memberSchema.getMemberName());
           this.writeSimpleInto(memberSchema, val, memberNode, xmlns);
           structXmlNode.addChildNode(memberNode);
         }
@@ -1639,7 +1600,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
           struct.withName(flat ? listTraits.xmlName ?? listMember.getMemberName() : listValueTraits.xmlName ?? "member")
         );
       } else {
-        const listItemNode = import_xml_builder.XmlNode.of(
+        const listItemNode = import_xml_builder3.XmlNode.of(
           flat ? listTraits.xmlName ?? listMember.getMemberName() : listValueTraits.xmlName ?? "member"
         );
         this.writeSimpleInto(listValueSchema, value, listItemNode, xmlns);
@@ -1653,7 +1614,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
         }
       }
     } else {
-      const listNode = import_xml_builder.XmlNode.of(listTraits.xmlName ?? listMember.getMemberName());
+      const listNode = import_xml_builder3.XmlNode.of(listTraits.xmlName ?? listMember.getMemberName());
       if (xmlns) {
         listNode.addAttribute(xmlnsAttr, xmlns);
       }
@@ -1682,13 +1643,13 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
     const flat = !!mapTraits.xmlFlattened;
     const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(mapMember, parentXmlns);
     const addKeyValue = /* @__PURE__ */ __name((entry, key, val) => {
-      const keyNode = import_xml_builder.XmlNode.of(keyTag, key);
+      const keyNode = import_xml_builder3.XmlNode.of(keyTag, key);
       const [keyXmlnsAttr, keyXmlns] = this.getXmlnsAttribute(mapKeySchema, xmlns);
       if (keyXmlns) {
         keyNode.addAttribute(keyXmlnsAttr, keyXmlns);
       }
       entry.addChildNode(keyNode);
-      let valueNode = import_xml_builder.XmlNode.of(valueTag);
+      let valueNode = import_xml_builder3.XmlNode.of(valueTag);
       if (mapValueSchema.isListSchema()) {
         this.writeList(mapValueSchema, val, valueNode, xmlns);
       } else if (mapValueSchema.isMapSchema()) {
@@ -1703,7 +1664,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
     if (flat) {
       for (const [key, val] of Object.entries(map)) {
         if (sparse || val != null) {
-          const entry = import_xml_builder.XmlNode.of(mapTraits.xmlName ?? mapMember.getMemberName());
+          const entry = import_xml_builder3.XmlNode.of(mapTraits.xmlName ?? mapMember.getMemberName());
           addKeyValue(entry, key, val);
           container.addChildNode(entry);
         }
@@ -1711,7 +1672,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
     } else {
       let mapNode;
       if (!containerIsMap) {
-        mapNode = import_xml_builder.XmlNode.of(mapTraits.xmlName ?? mapMember.getMemberName());
+        mapNode = import_xml_builder3.XmlNode.of(mapTraits.xmlName ?? mapMember.getMemberName());
         if (xmlns) {
           mapNode.addAttribute(xmlnsAttr, xmlns);
         }
@@ -1719,7 +1680,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
       }
       for (const [key, val] of Object.entries(map)) {
         if (sparse || val != null) {
-          const entry = import_xml_builder.XmlNode.of("entry");
+          const entry = import_xml_builder3.XmlNode.of("entry");
           addKeyValue(entry, key, val);
           (containerIsMap ? container : mapNode).addChildNode(entry);
         }
@@ -1787,7 +1748,7 @@ var XmlShapeSerializer = class extends SerdeContextConfig {
   writeSimpleInto(_schema, value, into, parentXmlns) {
     const nodeContents = this.writeSimple(_schema, value);
     const ns = import_schema10.NormalizedSchema.of(_schema);
-    const content = new import_xml_builder.XmlText(nodeContents);
+    const content = new import_xml_builder3.XmlText(nodeContents);
     const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
     if (xmlns) {
       into.addAttribute(xmlnsAttr, xmlns);
@@ -1869,12 +1830,6 @@ var AwsRestXmlProtocol = class extends import_protocols9.HttpBindingProtocol {
         request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
       }
     }
-    if (request.body) {
-      try {
-        request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-      } catch (e) {
-      }
-    }
     return request;
   }
   async deserializeResponse(operationSchema, context, response) {

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

@@ -1,10 +1,5 @@
 import { TypeRegistry } from "@smithy/core/schema";
-import { calculateBodyLength } from "@smithy/util-body-length-browser";
 export class ProtocolLib {
-    calculateContentLength(body, serdeContext) {
-        const bodyLengthCalculator = serdeContext?.bodyLengthChecker ?? calculateBodyLength;
-        return String(bodyLengthCalculator(body));
-    }
     resolveRestContentType(defaultContentType, inputSchema) {
         const members = inputSchema.getMemberSchemas();
         const httpPayloadMember = Object.values(members).find((m) => {
@@ -53,9 +48,7 @@ export class ProtocolLib {
             return { errorSchema, errorMetadata };
         }
         catch (e) {
-            if (dataObject.Message) {
-                dataObject.message = dataObject.Message;
-            }
+            dataObject.message = dataObject.message ?? dataObject.Message ?? "UnknownError";
             const baseExceptionSchema = TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace).getBaseException();
             if (baseExceptionSchema) {
                 const ErrorCtor = baseExceptionSchema.ctor;

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

@@ -41,10 +41,6 @@ export class AwsJsonRpcProtocol extends RpcProtocol {
         if (deref(operationSchema.input) === "unit" || !request.body) {
             request.body = "{}";
         }
-        try {
-            request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-        }
-        catch (e) { }
         return request;
     }
     getPayloadCodec() {

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

@@ -46,12 +46,6 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
         if (request.headers["content-type"] && !request.body) {
             request.body = "{}";
         }
-        if (request.body) {
-            try {
-                request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-            }
-            catch (e) { }
-        }
         return request;
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {

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

@@ -104,7 +104,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
                 return generateIdempotencyToken();
             }
             const mediaType = ns.getMergedTraits().mediaType;
-            if (typeof value === "string" && mediaType) {
+            if (value != null && mediaType) {
                 const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
                 if (isJson) {
                     return LazyJsonString.from(value);

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

@@ -52,10 +52,6 @@ export class AwsQueryProtocol extends RpcProtocol {
         if (request.body.endsWith("&")) {
             request.body = request.body.slice(-1);
         }
-        try {
-            request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-        }
-        catch (e) { }
         return request;
     }
     async deserializeResponse(operationSchema, context, response) {
@@ -92,11 +88,19 @@ export class AwsQueryProtocol extends RpcProtocol {
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = this.loadQueryErrorCode(response, dataObject) ?? "Unknown";
         const errorData = this.loadQueryError(dataObject);
+        const message = this.loadQueryErrorMessage(dataObject);
+        errorData.message = message;
+        errorData.Error = {
+            Type: errorData.Type,
+            Code: errorData.Code,
+            Message: message,
+        };
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, (registry, errorName) => registry.find((schema) => NormalizedSchema.of(schema).getMergedTraits().awsQueryError?.[0] === errorName));
         const ns = NormalizedSchema.of(errorSchema);
-        const message = this.loadQueryErrorMessage(dataObject);
         const exception = new errorSchema.ctor(message);
-        const output = {};
+        const output = {
+            Error: errorData.Error,
+        };
         for (const [name, member] of ns.structIterator()) {
             const target = member.getMergedTraits().xmlName ?? name;
             const value = errorData[target] ?? dataObject[target];

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

@@ -43,12 +43,6 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
                 request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
             }
         }
-        if (request.body) {
-            try {
-                request.headers["content-length"] = this.mixin.calculateContentLength(request.body, this.serdeContext);
-            }
-            catch (e) { }
-        }
         return request;
     }
     async deserializeResponse(operationSchema, context, response) {

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

@@ -1,8 +1,8 @@
+import { parseXML } from "@aws-sdk/xml-builder";
 import { FromStringShapeDeserializer } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { getValueFromTextNode } from "@smithy/smithy-client";
 import { toUtf8 } from "@smithy/util-utf8";
-import { XMLParser } from "fast-xml-parser";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 export class XmlShapeDeserializer extends SerdeContextConfig {
     settings;
@@ -42,6 +42,9 @@ export class XmlShapeDeserializer extends SerdeContextConfig {
     }
     readSchema(_schema, value) {
         const ns = NormalizedSchema.of(_schema);
+        if (ns.isUnitSchema()) {
+            return;
+        }
         const traits = ns.getMergedTraits();
         if (ns.isListSchema() && !Array.isArray(value)) {
             return this.readSchema(ns, [value]);
@@ -114,20 +117,9 @@ export class XmlShapeDeserializer extends SerdeContextConfig {
     }
     parseXml(xml) {
         if (xml.length) {
-            const parser = new XMLParser({
-                attributeNamePrefix: "",
-                htmlEntities: true,
-                ignoreAttributes: false,
-                ignoreDeclaration: true,
-                parseTagValue: false,
-                trimValues: false,
-                tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
-            });
-            parser.addEntity("#xD", "\r");
-            parser.addEntity("#10", "\n");
             let parsedObj;
             try {
-                parsedObj = parser.parse(xml, true);
+                parsedObj = parseXML(xml);
             }
             catch (e) {
                 if (e && typeof e === "object") {

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

@@ -1,22 +1,11 @@
+import { parseXML } from "@aws-sdk/xml-builder";
 import { getValueFromTextNode } from "@smithy/smithy-client";
-import { XMLParser } from "fast-xml-parser";
 import { collectBodyString } from "../common";
 export const parseXmlBody = (streamBody, context) => collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
-        const parser = new XMLParser({
-            attributeNamePrefix: "",
-            htmlEntities: true,
-            ignoreAttributes: false,
-            ignoreDeclaration: true,
-            parseTagValue: false,
-            trimValues: false,
-            tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
-        });
-        parser.addEntity("#xD", "\r");
-        parser.addEntity("#10", "\n");
         let parsedObj;
         try {
-            parsedObj = parser.parse(encoded, true);
+            parsedObj = parseXML(encoded);
         }
         catch (e) {
             if (e && typeof e === "object") {

package/node_modules/@aws-sdk/core/dist-types/submodules/protocols/ProtocolLib.d.ts

@@ -1,5 +1,5 @@
 import { ErrorSchema, NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
-import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata, SerdeFunctions } from "@smithy/types";
+import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata } from "@smithy/types";
 /**
  * @internal
  */
@@ -13,14 +13,6 @@ type ErrorMetadataBearer = MetadataBearer & {
  * @internal
  */
 export declare class ProtocolLib {
-    /**
-     * @param body - to be inspected.
-     * @param serdeContext - this is a subset type but in practice is the client.config having a property called bodyLengthChecker.
-     *
-     * @returns content-length value for the body if possible.
-     * @throws Error and should be caught and handled if not possible to determine length.
-     */
-    calculateContentLength(body: any, serdeContext?: SerdeFunctions): string;
     /**
      * This is only for REST protocols.
      *

package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/protocols/ProtocolLib.d.ts

@@ -7,14 +7,12 @@ import {
   HttpResponse as IHttpResponse,
   MetadataBearer,
   ResponseMetadata,
-  SerdeFunctions,
 } from "@smithy/types";
 type ErrorMetadataBearer = MetadataBearer & {
   $response: IHttpResponse;
   $fault: "client" | "server";
 };
 export declare class ProtocolLib {
-  calculateContentLength(body: any, serdeContext?: SerdeFunctions): string;
   resolveRestContentType(
     defaultContentType: string,
     inputSchema: NormalizedSchema

package/node_modules/@aws-sdk/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/core",
-  "version": "3.890.0",
+  "version": "3.896.0",
   "description": "Core functions & classes shared by multiple AWS SDK clients.",
   "scripts": {
     "build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
@@ -81,20 +81,18 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "3.887.0",
-    "@aws-sdk/xml-builder": "3.887.0",
-    "@smithy/core": "^3.11.0",
+    "@aws-sdk/types": "3.893.0",
+    "@aws-sdk/xml-builder": "3.894.0",
+    "@smithy/core": "^3.12.0",
     "@smithy/node-config-provider": "^4.2.2",
     "@smithy/property-provider": "^4.1.1",
     "@smithy/protocol-http": "^5.2.1",
     "@smithy/signature-v4": "^5.2.1",
-    "@smithy/smithy-client": "^4.6.2",
+    "@smithy/smithy-client": "^4.6.4",
     "@smithy/types": "^4.5.0",
     "@smithy/util-base64": "^4.1.0",
-    "@smithy/util-body-length-browser": "^4.1.0",
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-utf8": "^4.1.0",
-    "fast-xml-parser": "5.2.5",
     "tslib": "^2.6.2"
   },
   "devDependencies": {