fix: Remove ms-rest package (#4523)

* remove ms-rest-azure package

* replace node-auth with azure/identity

* fix unit tests

* replace ms-rest with @azure/ms-rest-js

* replace ms-rest uses

* include serializer class

* remove useless files

---------

Co-authored-by: JhontSouth <jhonatan.sandoval@southworks.com>

tools/framework/suite-base.js

@@ -22,7 +22,7 @@ var sinon = require('sinon');
 var _ = require('underscore');
 var util = require('util');
 var uuid = require('uuid');
-var msRest = require('ms-rest');
+var msRest = require('@azure/ms-rest-js');
 var identity = require("@azure/identity");
 var {Environment} = require("@azure/ms-rest-azure-env")
 var MicrosoftAppCredentials = require('botframework-connector/lib/auth/microsoftAppCredentials');

tools/package.json

@@ -35,7 +35,6 @@
     "botframework-connector": "4.1.6",
     "dotenv": "^4.0.0",
     "mime": "^1.4.1",
-    "ms-rest": "^2.3.6",
     "underscore": "^1.13.1",
     "uuid": "^3.3.2"
   },

tools/resourceManagement/lib/resource/models/HttpOperationResponse.js

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+'use strict';
+
+/**
+ * Wrapper object for http request and response. Deserialized object is stored in 
+ * the `body` property.
+ * @class
+ * Initializes a new instance of the HttpOperationResponse class.
+ * @constructor
+ */
+class HttpOperationResponse {
+  constructor(request, response) {
+    /**
+     * Reference to the original request object.
+     * [WebResource] object.
+     * @type {object}
+     */
+    this.request = request;
+
+    /**
+     * Reference to the original response object.
+     * [ServerResponse] object.
+     * @type {object}
+     */
+    this.response = response;
+
+    /**
+     * The response object.
+     * @type {object}
+     */
+    this.body = null;
+  }
+}
+
+module.exports = HttpOperationResponse;

tools/resourceManagement/lib/resource/models/index.js

@@ -61,3 +61,4 @@ exports.ResourceListResult = require('./resourceListResult');
 exports.ResourceGroupListResult = require('./resourceGroupListResult');
 exports.TagsListResult = require('./tagsListResult');
 exports.DeploymentOperationsListResult = require('./deploymentOperationsListResult');
+exports.HttpOperationResponse = require("./HttpOperationResponse");

tools/resourceManagement/lib/resource/operations/deploymentOperations.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const msRest = require('ms-rest');
+const msRest = require('@azure/ms-rest-js');
 const uuid = require('uuid');
 const WebResource = msRest.WebResource;
 
@@ -546,7 +546,7 @@ class DeploymentOperations {
     let self = this;
     return new Promise((resolve, reject) => {
       self._get(resourceGroupName, deploymentName, operationId, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -639,7 +639,7 @@ class DeploymentOperations {
     let self = this;
     return new Promise((resolve, reject) => {
       self._list(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -729,7 +729,7 @@ class DeploymentOperations {
     let self = this;
     return new Promise((resolve, reject) => {
       self._listNext(nextPageLink, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }

tools/resourceManagement/lib/resource/operations/deployments.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const msRest = require('ms-rest');
+const msRest = require('@azure/ms-rest-js');
 const uuid = require('uuid');
 const WebResource = msRest.WebResource;
 
@@ -67,7 +67,7 @@ function _deleteMethod(resourceGroupName, deploymentName, options, callback) {
   this.beginDeleteMethod(resourceGroupName, deploymentName, options, (err, parsedResult, httpRequest, response) => {
     if (err) return callback(err);
 
-    let initialResult = new msRest.HttpOperationResponse();
+    let initialResult = new client.models['HttpOperationResponse']();
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
@@ -351,7 +351,7 @@ function _createOrUpdate(resourceGroupName, deploymentName, parameters, options,
   this.beginCreateOrUpdate(resourceGroupName, deploymentName, parameters, options, (err, parsedResult, httpRequest, response) => {
     if (err) return callback(err);
 
-    let initialResult = new msRest.HttpOperationResponse();
+    let initialResult = new client.models['HttpOperationResponse']();
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
@@ -1960,7 +1960,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._deleteMethod(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2058,7 +2058,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._checkExistence(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2207,7 +2207,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._createOrUpdate(resourceGroupName, deploymentName, parameters, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2357,7 +2357,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._get(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2450,7 +2450,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._cancel(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2601,7 +2601,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._validate(resourceGroupName, deploymentName, parameters, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2750,7 +2750,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._exportTemplate(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2844,7 +2844,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._listByResourceGroup(resourceGroupName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -2947,7 +2947,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._beginDeleteMethod(resourceGroupName, deploymentName, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -3107,7 +3107,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._beginCreateOrUpdate(resourceGroupName, deploymentName, parameters, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }
@@ -3255,7 +3255,7 @@ class Deployments {
     let self = this;
     return new Promise((resolve, reject) => {
       self._listByResourceGroupNext(nextPageLink, options, (err, result, request, response) => {
-        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
         httpOperationResponse.body = result;
         if (err) { reject(err); }
         else { resolve(httpOperationResponse); }