AWSQuery compatible error code (#4221)

* Add awsQueryCompatible trait support to service When awsQueryCompatible trait is found, it's made available as an API property. When this property is found, the error code is returned by looking up the mapping. This is a pre-requisite for migrating services from AWSQuery wire protocol to AWSJson. * Minor edit * Add additional tests; review comments * Minor edits * Sqs aws json (#2) * Add awsQueryCompatible trait support to service When awsQueryCompatible trait is found, it's made available as an API property. When this property is found, the error code is returned by looking up the mapping. This is a pre-requisite for migrating services from AWSQuery wire protocol to AWSJson. * Minor edit * Add additional tests; review comments * Minor edits * Review comments * Use MockServiceFromApi; Move errorCodeMapping logic to even)listeners * Update on.error function * Fix type * Remove reimplementation of mapping function * Use add instead of addAsync Co-authored-by: AllanZhengYP <zheallan@amazon.com> * Fix lint errors * Add null check to error listener * Use simple service null check * Fix add 'Error' implementation * Add changelog * Revert "Sqs AwsJson migration (#4105)" This reverts commit 2a87ec1. * Add AWSQuery error code compatibility to service When header value is found, then error code is populated from the header If there is no header found, then the default error code is returned. Co-authored-by: AllanZhengYP <zheallan@amazon.com>
aws · Sep 28, 2022 · 8dd2749 · 8dd2749
1 parent d525e91
commit 8dd2749
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 54 deletions.
diff --git a/.changes/next-release/feature-AwsQueryCompatible-c54d1937.json b/.changes/next-release/feature-AwsQueryCompatible-c54d1937.json
@@ -0,0 +1,5 @@
+{
+  "type": "feature",
+  "category": "AwsQueryCompatible",
+  "description": "Return  AWSQuery compatible error code from HTTP header if found"
+}
diff --git a/lib/event_listeners.js b/lib/event_listeners.js
@@ -319,12 +319,10 @@ AWS.EventListeners = {
     });
 
     add('ERROR', 'error', function ERROR(err, resp) {
-      var errorCodeMapping = resp.request.service.api.errorCodeMapping;
-      if (errorCodeMapping && err && err.code) {
-        var mapping = errorCodeMapping[err.code];
-        if (mapping) {
-          resp.error.code = mapping.code;
-        }
+      var headers = resp.httpResponse.headers;
+      var queryErrorCode = headers ? headers['x-amzn-query-error'] : undefined;
+      if (queryErrorCode) {
+        resp.error.code = queryErrorCode.split(';')[0];
       }
     }, true);
 

diff --git a/lib/model/api.js b/lib/model/api.js
@@ -80,7 +80,6 @@ function Api(api, options) {
     property(this, 'documentation', api.documentation);
     property(this, 'documentationUrl', api.documentationUrl);
   }
-  property(this, 'errorCodeMapping', api.awsQueryCompatible);
 }
 
 /**

diff --git a/test/helpers.js b/test/helpers.js
diff --git a/test/service.spec.js b/test/service.spec.js