From 3bd04a71255779c4da5288432431b0868aa7b033 Mon Sep 17 00:00:00 2001 From: shpraka <46188819+shpraka@users.noreply.github.com> Date: Wed, 11 Jan 2023 00:24:26 -0800 Subject: [PATCH] Adding Resource Group As Optional Param (#283) * Adding Resource Group As Optional Param * changed the appservice web client version --- action.yml | 4 ++++ lib/ActionInputValidator/ValidatorFactory.js | 2 +- lib/actionparameters.js | 4 +++- package-lock.json | 18 +++++++++--------- package.json | 2 +- src/ActionInputValidator/ValidatorFactory.ts | 2 +- src/actionparameters.ts | 1 + 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/action.yml b/action.yml index a34f783cc..f4c1d8eae 100644 --- a/action.yml +++ b/action.yml @@ -25,6 +25,10 @@ inputs: startup-command: description: 'Enter the start up command. For ex. dotnet run or dotnet run' required: false + resource-group-name: + description: 'Enter the resource group name of the web app' + required: false + outputs: webapp-url: description: 'URL to work with your webapp' diff --git a/lib/ActionInputValidator/ValidatorFactory.js b/lib/ActionInputValidator/ValidatorFactory.js index 390a0b5bf..fb32ce99d 100644 --- a/lib/ActionInputValidator/ValidatorFactory.js +++ b/lib/ActionInputValidator/ValidatorFactory.js @@ -65,7 +65,7 @@ class ValidatorFactory { } static getResourceDetails(params) { return __awaiter(this, void 0, void 0, function* () { - let appDetails = yield AzureResourceFilterUtility_1.AzureResourceFilterUtility.getAppDetails(params.endpoint, params.appName); + let appDetails = yield AzureResourceFilterUtility_1.AzureResourceFilterUtility.getAppDetails(params.endpoint, params.appName, params.resourceGroupName); params.resourceGroupName = appDetails["resourceGroupName"]; params.realKind = appDetails["kind"]; params.kind = actionparameters_1.appKindMap.get(params.realKind); diff --git a/lib/actionparameters.js b/lib/actionparameters.js index 7452f495b..c0ccd857e 100644 --- a/lib/actionparameters.js +++ b/lib/actionparameters.js @@ -21,7 +21,8 @@ exports.appKindMap = new Map([ ['app', WebAppKind.Windows], ['app,linux', WebAppKind.Linux], ['app,container,windows', WebAppKind.WindowsContainer], - ['app,linux,container', WebAppKind.LinuxContainer] + ['app,linux,container', WebAppKind.LinuxContainer], + ['api', WebAppKind.Windows], ]); class ActionParameters { constructor(endpoint) { @@ -32,6 +33,7 @@ class ActionParameters { this._images = core.getInput('images'); this._multiContainerConfigFile = core.getInput('configuration-file'); this._startupCommand = core.getInput('startup-command'); + this._resourceGroupName = core.getInput('resource-group-name'); /** * Trimming the commit message because it is used as a param in uri of deployment api. And sometimes, it exceeds the max length of http URI. */ diff --git a/package-lock.json b/package-lock.json index 843865b1b..bc2c75ae3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@actions/core": "^1.10.0", "@actions/github": "^4.0.0", "actions-secret-parser": "^1.0.4", - "azure-actions-appservice-rest": "^1.3.3", + "azure-actions-appservice-rest": "^1.3.6", "azure-actions-utility": "^1.0.3", "azure-actions-webclient": "^1.1.0" }, @@ -1344,11 +1344,11 @@ "dev": true }, "node_modules/azure-actions-appservice-rest": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/azure-actions-appservice-rest/-/azure-actions-appservice-rest-1.3.3.tgz", - "integrity": "sha512-yKhSR3QqxRMlv2oZi4/Pbto678KKfTMcn9Bq9FSsPhEV5UL/SUhn/BXYznCgkJ6sTTQINF7e48iq294kG0Nmtg==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/azure-actions-appservice-rest/-/azure-actions-appservice-rest-1.3.6.tgz", + "integrity": "sha512-usIBcB9XQiI61ku6gdk3RpW1miSNzFijCvourtNK5j//FUytv5+PFgow9//qoMR6Xue8pVQwWxVIfxuJlX5Nsw==", "dependencies": { - "@actions/core": "^1.1.1", + "@actions/core": "^1.1.10", "@actions/io": "^1.0.1", "@types/node": "^14.14.31", "azure-actions-webclient": "^1.1.0", @@ -8190,11 +8190,11 @@ "dev": true }, "azure-actions-appservice-rest": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/azure-actions-appservice-rest/-/azure-actions-appservice-rest-1.3.3.tgz", - "integrity": "sha512-yKhSR3QqxRMlv2oZi4/Pbto678KKfTMcn9Bq9FSsPhEV5UL/SUhn/BXYznCgkJ6sTTQINF7e48iq294kG0Nmtg==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/azure-actions-appservice-rest/-/azure-actions-appservice-rest-1.3.6.tgz", + "integrity": "sha512-usIBcB9XQiI61ku6gdk3RpW1miSNzFijCvourtNK5j//FUytv5+PFgow9//qoMR6Xue8pVQwWxVIfxuJlX5Nsw==", "requires": { - "@actions/core": "^1.1.1", + "@actions/core": "^1.1.10", "@actions/io": "^1.0.1", "@types/node": "^14.14.31", "azure-actions-webclient": "^1.1.0", diff --git a/package.json b/package.json index dd4d56b3a..fb097ed1b 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@actions/core": "^1.10.0", "@actions/github": "^4.0.0", "actions-secret-parser": "^1.0.4", - "azure-actions-appservice-rest": "^1.3.3", + "azure-actions-appservice-rest": "^1.3.6", "azure-actions-utility": "^1.0.3", "azure-actions-webclient": "^1.1.0" } diff --git a/src/ActionInputValidator/ValidatorFactory.ts b/src/ActionInputValidator/ValidatorFactory.ts index a3966a464..40d734313 100644 --- a/src/ActionInputValidator/ValidatorFactory.ts +++ b/src/ActionInputValidator/ValidatorFactory.ts @@ -52,7 +52,7 @@ export class ValidatorFactory { } private static async getResourceDetails(params: ActionParameters) { - let appDetails = await AzureResourceFilterUtility.getAppDetails(params.endpoint, params.appName); + let appDetails = await AzureResourceFilterUtility.getAppDetails(params.endpoint, params.appName, params.resourceGroupName); params.resourceGroupName = appDetails["resourceGroupName"]; params.realKind = appDetails["kind"]; params.kind = appKindMap.get(params.realKind); diff --git a/src/actionparameters.ts b/src/actionparameters.ts index 606f1139e..4d3ff6c5c 100644 --- a/src/actionparameters.ts +++ b/src/actionparameters.ts @@ -44,6 +44,7 @@ export class ActionParameters { this._images = core.getInput('images'); this._multiContainerConfigFile = core.getInput('configuration-file'); this._startupCommand = core.getInput('startup-command'); + this._resourceGroupName = core.getInput('resource-group-name'); /** * Trimming the commit message because it is used as a param in uri of deployment api. And sometimes, it exceeds the max length of http URI. */