fix(clients): update Error.message in case of XML protocol

aws · Sep 29, 2022 · 243f7cf · 243f7cf
1 parent 2c15561
commit 243f7cf
Show file tree

Hide file tree

Showing 25 changed files with 75 additions and 25 deletions.
diff --git a/clients/client-auto-scaling/src/protocols/Aws_query.ts b/clients/client-auto-scaling/src/protocols/Aws_query.ts
@@ -9858,7 +9858,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-cloudformation/src/protocols/Aws_query.ts b/clients/client-cloudformation/src/protocols/Aws_query.ts
@@ -10268,7 +10268,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-cloudfront/src/protocols/Aws_restXml.ts b/clients/client-cloudfront/src/protocols/Aws_restXml.ts
@@ -17290,7 +17290,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-cloudsearch/src/protocols/Aws_query.ts b/clients/client-cloudsearch/src/protocols/Aws_query.ts
@@ -4206,7 +4206,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-cloudwatch/src/protocols/Aws_query.ts b/clients/client-cloudwatch/src/protocols/Aws_query.ts
@@ -6209,7 +6209,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-docdb/src/protocols/Aws_query.ts b/clients/client-docdb/src/protocols/Aws_query.ts
@@ -9102,7 +9102,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-ec2/src/protocols/Aws_ec2.ts b/clients/client-ec2/src/protocols/Aws_ec2.ts
@@ -80348,7 +80348,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-elastic-beanstalk/src/protocols/Aws_query.ts b/clients/client-elastic-beanstalk/src/protocols/Aws_query.ts
@@ -7299,7 +7299,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-elastic-load-balancing-v2/src/protocols/Aws_query.ts b/clients/client-elastic-load-balancing-v2/src/protocols/Aws_query.ts
@@ -6723,7 +6723,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-elastic-load-balancing/src/protocols/Aws_query.ts b/clients/client-elastic-load-balancing/src/protocols/Aws_query.ts
@@ -4677,7 +4677,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-elasticache/src/protocols/Aws_query.ts b/clients/client-elasticache/src/protocols/Aws_query.ts
@@ -12518,7 +12518,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-iam/src/protocols/Aws_query.ts b/clients/client-iam/src/protocols/Aws_query.ts
@@ -17395,7 +17395,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-neptune/src/protocols/Aws_query.ts b/clients/client-neptune/src/protocols/Aws_query.ts
@@ -12071,7 +12071,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-rds/src/protocols/Aws_query.ts b/clients/client-rds/src/protocols/Aws_query.ts
@@ -24122,7 +24122,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-redshift/src/protocols/Aws_query.ts b/clients/client-redshift/src/protocols/Aws_query.ts
@@ -19415,7 +19415,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-route-53/src/protocols/Aws_restXml.ts b/clients/client-route-53/src/protocols/Aws_restXml.ts
@@ -8970,7 +8970,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-s3-control/src/protocols/Aws_restXml.ts b/clients/client-s3-control/src/protocols/Aws_restXml.ts
@@ -8613,7 +8613,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-s3/src/protocols/Aws_restXml.ts b/clients/client-s3/src/protocols/Aws_restXml.ts
@@ -12063,7 +12063,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-ses/src/protocols/Aws_query.ts b/clients/client-ses/src/protocols/Aws_query.ts
@@ -9018,7 +9018,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-sns/src/protocols/Aws_query.ts b/clients/client-sns/src/protocols/Aws_query.ts
@@ -5595,7 +5595,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-sqs/src/protocols/Aws_query.ts b/clients/client-sqs/src/protocols/Aws_query.ts
@@ -2761,7 +2761,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/clients/client-sts/src/protocols/Aws_query.ts b/clients/client-sts/src/protocols/Aws_query.ts
@@ -1306,7 +1306,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/private/aws-protocoltests-ec2/src/protocols/Aws_ec2.ts b/private/aws-protocoltests-ec2/src/protocols/Aws_ec2.ts
@@ -1963,7 +1963,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/private/aws-protocoltests-query/src/protocols/Aws_query.ts b/private/aws-protocoltests-query/src/protocols/Aws_query.ts
@@ -2699,7 +2699,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };
 

diff --git a/private/aws-protocoltests-restxml/src/protocols/Aws_restXml.ts b/private/aws-protocoltests-restxml/src/protocols/Aws_restXml.ts
@@ -5302,7 +5302,9 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
 
 const parseErrorBody = async (errorBody: any, context: __SerdeContext) => {
   const value = await parseBody(errorBody, context);
-  value.message = value.message ?? value.Message;
+  if (value.Error) {
+    value.Error.message = value.Error.message ?? value.Error.Message;
+  }
   return value;
 };