chore(clients): call decode for HTML entities in XML parser

Author: trivikr

clients/client-auto-scaling/package.json

@@ -57,10 +57,12 @@
     "@aws-sdk/util-utf8-node": "3.13.1",
     "@aws-sdk/util-waiter": "3.15.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",

clients/client-auto-scaling/protocols/Aws_query.ts

@@ -343,6 +343,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 
 export const serializeAws_queryAttachInstancesCommand = async (
   input: AttachInstancesCommandInput,
@@ -9378,14 +9379,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -9394,7 +9387,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-cloudformation/package.json

@@ -57,11 +57,13 @@
     "@aws-sdk/util-utf8-node": "3.13.1",
     "@aws-sdk/util-waiter": "3.15.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "@types/uuid": "^8.3.0",
     "downlevel-dts": "0.7.0",

clients/client-cloudformation/protocols/Aws_query.ts

@@ -318,6 +318,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 import { v4 as generateIdempotencyToken } from "uuid";
 
 export const serializeAws_queryCancelUpdateStackCommand = async (
@@ -9645,14 +9646,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -9661,7 +9654,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-cloudfront/package.json

@@ -58,10 +58,12 @@
     "@aws-sdk/util-waiter": "3.15.0",
     "@aws-sdk/xml-builder": "3.14.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",

clients/client-cloudfront/protocols/Aws_restXml.ts

@@ -487,6 +487,7 @@ import {
 } from "@aws-sdk/types";
 import { XmlNode as __XmlNode, XmlText as __XmlText } from "@aws-sdk/xml-builder";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 
 export const serializeAws_restXmlCreateCachePolicyCommand = async (
   input: CreateCachePolicyCommandInput,
@@ -18506,14 +18507,6 @@ const isSerializableHeaderValue = (value: any): boolean =>
   (!Object.getOwnPropertyNames(value).includes("length") || value.length != 0) &&
   (!Object.getOwnPropertyNames(value).includes("size") || value.size != 0);
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -18522,7 +18515,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-cloudsearch/package.json

@@ -56,10 +56,12 @@
     "@aws-sdk/util-utf8-browser": "3.13.1",
     "@aws-sdk/util-utf8-node": "3.13.1",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",

clients/client-cloudsearch/protocols/Aws_query.ts

@@ -169,6 +169,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 
 export const serializeAws_queryBuildSuggestersCommand = async (
   input: BuildSuggestersCommandInput,
@@ -4860,14 +4861,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -4876,7 +4869,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-cloudwatch/package.json

@@ -57,10 +57,12 @@
     "@aws-sdk/util-utf8-node": "3.13.1",
     "@aws-sdk/util-waiter": "3.15.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",

clients/client-cloudwatch/protocols/Aws_query.ts

@@ -191,6 +191,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 
 export const serializeAws_queryDeleteAlarmsCommand = async (
   input: DeleteAlarmsCommandInput,
@@ -6351,14 +6352,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -6367,7 +6360,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-docdb/package.json

@@ -58,10 +58,12 @@
     "@aws-sdk/util-utf8-node": "3.13.1",
     "@aws-sdk/util-waiter": "3.15.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",

clients/client-docdb/protocols/Aws_query.ts

@@ -296,6 +296,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 
 export const serializeAws_queryAddTagsToResourceCommand = async (
   input: AddTagsToResourceCommandInput,
@@ -8697,14 +8698,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -8713,7 +8706,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-ec2/package.json

@@ -58,11 +58,13 @@
     "@aws-sdk/util-utf8-node": "3.13.1",
     "@aws-sdk/util-waiter": "3.15.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "@types/uuid": "^8.3.0",
     "downlevel-dts": "0.7.0",

clients/client-ec2/protocols/Aws_ec2.ts

@@ -2897,6 +2897,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 import { v4 as generateIdempotencyToken } from "uuid";
 
 export const serializeAws_ec2AcceptReservedInstancesExchangeQuoteCommand = async (
@@ -71681,14 +71682,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -71697,7 +71690,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-elastic-beanstalk/package.json

@@ -57,10 +57,12 @@
     "@aws-sdk/util-utf8-node": "3.13.1",
     "@aws-sdk/util-waiter": "3.15.0",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",

clients/client-elastic-beanstalk/protocols/Aws_query.ts

@@ -326,6 +326,7 @@ import {
   SerdeContext as __SerdeContext,
 } from "@aws-sdk/types";
 import { parse as xmlParse } from "fast-xml-parser";
+import { decode as heDecode } from "he";
 
 export const serializeAws_queryAbortEnvironmentUpdateCommand = async (
   input: AbortEnvironmentUpdateCommandInput,
@@ -8194,14 +8195,6 @@ const buildHttpRpcRequest = async (
   return new __HttpRequest(contents);
 };
 
-const decodeEscapedXML = (str: string) =>
-  str
-    .replace(/&/g, "&")
-    .replace(/'/g, "'")
-    .replace(/"/g, '"')
-    .replace(/>/g, ">")
-    .replace(/&lt;/g, "<");
-
 const parseBody = (streamBody: any, context: __SerdeContext): any =>
   collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -8210,7 +8203,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
         ignoreAttributes: false,
         parseNodeValue: false,
         trimValues: false,
-        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeEscapedXML(val)),
+        tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : heDecode(val)),
       });
       const textNodeName = "#text";
       const key = Object.keys(parsedObj)[0];

clients/client-elastic-load-balancing-v2/package.json

@@ -56,10 +56,12 @@
     "@aws-sdk/util-utf8-browser": "3.13.1",
     "@aws-sdk/util-utf8-node": "3.13.1",
     "fast-xml-parser": "3.19.0",
+    "he": "1.2.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "3.15.0",
+    "@types/he": "1.1.1",
     "@types/node": "^12.7.5",
     "downlevel-dts": "0.7.0",
     "jest": "^26.1.0",