Skip to content

Commit 145a068

Browse files
committed
update node_modules
1 parent 3dc06f7 commit 145a068

File tree

9,147 files changed

+1906094
-28
lines changed

Some content is hidden

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

9,147 files changed

+1906094
-28
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ FakesAssemblies/
261261

262262
# Node.js Tools for Visual Studio
263263
.ntvs_analysis.dat
264-
node_modules/
264+
# node_modules/
265265

266266
# Visual Studio 6 build log
267267
*.plg

lib/DeploymentProvider/Providers/WebAppDeploymentProvider.js

+32-27
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,41 @@ class WebAppDeploymentProvider extends BaseWebAppDeploymentProvider_1.BaseWebApp
2727
return __awaiter(this, void 0, void 0, function* () {
2828
let appPackage = this.actionParams.package;
2929
let webPackage = appPackage.getPath();
30+
const validTypes = ["war", "jar", "ear", "zip", "static"];
3031
// kudu warm up
3132
yield this.kuduServiceUtility.warmpUp();
32-
let packageType = appPackage.getPackageType();
33-
switch (packageType) {
34-
case packageUtility_1.PackageType.war:
35-
core.debug("Initiated deployment via kudu service for webapp war package : " + webPackage);
36-
var warName = utility.getFileNameFromPath(webPackage, ".war");
37-
this.deploymentID = yield this.kuduServiceUtility.deployUsingWarDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage }, warName);
38-
break;
39-
case packageUtility_1.PackageType.jar:
40-
core.debug("Initiated deployment via kudu service for webapp jar package : " + webPackage);
41-
let folderPath = yield utility.generateTemporaryFolderForDeployment(false, webPackage, packageUtility_1.PackageType.jar);
42-
let output = yield utility.archiveFolderForDeployment(false, folderPath);
43-
webPackage = output.webDeployPkg;
44-
this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });
45-
break;
46-
case packageUtility_1.PackageType.folder:
47-
let tempPackagePath = utility.generateTemporaryFolderOrZipPath(`${process.env.RUNNER_TEMP}`, false);
48-
webPackage = (yield zipUtility.archiveFolder(webPackage, "", tempPackagePath));
49-
core.debug("Compressed folder into zip " + webPackage);
50-
core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
51-
this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });
52-
break;
53-
case packageUtility_1.PackageType.zip:
54-
core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
55-
this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });
56-
break;
57-
default:
58-
throw new Error('Invalid App Service package or folder path provided: ' + webPackage);
33+
// If provided, type paramater takes precidence over file package type
34+
if (this.actionParams.type != null && validTypes.includes(this.actionParams.type.toLowerCase())) {
35+
core.debug("Initiated deployment via kudu service for webapp" + this.actionParams.type + "package : " + webPackage);
5936
}
37+
else {
38+
// Retains the old behavior of determining the package type from the file extension if valid type is not defined
39+
let packageType = appPackage.getPackageType();
40+
switch (packageType) {
41+
case packageUtility_1.PackageType.war:
42+
core.debug("Initiated deployment via kudu service for webapp war package : " + webPackage);
43+
this.actionParams.type = "war";
44+
break;
45+
case packageUtility_1.PackageType.jar:
46+
core.debug("Initiated deployment via kudu service for webapp jar package : " + webPackage);
47+
this.actionParams.type = "jar";
48+
break;
49+
case packageUtility_1.PackageType.folder:
50+
let tempPackagePath = utility.generateTemporaryFolderOrZipPath(`${process.env.RUNNER_TEMP}`, false);
51+
webPackage = (yield zipUtility.archiveFolder(webPackage, "", tempPackagePath));
52+
core.debug("Compressed folder into zip " + webPackage);
53+
core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
54+
this.actionParams.type = "zip";
55+
break;
56+
case packageUtility_1.PackageType.zip:
57+
core.debug("Initiated deployment via kudu service for webapp zip package : " + webPackage);
58+
this.actionParams.type = "zip";
59+
break;
60+
default:
61+
throw new Error('Invalid App Service package: ' + webPackage + ' or type provided: ' + this.actionParams.type);
62+
}
63+
}
64+
this.deploymentID = yield this.kuduServiceUtility.deployUsingOneDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage }, this.actionParams.targetPath, this.actionParams.type, this.actionParams.clean, this.actionParams.restart);
6065
// updating startup command
6166
if (!!this.actionParams.startupCommand) {
6267
yield this.updateStartupCommand();

lib/actionparameters.js

+20
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ class ActionParameters {
3939
*/
4040
this._commitMessage = github.context.eventName === 'push' ? github.context.payload.head_commit.message.slice(0, 1000) : "";
4141
this._endpoint = endpoint;
42+
// Used only for OneDeploy
43+
this._type = core.getInput('type');
44+
this._targetPath = core.getInput('target-path');
45+
this._clean = core.getInput('clean');
46+
this._restart = core.getInput('restart');
4247
}
4348
static getActionParams(endpoint) {
4449
if (!this.actionparams) {
@@ -112,5 +117,20 @@ class ActionParameters {
112117
get multiContainerConfigFile() {
113118
return this._multiContainerConfigFile;
114119
}
120+
get type() {
121+
return this._type;
122+
}
123+
set type(type) {
124+
this._type = type;
125+
}
126+
get targetPath() {
127+
return this._targetPath;
128+
}
129+
get clean() {
130+
return this._clean;
131+
}
132+
get restart() {
133+
return this._restart;
134+
}
115135
}
116136
exports.ActionParameters = ActionParameters;

node_modules/.bin/acorn

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/acorn.cmd

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/acorn.ps1

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/atob

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/atob.cmd

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/atob.ps1

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/copy

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/copy-cli

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/copy-cli.cmd

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/copy-cli.ps1

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/copy.cmd

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/copy.ps1

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/decompress-zip

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/decompress-zip.cmd

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)