Skip to content

Commit 735efb0

Browse files
authored
Revert "releases/v2 | minor patch release | Use a zip archival utility to exc…" (#471)
This reverts commit 1360898.
1 parent 1360898 commit 735efb0

File tree

4,360 files changed

+607280
-566190
lines changed

Some content is hidden

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

4,360 files changed

+607280
-566190
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
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
@@ -327,4 +327,4 @@ ASALocalRun/
327327
*.nvuser
328328

329329
# MFractors (Xamarin productivity tool) working folder
330-
.mfractor/
330+
.mfractor/

lib/ActionInputValidator/Validations.js

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || (function () {
19-
var ownKeys = function(o) {
20-
ownKeys = Object.getOwnPropertyNames || function (o) {
21-
var ar = [];
22-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23-
return ar;
24-
};
25-
return ownKeys(o);
26-
};
27-
return function (mod) {
28-
if (mod && mod.__esModule) return mod;
29-
var result = {};
30-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31-
__setModuleDefault(result, mod);
32-
return result;
33-
};
34-
})();
18+
var __importStar = (this && this.__importStar) || function (mod) {
19+
if (mod && mod.__esModule) return mod;
20+
var result = {};
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22+
__setModuleDefault(result, mod);
23+
return result;
24+
};
3525
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3626
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3727
return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,15 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
4232
});
4333
};
4434
Object.defineProperty(exports, "__esModule", { value: true });
45-
exports.appNameIsRequired = appNameIsRequired;
46-
exports.containerInputsNotAllowed = containerInputsNotAllowed;
47-
exports.validateAppDetails = validateAppDetails;
48-
exports.startupCommandNotAllowed = startupCommandNotAllowed;
49-
exports.packageNotAllowed = packageNotAllowed;
50-
exports.multiContainerNotAllowed = multiContainerNotAllowed;
51-
exports.validateSingleContainerInputs = validateSingleContainerInputs;
52-
exports.validateContainerInputs = validateContainerInputs;
53-
exports.validatePackageInput = validatePackageInput;
35+
exports.validatePackageInput = exports.validateContainerInputs = exports.validateSingleContainerInputs = exports.multiContainerNotAllowed = exports.packageNotAllowed = exports.startupCommandNotAllowed = exports.validateAppDetails = exports.containerInputsNotAllowed = exports.appNameIsRequired = void 0;
5436
const core = __importStar(require("@actions/core"));
5537
const packageUtility_1 = require("azure-actions-utility/packageUtility");
5638
const PublishProfile_1 = require("../Utilities/PublishProfile");
@@ -62,12 +44,14 @@ function appNameIsRequired(appname) {
6244
throw new Error("app-name is a required input.");
6345
}
6446
}
47+
exports.appNameIsRequired = appNameIsRequired;
6548
// Error if image info is provided
6649
function containerInputsNotAllowed(images, configFile, isPublishProfile = false) {
6750
if (!!images || !!configFile) {
6851
throw new Error(`This is not a container web app. Please remove inputs like images and configuration-file which are only relevant for container deployment.`);
6952
}
7053
}
54+
exports.containerInputsNotAllowed = containerInputsNotAllowed;
7155
// Cross-validate provided app name and slot is same as that in publish profile
7256
function validateAppDetails() {
7357
let actionParams = actionparameters_1.ActionParameters.getActionParams();
@@ -82,31 +66,36 @@ function validateAppDetails() {
8266
}
8367
}
8468
}
69+
exports.validateAppDetails = validateAppDetails;
8570
// Error is startup command is provided
8671
function startupCommandNotAllowed(startupCommand) {
8772
if (!!startupCommand) {
8873
throw new Error("startup-command is not a valid input for Windows web app or with publish-profile auth scheme.");
8974
}
9075
}
76+
exports.startupCommandNotAllowed = startupCommandNotAllowed;
9177
// Error if package input is provided
9278
function packageNotAllowed(apppackage) {
9379
if (!!apppackage && apppackage !== '.') {
9480
throw new Error("package is not a valid input for container web app.");
9581
}
9682
}
83+
exports.packageNotAllowed = packageNotAllowed;
9784
// Error if multi container config file is provided
9885
function multiContainerNotAllowed(configFile) {
9986
if (!!configFile) {
10087
throw new Error("Multi container support is not available for windows containerized web app or with publish profile.");
10188
}
10289
}
90+
exports.multiContainerNotAllowed = multiContainerNotAllowed;
10391
// Error if image name is not provided
10492
function validateSingleContainerInputs() {
10593
const actionParams = actionparameters_1.ActionParameters.getActionParams();
10694
if (!actionParams.images) {
10795
throw new Error("Image name not provided for container. Provide a valid image name");
10896
}
10997
}
98+
exports.validateSingleContainerInputs = validateSingleContainerInputs;
11099
// Validate container inputs
111100
function validateContainerInputs() {
112101
let actionParams = actionparameters_1.ActionParameters.getActionParams();
@@ -134,6 +123,7 @@ function validateContainerInputs() {
134123
throw new Error("Multiple images indicate multi-container deployment type, but Docker-compose file is absent.");
135124
}
136125
}
126+
exports.validateContainerInputs = validateContainerInputs;
137127
// validate package input
138128
function validatePackageInput() {
139129
return __awaiter(this, void 0, void 0, function* () {
@@ -146,3 +136,4 @@ function validatePackageInput() {
146136
}
147137
});
148138
}
139+
exports.validatePackageInput = validatePackageInput;

lib/DeploymentProvider/Providers/BaseWebAppDeploymentProvider.js

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || (function () {
19-
var ownKeys = function(o) {
20-
ownKeys = Object.getOwnPropertyNames || function (o) {
21-
var ar = [];
22-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23-
return ar;
24-
};
25-
return ownKeys(o);
26-
};
27-
return function (mod) {
28-
if (mod && mod.__esModule) return mod;
29-
var result = {};
30-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31-
__setModuleDefault(result, mod);
32-
return result;
33-
};
34-
})();
18+
var __importStar = (this && this.__importStar) || function (mod) {
19+
if (mod && mod.__esModule) return mod;
20+
var result = {};
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22+
__setModuleDefault(result, mod);
23+
return result;
24+
};
3525
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3626
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3727
return new (P || (P = Promise))(function (resolve, reject) {

lib/DeploymentProvider/Providers/WebAppDeploymentProvider.js

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || (function () {
19-
var ownKeys = function(o) {
20-
ownKeys = Object.getOwnPropertyNames || function (o) {
21-
var ar = [];
22-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23-
return ar;
24-
};
25-
return ownKeys(o);
26-
};
27-
return function (mod) {
28-
if (mod && mod.__esModule) return mod;
29-
var result = {};
30-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31-
__setModuleDefault(result, mod);
32-
return result;
33-
};
34-
})();
18+
var __importStar = (this && this.__importStar) || function (mod) {
19+
if (mod && mod.__esModule) return mod;
20+
var result = {};
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22+
__setModuleDefault(result, mod);
23+
return result;
24+
};
3525
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3626
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3727
return new (P || (P = Promise))(function (resolve, reject) {
@@ -72,8 +62,7 @@ class WebAppDeploymentProvider extends BaseWebAppDeploymentProvider_1.BaseWebApp
7262
break;
7363
case packageUtility_1.PackageType.folder:
7464
let tempPackagePath = utility.generateTemporaryFolderOrZipPath(`${process.env.RUNNER_TEMP}`, false);
75-
// exluding release.zip while creating zip for deployment.
76-
webPackage = (yield zipUtility.archiveFolderWithExcludePatterns(webPackage, "", tempPackagePath, ['release.zip']));
65+
webPackage = (yield zipUtility.archiveFolder(webPackage, "", tempPackagePath));
7766
core.debug("Compressed folder into zip " + webPackage);
7867
core.debug("Initiated deployment via kudu service for webapp package : " + webPackage);
7968
this.deploymentID = yield this.kuduServiceUtility.deployUsingZipDeploy(webPackage, { slotName: this.actionParams.slotName, commitMessage: this.actionParams.commitMessage });

lib/actionparameters.js

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || (function () {
19-
var ownKeys = function(o) {
20-
ownKeys = Object.getOwnPropertyNames || function (o) {
21-
var ar = [];
22-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23-
return ar;
24-
};
25-
return ownKeys(o);
26-
};
27-
return function (mod) {
28-
if (mod && mod.__esModule) return mod;
29-
var result = {};
30-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31-
__setModuleDefault(result, mod);
32-
return result;
33-
};
34-
})();
18+
var __importStar = (this && this.__importStar) || function (mod) {
19+
if (mod && mod.__esModule) return mod;
20+
var result = {};
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22+
__setModuleDefault(result, mod);
23+
return result;
24+
};
3525
Object.defineProperty(exports, "__esModule", { value: true });
3626
exports.ActionParameters = exports.appKindMap = exports.WebAppKind = void 0;
3727
const core = __importStar(require("@actions/core"));

lib/main.js

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || (function () {
19-
var ownKeys = function(o) {
20-
ownKeys = Object.getOwnPropertyNames || function (o) {
21-
var ar = [];
22-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23-
return ar;
24-
};
25-
return ownKeys(o);
26-
};
27-
return function (mod) {
28-
if (mod && mod.__esModule) return mod;
29-
var result = {};
30-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31-
__setModuleDefault(result, mod);
32-
return result;
33-
};
34-
})();
18+
var __importStar = (this && this.__importStar) || function (mod) {
19+
if (mod && mod.__esModule) return mod;
20+
var result = {};
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22+
__setModuleDefault(result, mod);
23+
return result;
24+
};
3525
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3626
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3727
return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
4232
});
4333
};
4434
Object.defineProperty(exports, "__esModule", { value: true });
45-
exports.main = main;
35+
exports.main = void 0;
4636
const core = __importStar(require("@actions/core"));
4737
const crypto = __importStar(require("crypto"));
4838
const actionparameters_1 = require("./actionparameters");
@@ -100,4 +90,5 @@ function main() {
10090
}
10191
});
10292
}
93+
exports.main = main;
10394
main();

node_modules/.bin/acorn

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

node_modules/.bin/acorn.cmd

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

node_modules/.bin/acorn.ps1

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

node_modules/.bin/browserslist

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)