Skip to content

Commit 1983335

Browse files
committed
resolve comments
1 parent 96d01ab commit 1983335

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

lib/ActionInputValidator/ValidatorFactory.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,13 @@ class ValidatorFactory {
135135
}
136136
static isBlessedSitecontainerApp(actionParams) {
137137
return __awaiter(this, void 0, void 0, function* () {
138+
var _a, _b;
138139
const appService = new azure_app_service_1.AzureAppService(actionParams.endpoint, actionParams.resourceGroupName, actionParams.appName, actionParams.slotName);
139140
let config = yield appService.getConfiguration();
140141
core.debug(`LinuxFxVersion of app is: ${config.properties.linuxFxVersion}`);
141-
actionParams.blessedAppSitecontainers = (config.properties.linuxFxVersion !== "DOCKER" && config.properties.containerImageName !== "SITECONTAINERS");
142+
actionParams.blessedAppSitecontainers = (((_a = config.properties.linuxFxVersion) === null || _a === void 0 ? void 0 : _a.startsWith("DOCKER|")) !== true
143+
&& ((_b = config.properties.linuxFxVersion) === null || _b === void 0 ? void 0 : _b.startsWith("COMPOSE|")) !== true
144+
&& config.properties.linuxFxVersion !== "SITECONTAINERS");
142145
return actionParams.blessedAppSitecontainers;
143146
});
144147
}

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@actions/core": "^1.10.0",
3535
"@actions/github": "^4.0.0",
3636
"actions-secret-parser": "^1.0.4",
37-
"azure-actions-appservice-rest": "^1.3.31",
37+
"azure-actions-appservice-rest": "^1.3.32",
3838
"azure-actions-utility": "^1.0.3",
3939
"azure-actions-webclient": "^1.1.1"
4040
}

src/ActionInputValidator/ValidatorFactory.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ export class ValidatorFactory {
9393

9494
core.debug(`LinuxFxVersion of app is: ${config.properties.linuxFxVersion}`);
9595

96-
actionParams.blessedAppSitecontainers = (config.properties.linuxFxVersion !== "DOCKER" && config.properties.containerImageName !== "SITECONTAINERS");
96+
actionParams.blessedAppSitecontainers = (config.properties.linuxFxVersion?.startsWith("DOCKER|") !== true
97+
&& config.properties.linuxFxVersion?.startsWith("COMPOSE|") !== true
98+
&& config.properties.linuxFxVersion !== "SITECONTAINERS");
9799

98100
return actionParams.blessedAppSitecontainers;
99101
}

0 commit comments

Comments
 (0)