Remove body field from RestError Object in core-http Library (#5670)

Azure · Oct 20, 2019 · 7da8d54 · 7da8d54
1 parent af0a2ce
commit 7da8d54
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/sdk/core/core-arm/lib/lroPollStrategy.ts b/sdk/core/core-arm/lib/lroPollStrategy.ts
@@ -99,9 +99,9 @@ export abstract class LROPollStrategy {
     error.request = stripRequest(this._pollState.mostRecentRequest);
     error.response = this._pollState.mostRecentResponse;
     error.message = `Long running operation failed with status: "${this._pollState.state}".`;
-    error.body = this._pollState.resource;
-    if (error.body) {
-      const innerError: any = error.body.error;
+    error.response.parsedBody = this._pollState.resource;
+    if (error.response.parsedBody) {
+      const innerError: any = error.response.parsedBody.error;
       if (innerError) {
         if (innerError.message) {
           error.message = `Long running operation failed with error: "${innerError.message}".`;
@@ -407,7 +407,7 @@ class LocationLROPollStrategy extends LROPollStrategy {
           // Ignore the exception, use resultBody as the error message
         }
 
-        throw new RestError(errorMessage, undefined, statusCode, stripRequest(result.request), result, resultBody);
+        throw new RestError(errorMessage, undefined, statusCode, stripRequest(result.request), result);
       } else {
         throw new Error(`The response with status code ${statusCode} from polling for long running operation url "${lroPollState.locationHeaderValue}" is not valid.`);
       }
@@ -484,7 +484,7 @@ class AzureAsyncOperationLROPollStrategy extends LROPollStrategy {
         error.statusCode = statusCode;
         error.request = stripRequest(response.request);
         error.response = response;
-        error.body = parsedResponse;
+        error.response.parsedBody = parsedResponse;
         throw error;
       }
 
@@ -567,7 +567,7 @@ class GetResourceLROPollStrategy extends LROPollStrategy {
         error.statusCode = statusCode;
         error.request = stripRequest(result.request);
         error.response = result;
-        error.body = responseBody;
+        error.response.parsedBody = responseBody;
         throw error;
       }
 

diff --git a/sdk/core/core-http/lib/policies/deserializationPolicy.ts b/sdk/core/core-http/lib/policies/deserializationPolicy.ts
@@ -193,13 +193,11 @@ export function deserializeResponseBody(
                         ? parsedErrorResponse[defaultResponseBodyMapper.xmlElementName!]
                         : [];
                   }
-                  error.body = operationSpec.serializer.deserialize(
+                  error.response!.parsedBody = operationSpec.serializer.deserialize(
                     defaultResponseBodyMapper,
                     valueToDeserialize,
-                    "error.body"
+                    "error.response.parsedBody"
                   );
-                  // Setting the parsedBody on response to enable flattening as per operationSpec
-                  error.response!.parsedBody = error.body;
                 }
               }
 
@@ -270,8 +268,7 @@ function parse(
       errCode,
       operationResponse.status,
       operationResponse.request,
-      operationResponse,
-      operationResponse.bodyAsText
+      operationResponse
     );
     return Promise.reject(e);
   };

diff --git a/sdk/core/core-http/lib/restError.ts b/sdk/core/core-http/lib/restError.ts
@@ -13,22 +13,19 @@ export class RestError extends Error {
   statusCode?: number;
   request?: WebResource;
   response?: HttpOperationResponse;
-  body?: any;
   details?: unknown;
   constructor(
     message: string,
     code?: string,
     statusCode?: number,
     request?: WebResource,
-    response?: HttpOperationResponse,
-    body?: any
+    response?: HttpOperationResponse
   ) {
     super(message);
     this.code = code;
     this.statusCode = statusCode;
     this.request = request;
     this.response = response;
-    this.body = body;
 
     Object.setPrototypeOf(this, RestError.prototype);
   }

diff --git a/sdk/storage/storage-blob/test/blobclient.spec.ts b/sdk/storage/storage-blob/test/blobclient.spec.ts
@@ -257,7 +257,7 @@ describe("BlobClient", () => {
         "AbortCopyFromClient should be failed and throw exception for an completed copy operation."
       );
     } catch (err) {
-      assert.ok((err as any).body.Code === "InvalidHeaderValue");
+      assert.ok((err as any).response.parsedBody.Code === "InvalidHeaderValue");
     }
   });
 

diff --git a/sdk/storage/storage-blob/test/node/blobclient.spec.ts b/sdk/storage/storage-blob/test/node/blobclient.spec.ts
@@ -264,7 +264,7 @@ describe("BlobClient Node.js only", () => {
         "AbortCopyFromClient should be failed and throw exception for an completed copy operation."
       );
     } catch (err) {
-      assert.ok((err as any).body.Code === "InvalidHeaderValue");
+      assert.ok((err as any).response.parsedBody.Code === "InvalidHeaderValue");
     }
   });