Skip to content

Commit a5d93b6

Browse files
author
Danny McCormick
authored
Finish removing azure-arm-rest-v2 (#13500)
* Finish removing azure-arm-rest-v2 * Missed some tasks * Fix shared package
1 parent 4ae5058 commit a5d93b6

File tree

131 files changed

+427
-9952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+427
-9952
lines changed

‎Tasks/AzureAppServiceManageV0/Tests/L0.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import * as assert from 'assert';
22
import * as ttm from 'azure-pipelines-task-lib/mock-test';
33
import tl = require('azure-pipelines-task-lib');
44
import * as path from 'path';
5-
var AppServiceTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-app-service.js");
6-
var KuduServiceTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-app-service-kudu-tests.js");
7-
var ApplicationInsightsTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-tests.js");
8-
var AppInsightsWebTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-webtests-tests.js");
9-
var ResourcesTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-resource-tests.js");
5+
var AppServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-app-service.js");
6+
var KuduServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-app-service-kudu-tests.js");
7+
var ApplicationInsightsTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-tests.js");
8+
var AppInsightsWebTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-webtests-tests.js");
9+
var ResourcesTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-resource-tests.js");
1010

1111
describe('Azure App Service Manage Suite', function() {
1212

1313
this.timeout(60000);
1414

1515
before((done) => {
1616
try {
17-
if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-arm-rest-v2/Tests/node_modules'))) {
18-
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-arm-rest-v2/Tests'), '-rf', true);
17+
if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/node_modules'))) {
18+
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests'), '-rf', true);
1919
}
2020
}
2121
catch(error) {

‎Tasks/AzureAppServiceManageV0/azureappservicemanage.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import tl = require('azure-pipelines-task-lib/task');
22
import path = require('path');
3-
import { AzureRMEndpoint, dispose } from 'azure-arm-rest-v2/azure-arm-endpoint';
4-
import { AzureEndpoint } from 'azure-arm-rest-v2/azureModels';
5-
import { AzureRmEndpointAuthenticationScheme } from 'azure-arm-rest-v2/constants';
6-
import {AzureAppService } from 'azure-arm-rest-v2/azure-arm-app-service';
7-
import { AzureApplicationInsights } from 'azure-arm-rest-v2/azure-arm-appinsights';
8-
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
3+
import { AzureRMEndpoint, dispose } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint';
4+
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
5+
import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azure-arm-rest-v2/constants';
6+
import {AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service';
7+
import { AzureApplicationInsights } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights';
8+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
99
import { AzureAppServiceUtils } from './operations/AzureAppServiceUtils';
1010
import { KuduServiceUtils } from './operations/KuduServiceUtils';
1111
import { AzureResourceFilterUtils } from './operations/AzureResourceFilterUtils';
@@ -53,7 +53,7 @@ async function run() {
5353

5454
try {
5555
tl.setResourcePath(path.join( __dirname, 'task.json'));
56-
tl.setResourcePath(path.join( __dirname, 'node_modules/azure-arm-rest-v2/module.json'));
56+
tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/module.json'));
5757
action = tl.getInput('Action', true);
5858
let connectedServiceName = tl.getInput('ConnectedServiceName', true);
5959
let webAppName: string = tl.getInput('WebAppName', true);

‎Tasks/AzureAppServiceManageV0/make.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
{
22
"common": [
3-
{
4-
"module": "../Common/azure-arm-rest-v2",
5-
"type": "node",
6-
"dest": "./",
7-
"compile": true
8-
},
93
{
104
"module": "../Common/utility-common-v2",
115
"type": "node",

‎Tasks/AzureAppServiceManageV0/operations/AzureAppServiceUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import tl = require('azure-pipelines-task-lib/task');
2-
import { AzureAppService } from 'azure-arm-rest-v2/azure-arm-app-service';
3-
import webClient = require('azure-arm-rest-v2/webClient');
2+
import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service';
3+
import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient');
44
var parseString = require('xml2js').parseString;
55
import Q = require('q');
6-
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
6+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
77

88
export class AzureAppServiceUtils {
99
private _appService: AzureAppService;

‎Tasks/AzureAppServiceManageV0/operations/AzureApplicationInsightsWebTestsUtils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import tl = require('azure-pipelines-task-lib/task');
2-
import { AzureEndpoint, WebTest } from 'azure-arm-rest-v2/azureModels';
3-
import { ApplicationInsightsWebTests } from 'azure-arm-rest-v2/azure-arm-appinsights-webtests';
2+
import { AzureEndpoint, WebTest } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
3+
import { ApplicationInsightsWebTests } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights-webtests';
44

55
export class AzureApplicationInsightsWebTestsUtils {
66

‎Tasks/AzureAppServiceManageV0/operations/AzureResourceFilterUtils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import tl = require('azure-pipelines-task-lib/task');
2-
import { AzureEndpoint } from 'azure-arm-rest-v2/azureModels';
3-
import { Resources } from 'azure-arm-rest-v2/azure-arm-resource';
2+
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
3+
import { Resources } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-resource';
44

55
export class AzureResourceFilterUtils {
66
public static async getResourceGroupName(endpoint: AzureEndpoint, resourceType: string, resourceName: string): Promise<string> {

‎Tasks/AzureAppServiceManageV0/operations/ContinuousMonitoringUtils.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import tl = require('azure-pipelines-task-lib/task');
2-
import { AzureEndpoint } from 'azure-arm-rest-v2/azureModels';
3-
import {AzureAppService } from 'azure-arm-rest-v2/azure-arm-app-service';
4-
import { AzureApplicationInsights } from 'azure-arm-rest-v2/azure-arm-appinsights';
5-
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
6-
import { ApplicationInsightsWebTests } from 'azure-arm-rest-v2/azure-arm-appinsights-webtests';
2+
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
3+
import {AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service';
4+
import { AzureApplicationInsights } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights';
5+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
6+
import { ApplicationInsightsWebTests } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights-webtests';
77
import { AzureAppServiceUtils } from './AzureAppServiceUtils';
88
import { AzureApplicationInsightsWebTestsUtils } from './AzureApplicationInsightsWebTestsUtils';
99

‎Tasks/AzureAppServiceManageV0/operations/KuduServiceUtils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import tl = require('azure-pipelines-task-lib/task');
22
import Q = require('q');
3-
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
4-
import webClient = require('azure-arm-rest-v2/webClient');
3+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
4+
import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient');
55
const pythonExtensionPrefix: string = "azureappservice-";
66

77
export class KuduServiceUtils {

‎Tasks/AzureAppServiceManageV0/package-lock.json‎

Lines changed: 44 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/AzureAppServiceManageV0/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/mocha": "2.2.48",
2121
"@types/node": "6.0.68",
2222
"@types/q": "1.0.7",
23-
"azure-arm-rest-v2": "file:../../_build/Tasks/Common/azure-arm-rest-v2-2.0.0.tgz",
23+
"azure-pipelines-tasks-azure-arm-rest-v2": "1.0.3",
2424
"q": "1.4.1",
2525
"utility-common-v2": "file:../../_build/Tasks/Common/utility-common-v2-2.0.0.tgz",
2626
"xml2js": "0.4.13"

0 commit comments

Comments
 (0)