Skip to content

fix(clients): only trim xml tag values which contain newline #2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 13, 2021
Merged

fix(clients): only trim xml tag values which contain newline #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c0337f4
fix(codegen): do not trim values while parsing XML
trivikr Aug 9, 2021
5eccf00
fix(clients): do not trim values while parsing XML
trivikr Aug 9, 2021
61ffa5a
fix(protocol_tests): do not trim values while parsing XML
trivikr Aug 9, 2021
99b843a
chore(codegen): enable SimpleScalarPropertiesPureWhiteSpace test
trivikr Aug 9, 2021
8a5344f
chore(protocol_tests): enable SimpleScalarPropertiesPureWhiteSpace
trivikr Aug 9, 2021
2124123
fix(codegen): only trim xml tag values which contain newline
trivikr Aug 10, 2021
6f52cbc
fix(clients): only trim xml tag values which contain newline
trivikr Aug 10, 2021
95e0e4c
fix(protocol_tests): only trim xml tag values which contain newline
trivikr Aug 10, 2021
6391232
Merge branch 'main' into xml-parser-disable-trim-values
trivikr Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/client-auto-scaling/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10008,7 +10008,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-cloudformation/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11149,7 +11149,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-cloudfront/protocols/Aws_restXml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19025,7 +19025,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-cloudsearch/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4921,7 +4921,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-cloudwatch/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6370,7 +6370,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-docdb/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10727,7 +10727,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-ec2/protocols/Aws_ec2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74754,7 +74754,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-elastic-beanstalk/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8205,7 +8205,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7863,7 +7863,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-elastic-load-balancing/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5410,7 +5410,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-elasticache/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15016,7 +15016,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-iam/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21436,7 +21436,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-neptune/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13195,7 +13195,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-rds/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28153,7 +28153,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-redshift/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22294,7 +22294,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-route-53/protocols/Aws_restXml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10422,7 +10422,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-s3-control/protocols/Aws_restXml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8182,7 +8182,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-s3/protocols/Aws_restXml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14724,7 +14724,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-ses/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10320,7 +10320,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-sns/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6347,7 +6347,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-sqs/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3141,7 +3141,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion clients/client-sts/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
7 changes: 2 additions & 5 deletions ...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ static void generateXmlParseBody(GenerationContext context) {
writer.openBlock("if (encoded.length) {", "}", () -> {
writer.write("const parsedObj = xmlParse(encoded, { attributeNamePrefix: '', "
+ "ignoreAttributes: false, parseNodeValue: false, trimValues: false, "
+ "tagValueProcessor: (val, tagName) => val.trim() === '' ? '': decodeHTML(val) });");
+ "tagValueProcessor: (val) => (val.trim() === '' && val.includes('\\n'))"
+ " ? '': decodeHTML(val) });");
writer.write("const textNodeName = '#text';");
writer.write("const key = Object.keys(parsedObj)[0];");
writer.write("const parsedObjToReturn = parsedObj[key];");
Expand Down Expand Up @@ -293,10 +294,6 @@ private static boolean filterProtocolTests(
if (testCase.getId().equals("QueryCustomizedError")) {
return true;
}
// TODO: follow-up with smithy on whether whitespace strings should be trimmed.
if (testCase.getId().equals("SimpleScalarPropertiesPureWhiteSpace")) {
return true;
}
return false;
}
}
2 changes: 1 addition & 1 deletion protocol_tests/aws-ec2/protocols/Aws_ec2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,7 +2172,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion protocol_tests/aws-query/protocols/Aws_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3002,7 +3002,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
2 changes: 1 addition & 1 deletion protocol_tests/aws-restxml/protocols/Aws_restXml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6173,7 +6173,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
ignoreAttributes: false,
parseNodeValue: false,
trimValues: false,
tagValueProcessor: (val, tagName) => (val.trim() === "" ? "" : decodeHTML(val)),
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
});
const textNodeName = "#text";
const key = Object.keys(parsedObj)[0];
Expand Down
4 changes: 2 additions & 2 deletions protocol_tests/aws-restxml/tests/functional/restxml.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3780,7 +3780,7 @@ it("SimpleScalarPropertiesWithWhiteSpace:Request", async () => {
/**
* Serializes string containing exclusively whitespace
*/
it.skip("SimpleScalarPropertiesPureWhiteSpace:Request", async () => {
it("SimpleScalarPropertiesPureWhiteSpace:Request", async () => {
const client = new RestXmlProtocolClient({
...clientParams,
requestHandler: new RequestSerializationTestHandler(),
Expand Down Expand Up @@ -4203,7 +4203,7 @@ it("SimpleScalarPropertiesWithWhiteSpace:Response", async () => {
/**
* Serializes string containing white space
*/
it.skip("SimpleScalarPropertiesPureWhiteSpace:Response", async () => {
it("SimpleScalarPropertiesPureWhiteSpace:Response", async () => {
const client = new RestXmlProtocolClient({
...clientParams,
requestHandler: new ResponseDeserializationTestHandler(
Expand Down