Adding Resource Group As Optional Param (#283)

* Adding Resource Group As Optional Param * changed the appservice web client version
Azure · Jan 11, 2023 · 3bd04a7 · 3bd04a7
1 parent 1217efd
commit 3bd04a7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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.
          */