Skip to content

Commit 06d7883

Browse files
ceciliaavilaJhontSouth
ceciliaavila
and
JhontSouth
authored
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 <[email protected]>
1 parent 59e5d96 commit 06d7883

File tree

15 files changed

+129
-4664
lines changed

15 files changed

+129
-4664
lines changed

‎tools/framework/suite-base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var sinon = require('sinon');
2222
var _ = require('underscore');
2323
var util = require('util');
2424
var uuid = require('uuid');
25-
var msRest = require('ms-rest');
25+
var msRest = require('@azure/ms-rest-js');
2626
var identity = require("@azure/identity");
2727
var {Environment} = require("@azure/ms-rest-azure-env")
2828
var MicrosoftAppCredentials = require('botframework-connector/lib/auth/microsoftAppCredentials');

‎tools/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"botframework-connector": "4.1.6",
3636
"dotenv": "^4.0.0",
3737
"mime": "^1.4.1",
38-
"ms-rest": "^2.3.6",
3938
"underscore": "^1.13.1",
4039
"uuid": "^3.3.2"
4140
},

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
4+
'use strict';
5+
6+
/**
7+
* Wrapper object for http request and response. Deserialized object is stored in
8+
* the `body` property.
9+
* @class
10+
* Initializes a new instance of the HttpOperationResponse class.
11+
* @constructor
12+
*/
13+
class HttpOperationResponse {
14+
constructor(request, response) {
15+
/**
16+
* Reference to the original request object.
17+
* [WebResource] object.
18+
* @type {object}
19+
*/
20+
this.request = request;
21+
22+
/**
23+
* Reference to the original response object.
24+
* [ServerResponse] object.
25+
* @type {object}
26+
*/
27+
this.response = response;
28+
29+
/**
30+
* The response object.
31+
* @type {object}
32+
*/
33+
this.body = null;
34+
}
35+
}
36+
37+
module.exports = HttpOperationResponse;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ exports.ResourceListResult = require('./resourceListResult');
6161
exports.ResourceGroupListResult = require('./resourceGroupListResult');
6262
exports.TagsListResult = require('./tagsListResult');
6363
exports.DeploymentOperationsListResult = require('./deploymentOperationsListResult');
64+
exports.HttpOperationResponse = require("./HttpOperationResponse");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const msRest = require('ms-rest');
13+
const msRest = require('@azure/ms-rest-js');
1414
const uuid = require('uuid');
1515
const WebResource = msRest.WebResource;
1616

@@ -546,7 +546,7 @@ class DeploymentOperations {
546546
let self = this;
547547
return new Promise((resolve, reject) => {
548548
self._get(resourceGroupName, deploymentName, operationId, options, (err, result, request, response) => {
549-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
549+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
550550
httpOperationResponse.body = result;
551551
if (err) { reject(err); }
552552
else { resolve(httpOperationResponse); }
@@ -639,7 +639,7 @@ class DeploymentOperations {
639639
let self = this;
640640
return new Promise((resolve, reject) => {
641641
self._list(resourceGroupName, deploymentName, options, (err, result, request, response) => {
642-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
642+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
643643
httpOperationResponse.body = result;
644644
if (err) { reject(err); }
645645
else { resolve(httpOperationResponse); }
@@ -729,7 +729,7 @@ class DeploymentOperations {
729729
let self = this;
730730
return new Promise((resolve, reject) => {
731731
self._listNext(nextPageLink, options, (err, result, request, response) => {
732-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
732+
let httpOperationResponse = new new client.models['HttpOperationResponse'](request, response);
733733
httpOperationResponse.body = result;
734734
if (err) { reject(err); }
735735
else { resolve(httpOperationResponse); }

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const msRest = require('ms-rest');
13+
const msRest = require('@azure/ms-rest-js');
1414
const uuid = require('uuid');
1515
const WebResource = msRest.WebResource;
1616

@@ -67,7 +67,7 @@ function _deleteMethod(resourceGroupName, deploymentName, options, callback) {
6767
this.beginDeleteMethod(resourceGroupName, deploymentName, options, (err, parsedResult, httpRequest, response) => {
6868
if (err) return callback(err);
6969

70-
let initialResult = new msRest.HttpOperationResponse();
70+
let initialResult = new client.models['HttpOperationResponse']();
7171
initialResult.request = httpRequest;
7272
initialResult.response = response;
7373
initialResult.body = response.body;
@@ -351,7 +351,7 @@ function _createOrUpdate(resourceGroupName, deploymentName, parameters, options,
351351
this.beginCreateOrUpdate(resourceGroupName, deploymentName, parameters, options, (err, parsedResult, httpRequest, response) => {
352352
if (err) return callback(err);
353353

354-
let initialResult = new msRest.HttpOperationResponse();
354+
let initialResult = new client.models['HttpOperationResponse']();
355355
initialResult.request = httpRequest;
356356
initialResult.response = response;
357357
initialResult.body = response.body;
@@ -1960,7 +1960,7 @@ class Deployments {
19601960
let self = this;
19611961
return new Promise((resolve, reject) => {
19621962
self._deleteMethod(resourceGroupName, deploymentName, options, (err, result, request, response) => {
1963-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
1963+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
19641964
httpOperationResponse.body = result;
19651965
if (err) { reject(err); }
19661966
else { resolve(httpOperationResponse); }
@@ -2058,7 +2058,7 @@ class Deployments {
20582058
let self = this;
20592059
return new Promise((resolve, reject) => {
20602060
self._checkExistence(resourceGroupName, deploymentName, options, (err, result, request, response) => {
2061-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2061+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
20622062
httpOperationResponse.body = result;
20632063
if (err) { reject(err); }
20642064
else { resolve(httpOperationResponse); }
@@ -2207,7 +2207,7 @@ class Deployments {
22072207
let self = this;
22082208
return new Promise((resolve, reject) => {
22092209
self._createOrUpdate(resourceGroupName, deploymentName, parameters, options, (err, result, request, response) => {
2210-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2210+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
22112211
httpOperationResponse.body = result;
22122212
if (err) { reject(err); }
22132213
else { resolve(httpOperationResponse); }
@@ -2357,7 +2357,7 @@ class Deployments {
23572357
let self = this;
23582358
return new Promise((resolve, reject) => {
23592359
self._get(resourceGroupName, deploymentName, options, (err, result, request, response) => {
2360-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2360+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
23612361
httpOperationResponse.body = result;
23622362
if (err) { reject(err); }
23632363
else { resolve(httpOperationResponse); }
@@ -2450,7 +2450,7 @@ class Deployments {
24502450
let self = this;
24512451
return new Promise((resolve, reject) => {
24522452
self._cancel(resourceGroupName, deploymentName, options, (err, result, request, response) => {
2453-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2453+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
24542454
httpOperationResponse.body = result;
24552455
if (err) { reject(err); }
24562456
else { resolve(httpOperationResponse); }
@@ -2601,7 +2601,7 @@ class Deployments {
26012601
let self = this;
26022602
return new Promise((resolve, reject) => {
26032603
self._validate(resourceGroupName, deploymentName, parameters, options, (err, result, request, response) => {
2604-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2604+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
26052605
httpOperationResponse.body = result;
26062606
if (err) { reject(err); }
26072607
else { resolve(httpOperationResponse); }
@@ -2750,7 +2750,7 @@ class Deployments {
27502750
let self = this;
27512751
return new Promise((resolve, reject) => {
27522752
self._exportTemplate(resourceGroupName, deploymentName, options, (err, result, request, response) => {
2753-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2753+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
27542754
httpOperationResponse.body = result;
27552755
if (err) { reject(err); }
27562756
else { resolve(httpOperationResponse); }
@@ -2844,7 +2844,7 @@ class Deployments {
28442844
let self = this;
28452845
return new Promise((resolve, reject) => {
28462846
self._listByResourceGroup(resourceGroupName, options, (err, result, request, response) => {
2847-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2847+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
28482848
httpOperationResponse.body = result;
28492849
if (err) { reject(err); }
28502850
else { resolve(httpOperationResponse); }
@@ -2947,7 +2947,7 @@ class Deployments {
29472947
let self = this;
29482948
return new Promise((resolve, reject) => {
29492949
self._beginDeleteMethod(resourceGroupName, deploymentName, options, (err, result, request, response) => {
2950-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
2950+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
29512951
httpOperationResponse.body = result;
29522952
if (err) { reject(err); }
29532953
else { resolve(httpOperationResponse); }
@@ -3107,7 +3107,7 @@ class Deployments {
31073107
let self = this;
31083108
return new Promise((resolve, reject) => {
31093109
self._beginCreateOrUpdate(resourceGroupName, deploymentName, parameters, options, (err, result, request, response) => {
3110-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
3110+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
31113111
httpOperationResponse.body = result;
31123112
if (err) { reject(err); }
31133113
else { resolve(httpOperationResponse); }
@@ -3255,7 +3255,7 @@ class Deployments {
32553255
let self = this;
32563256
return new Promise((resolve, reject) => {
32573257
self._listByResourceGroupNext(nextPageLink, options, (err, result, request, response) => {
3258-
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
3258+
let httpOperationResponse = new client.models['HttpOperationResponse'](request, response);
32593259
httpOperationResponse.body = result;
32603260
if (err) { reject(err); }
32613261
else { resolve(httpOperationResponse); }

0 commit comments

Comments
 (0)