Skip to content

Commit ee4a45e

Browse files
author
Danny McCormick
authored
Move azure-arm-rest to shared npm package (#13497)
1 parent 7315916 commit ee4a45e

File tree

91 files changed

+1504
-14470
lines changed

Some content is hidden

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

91 files changed

+1504
-14470
lines changed

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ import tl = require('vsts-task-lib');
55
var ltx = require('ltx');
66
import fs = require('fs');
77

8-
var AppServiceTests = require("../node_modules/azure-arm-rest/Tests/L0-azure-arm-app-service.js");
9-
var KuduServiceTests = require("../node_modules/azure-arm-rest/Tests/L0-azure-arm-app-service-kudu-tests.js");
10-
var ApplicationInsightsTests = require("../node_modules/azure-arm-rest/Tests/L0-azure-arm-appinsights-tests.js");
8+
var AppServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-app-service.js");
9+
var KuduServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-app-service-kudu-tests.js");
10+
var ApplicationInsightsTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-appinsights-tests.js");
1111

1212

1313
describe('AzureRmWebAppDeployment Suite', function() {
1414

1515
this.timeout(60000);
1616

1717
before((done) => {
18-
if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-arm-rest/Tests/node_modules'))) {
19-
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-arm-rest/Tests'), '-rf', true);
18+
if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/node_modules'))) {
19+
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest/Tests'), '-rf', true);
2020
}
2121

2222
tl.cp(path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web.config'), path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.config'), '-f', false);

‎Tasks/AzureRmWebAppDeploymentV3/Tests/package-lock.json‎

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

‎Tasks/AzureRmWebAppDeploymentV3/azurermwebappdeployment.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import * as ParameterParser from './parameterparser'
66

77
import { TaskParameters, TaskParametersUtility } from './operations/TaskParameters';
88

9-
import { AzureAppService } from 'azure-arm-rest/azure-arm-app-service';
9+
import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service';
1010
import { AzureAppServiceUtility } from './operations/AzureAppServiceUtility';
11-
import { AzureEndpoint } from 'azure-arm-rest/azureModels';
12-
import { AzureRMEndpoint } from 'azure-arm-rest/azure-arm-endpoint';
11+
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
12+
import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint';
1313
import { AzureResourceFilterUtility } from './operations/AzureResourceFilterUtility';
1414
import { ContainerBasedDeploymentUtility } from './operations/ContainerBasedDeploymentUtility';
1515
import { DeployWar } from './operations/WarDeploymentUtilities';
1616
import { FileTransformsUtility } from './operations/FileTransformsUtility';
17-
import { Kudu } from 'azure-arm-rest/azure-arm-app-service-kudu';
17+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu';
1818
import { KuduServiceUtility } from './operations/KuduServiceUtility';
1919
import { addReleaseAnnotation } from './operations/ReleaseAnnotationUtility';
2020

‎Tasks/AzureRmWebAppDeploymentV3/make.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
{
22
"common": [
3-
{
4-
"module": "../Common/azure-arm-rest",
5-
"type": "node",
6-
"dest": "./",
7-
"compile" : true
8-
},
93
{
104
"module": "../Common/webdeployment-common",
115
"type": "node",
@@ -36,7 +30,7 @@
3630
"rm": [
3731
{
3832
"items": [
39-
"node_modules/azure-arm-rest/node_modules/vsts-task-lib",
33+
"node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/vsts-task-lib",
4034
"node_modules/webdeployment-common/node_modules/vsts-task-lib"
4135
],
4236
"options": "-Rf"

‎Tasks/AzureRmWebAppDeploymentV3/operations/AzureAppServiceUtility.ts‎

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

99
export class AzureAppServiceUtility {
1010
private _appService: AzureAppService;

‎Tasks/AzureRmWebAppDeploymentV3/operations/AzureResourceFilterUtility.ts‎

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

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

‎Tasks/AzureRmWebAppDeploymentV3/operations/ContainerBasedDeploymentUtility.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import tl = require('vsts-task-lib/task');
22
import url = require('url');
33
import util = require('util');
4-
import { AzureAppService } from 'azure-arm-rest/azure-arm-app-service';
4+
import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service';
55
import { TaskParameters } from './TaskParameters';
66
import { parse } from 'webdeployment-common/ParameterParserUtility';
77
import { AzureAppServiceUtility } from './AzureAppServiceUtility';

‎Tasks/AzureRmWebAppDeploymentV3/operations/KuduServiceUtility.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import tl = require('vsts-task-lib/task');
22
import Q = require('q');
33
import path = require('path');
4-
import { Kudu } from 'azure-arm-rest/azure-arm-app-service-kudu';
5-
import { KUDU_DEPLOYMENT_CONSTANTS } from 'azure-arm-rest/constants';
6-
import webClient = require('azure-arm-rest/webClient');
4+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu';
5+
import { KUDU_DEPLOYMENT_CONSTANTS } from 'azure-pipelines-tasks-azure-arm-rest/constants';
6+
import webClient = require('azure-pipelines-tasks-azure-arm-rest/webClient');
77
import { TaskParameters } from './TaskParameters';
88
var deployUtility = require('webdeployment-common/utility.js');
99
var zipUtility = require('webdeployment-common/ziputility.js');

‎Tasks/AzureRmWebAppDeploymentV3/operations/ReleaseAnnotationUtility.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import tl = require('vsts-task-lib/task');
2-
import { AzureAppService } from 'azure-arm-rest/azure-arm-app-service';
3-
import { AzureApplicationInsights, ApplicationInsightsResources} from 'azure-arm-rest/azure-arm-appinsights';
4-
import { AzureEndpoint } from 'azure-arm-rest/azureModels';
2+
import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service';
3+
import { AzureApplicationInsights, ApplicationInsightsResources} from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-appinsights';
4+
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels';
55

66
var uuidV4 = require("uuid/v4");
77

‎Tasks/AzureRmWebAppDeploymentV3/operations/WarDeploymentUtilities.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import tl = require('vsts-task-lib/task');
22
import fs = require('fs');
33
import path = require('path');
4-
import { Kudu } from 'azure-arm-rest/azure-arm-app-service-kudu';
4+
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu';
55
import { AzureAppServiceUtility } from './AzureAppServiceUtility';
66
import { TaskParameters } from './TaskParameters';
7-
import { sleepFor } from 'azure-arm-rest/webClient';
7+
import { sleepFor } from 'azure-pipelines-tasks-azure-arm-rest/webClient';
88

99
var msDeploy = require('webdeployment-common/deployusingmsdeploy.js');
1010

0 commit comments

Comments
 (0)