Skip to content

Commit d37f3a7

Browse files
author
Danny McCormick
authored
Get rid of webdeployment-common (#13501)
* Get rid of webdeployment-common * Remove package * Fix dependencies * Missed piece of tests folder * Copy all files over * Fix bad references * Fix test
1 parent 1108934 commit d37f3a7

File tree

96 files changed

+237
-4699
lines changed

Some content is hidden

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

96 files changed

+237
-4699
lines changed

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ describe('AzureRmWebAppDeployment Suite', function() {
1919
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest/Tests'), '-rf', true);
2020
}
2121

22-
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);
23-
tl.cp(path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web.Debug.config'), path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.Debug.config'), '-f', false);
24-
tl.cp(path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'parameters.xml'), path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'parameters_test.xml'), '-f', false);
25-
tl.cp(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XdtTransform', 'Web.config'), path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XdtTransform', 'Web_test.config'), '-f', false);
22+
tl.cp(path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web.config'), path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.config'), '-f', false);
23+
tl.cp(path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web.Debug.config'), path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.Debug.config'), '-f', false);
24+
tl.cp(path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'parameters.xml'), path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'parameters_test.xml'), '-f', false);
25+
tl.cp(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XdtTransform', 'Web.config'), path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XdtTransform', 'Web_test.config'), '-f', false);
2626
done();
2727
});
2828
after(function() {
2929
try {
30-
tl.rmRF(path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'parameters_test.xml'));
30+
tl.rmRF(path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'parameters_test.xml'));
3131
}
3232
catch(error) {
3333
tl.debug(error);
@@ -42,12 +42,12 @@ describe('AzureRmWebAppDeployment Suite', function() {
4242
it('Runs successfully with XML Transformation (L1)', (done:MochaDone) => {
4343
this.timeout(parseInt(process.env.TASK_TEST_TIMEOUT) || 20000);
4444

45-
let tp = path.join(__dirname, "..", "node_modules","webdeployment-common","Tests","L1XdtTransform.js");
45+
let tp = path.join(__dirname, "..", "webdeployment-common","Tests","L1XdtTransform.js");
4646
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
4747
tr.run();
4848

49-
var resultFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XdtTransform', 'Web_test.config')));
50-
var expectFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XdtTransform','Web_Expected.config')));
49+
var resultFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XdtTransform', 'Web_test.config')));
50+
var expectFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XdtTransform','Web_Expected.config')));
5151
assert(ltx.equal(resultFile, expectFile) , 'Should Transform attributes on Web.config');
5252
done();
5353
});
@@ -57,25 +57,25 @@ describe('AzureRmWebAppDeployment Suite', function() {
5757
}
5858

5959
it('Runs successfully with XML variable substitution', (done:MochaDone) => {
60-
let tp = path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub.js');
60+
let tp = path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub.js');
6161
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
6262
tr.run();
6363

64-
var resultFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XmlVarSub', 'Web_test.config')));
65-
var expectFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XmlVarSub', 'Web_Expected.config')));
64+
var resultFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XmlVarSub', 'Web_test.config')));
65+
var expectFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XmlVarSub', 'Web_Expected.config')));
6666
assert(ltx.equal(resultFile, expectFile) , 'Should have substituted variables in Web.config file');
67-
var resultFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.Debug.config')));
68-
var expectFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_Expected.Debug.config')));
67+
var resultFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.Debug.config')));
68+
var expectFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_Expected.Debug.config')));
6969
assert(ltx.equal(resultFile, expectFile) , 'Should have substituted variables in Web.Debug.config file');
70-
var resultParamFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XmlVarSub', 'parameters_test.xml')));
71-
var expectParamFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "node_modules","webdeployment-common","Tests", 'L1XmlVarSub', 'parameters_Expected.xml')));
70+
var resultParamFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XmlVarSub', 'parameters_test.xml')));
71+
var expectParamFile = ltx.parse(fs.readFileSync(path.join(__dirname, "..", "webdeployment-common","Tests", 'L1XmlVarSub', 'parameters_Expected.xml')));
7272
assert(ltx.equal(resultParamFile, expectParamFile) , 'Should have substituted variables in parameters.xml file');
7373

7474
done();
7575
});
7676

7777
it('Runs successfully with JSON variable substitution', (done:MochaDone) => {
78-
let tp = path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1JsonVarSub.js');
78+
let tp = path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1JsonVarSub.js');
7979
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
8080
tr.run();
8181

@@ -92,7 +92,7 @@ describe('AzureRmWebAppDeployment Suite', function() {
9292
});
9393

9494
it('Validate File Encoding', (done:MochaDone) => {
95-
let tp = path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L1ValidateFileEncoding.js');
95+
let tp = path.join(__dirname, "..", "webdeployment-common", "Tests", 'L1ValidateFileEncoding.js');
9696
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
9797
tr.run();
9898

@@ -114,7 +114,7 @@ describe('AzureRmWebAppDeployment Suite', function() {
114114
});
115115

116116
it('Validate webdeployment-common.utility.copyDirectory()', (done:MochaDone) => {
117-
let tp = path.join(__dirname, "..", "node_modules", "webdeployment-common", "Tests", 'L0CopyDirectory.js');
117+
let tp = path.join(__dirname, "..", "webdeployment-common", "Tests", 'L0CopyDirectory.js');
118118
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
119119
tr.run();
120120

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0GenerateWebConfigForNode.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
101101
}
102102

103103
import mockTask = require('vsts-task-lib/mock-task');
104-
tr.registerMock('webdeployment-common/ziputility.js', {
104+
tr.registerMock('../webdeployment-common/ziputility.js', {
105105
getArchivedEntries: function(webDeployPkg) {
106106
return {
107107
"entries":[
@@ -112,7 +112,7 @@ tr.registerMock('webdeployment-common/ziputility.js', {
112112
}
113113
});
114114
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
115-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
115+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
116116

117117
tr.registerMock('./msdeployutility.js', {
118118
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
@@ -201,7 +201,7 @@ tr.registerMock('azurerest-common/azurerestutility.js', {
201201
}
202202
});
203203

204-
tr.registerMock('webdeployment-common/ziputility.js', {
204+
tr.registerMock('../webdeployment-common/ziputility.js', {
205205
getArchivedEntries: function(webDeployPkg) {
206206
return {
207207
"entries":[
@@ -212,7 +212,7 @@ tr.registerMock('webdeployment-common/ziputility.js', {
212212
}
213213
});
214214

215-
tr.registerMock('webdeployment-common/utility.js', {
215+
tr.registerMock('../webdeployment-common/utility.js', {
216216
isInputPkgIsFolder: function() {
217217
return false;
218218
},

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0LinuxBuiltinImage.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
101101

102102
import mockTask = require('vsts-task-lib/mock-task');
103103
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
104-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
104+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
105105
tr.registerMock('./msdeployutility.js', {
106106
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
107107
getMSDeployFullPath : function() {
@@ -186,7 +186,7 @@ tr.registerMock('azurerest-common/azurerestutility.js', {
186186
console.log("Successfully updated webApp app-settings");
187187
}
188188
});
189-
tr.registerMock('webdeployment-common/utility.js', {
189+
tr.registerMock('../webdeployment-common/utility.js', {
190190
isInputPkgIsFolder: function () {
191191
return false;
192192
},
@@ -226,7 +226,7 @@ tr.registerMock('./kuduutility.js', {
226226
}
227227
});
228228

229-
tr.registerMock("webdeployment-common/ziputility.js",{
229+
tr.registerMock("../webdeployment-common/ziputility.js",{
230230
getArchivedEntries: function(webDeployPkg) {
231231
return {
232232
"entries": [

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0NonWindowsDefault.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
9797

9898
import mockTask = require('vsts-task-lib/mock-task');
9999
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
100-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
100+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
101101
tr.registerMock('./msdeployutility.js', {
102102
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
103103
getMSDeployFullPath : function() {
@@ -207,7 +207,7 @@ tr.registerMock('./kuduutility.js', {
207207
}
208208
});
209209

210-
tr.registerMock("webdeployment-common/ziputility.js",{
210+
tr.registerMock("../webdeployment-common/ziputility.js",{
211211
getArchivedEntries: function(webDeployPkg) {
212212
return {
213213
"entries": [

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0NonWindowsFailArchive.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
9999

100100
import mockTask = require('vsts-task-lib/mock-task');
101101
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
102-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
102+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
103103
tr.registerMock('./msdeployutility.js', {
104104
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
105105
getMSDeployFullPath : function() {
@@ -199,8 +199,8 @@ tr.registerMock('./kuduutility.js', {
199199
}
200200
});
201201

202-
var zipUtility = require('webdeployment-common/ziputility.js');
203-
tr.registerMock('webdeployment-common/ziputility.js', {
202+
var zipUtility = require('../webdeployment-common/ziputility.js');
203+
tr.registerMock('../webdeployment-common/ziputility.js', {
204204
archiveFolder: function(webAppPackage, webAppZipFile) {
205205
throw new Error('Folder Archiving Failed');
206206
},
@@ -209,7 +209,7 @@ tr.registerMock('webdeployment-common/ziputility.js', {
209209
});
210210

211211

212-
tr.registerMock('webdeployment-common/utility.js', {
212+
tr.registerMock('../webdeployment-common/utility.js', {
213213
isInputPkgIsFolder: function() {
214214
return true;
215215
},

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0NonWindowsFailParamPkg.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
9595

9696
import mockTask = require('vsts-task-lib/mock-task');
9797
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
98-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
98+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
9999
tr.registerMock('./msdeployutility.js', {
100100
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
101101
getMSDeployFullPath : function() {
@@ -197,7 +197,7 @@ tr.registerMock('./kuduutility.js', {
197197
}
198198
});
199199

200-
tr.registerMock("webdeployment-common/ziputility.js", {
200+
tr.registerMock("../webdeployment-common/ziputility.js", {
201201
getArchivedEntries: function( webDeployPkg) {
202202
return {
203203
"entries": [

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0NonWindowsFolderPkg.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
9999

100100
import mockTask = require('vsts-task-lib/mock-task');
101101
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
102-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
102+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
103103
tr.registerMock('./msdeployutility.js', {
104104
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
105105
getMSDeployFullPath : function() {
@@ -210,13 +210,13 @@ tr.registerMock('./kuduutility.js', {
210210
}
211211
});
212212

213-
tr.registerMock('webdeployment-common/ziputility.js', {
213+
tr.registerMock('../webdeployment-common/ziputility.js', {
214214
archiveFolder : function() {
215215
console.log('Folder Archiving Successful');
216216
}
217217
});
218218

219-
tr.registerMock('webdeployment-common/utility.js', {
219+
tr.registerMock('../webdeployment-common/utility.js', {
220220
isInputPkgIsFolder: function() {
221221
return true;
222222
},

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0NonWindowsParamFileinPkg.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
8686

8787

8888
import mockTask = require('vsts-task-lib/mock-task');
89-
tr.registerMock('webdeployment-common/ziputility.js', {
89+
tr.registerMock('../webdeployment-common/ziputility.js', {
9090
getArchivedEntries: function(webDeployPkg) {
9191
return {
9292
"entries":[
@@ -96,7 +96,7 @@ tr.registerMock('webdeployment-common/ziputility.js', {
9696
}
9797
});
9898
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
99-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
99+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
100100
tr.registerMock('./msdeployutility.js', {
101101
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
102102
getMSDeployFullPath : function() {

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0NonWindowsXdtTransformationFail.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
9393

9494
import mockTask = require('vsts-task-lib/mock-task');
9595
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
96-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
96+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
9797
tr.registerMock('./msdeployutility.js', {
9898
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
9999
getMSDeployFullPath : function() {
@@ -168,7 +168,7 @@ tr.registerMock('azurerest-common/azurerestutility.js', {
168168
console.log("Successfully updated scmType to VSTSRM");
169169
}
170170
});
171-
tr.registerMock('webdeployment-common/ziputility.js', {
171+
tr.registerMock('../webdeployment-common/ziputility.js', {
172172
unzip: function() {
173173

174174
},

‎Tasks/AzureRmWebAppDeploymentV3/Tests/L0WindowsAllInput.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
9999

100100

101101
import mockTask = require('vsts-task-lib/mock-task');
102-
tr.registerMock('webdeployment-common/ziputility.js', {
102+
tr.registerMock('../webdeployment-common/ziputility.js', {
103103
getArchivedEntries: function(webDeployPkg) {
104104
return {
105105
"entries":[
@@ -110,7 +110,7 @@ tr.registerMock('webdeployment-common/ziputility.js', {
110110
}
111111
});
112112
var kuduDeploymentLog = require('azurerest-common/kududeploymentstatusutility.js');
113-
var msDeployUtility = require('webdeployment-common/msdeployutility.js');
113+
var msDeployUtility = require('../webdeployment-common/msdeployutility.js');
114114
tr.registerMock('./msdeployutility.js', {
115115
getMSDeployCmdArgs : msDeployUtility.getMSDeployCmdArgs,
116116
getMSDeployFullPath : function() {

0 commit comments

Comments
 (0)