Fix location

Azure · Nov 11, 2023 · 145abc7 · 145abc7
1 parent 3d42700
commit 145abc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/azurecontainerapps.ts b/azurecontainerapps.ts
@@ -234,17 +234,16 @@ export class azurecontainerapps {
         let location: string = this.toolHelper.getInput('location', false);
         let resourceGroup: string = this.toolHelper.getInput('resourceGroup', false);
 
-        if (!this.util.isNullOrEmpty(resourceGroup)) {
-            let doesContainerAppExist = await this.appHelper.doesContainerAppExist(this.containerAppName, resourceGroup);
-            if (doesContainerAppExist) {
-                var environmentName = await this.appHelper.getExistingContainerAppEnvironmentName(this.containerAppName, resourceGroup);
-                location = await this.appHelper.getExistingContainerAppEnvironmentLocation(environmentName, resourceGroup);
-            }
-        }
-
          // If no location was provided, use the default location for the Container App service
          if (this.util.isNullOrEmpty(location)) {
-            location = await this.appHelper.getDefaultContainerAppLocation();
+            if (!this.util.isNullOrEmpty(resourceGroup)) {
+                let doesContainerAppExist = await this.appHelper.doesContainerAppExist(this.containerAppName, resourceGroup);
+                if (doesContainerAppExist) {
+                    var environmentName = await this.appHelper.getExistingContainerAppEnvironmentName(this.containerAppName, resourceGroup);
+                    location = await this.appHelper.getExistingContainerAppEnvironmentLocation(environmentName, resourceGroup);
+                }
+            }
+           // location = await this.appHelper.getDefaultContainerAppLocation();
         }
 
         return location;

diff --git a/dist/index.js b/dist/index.js
@@ -262,6 +262,7 @@ var azurecontainerapps = /** @class */ (function () {
                     case 0:
                         location = this.toolHelper.getInput('location', false);
                         resourceGroup = this.toolHelper.getInput('resourceGroup', false);
+                        if (!this.util.isNullOrEmpty(location)) return [3 /*break*/, 4];
                         if (!!this.util.isNullOrEmpty(resourceGroup)) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.appHelper.doesContainerAppExist(this.containerAppName, resourceGroup)];
                     case 1:
@@ -274,13 +275,7 @@ var azurecontainerapps = /** @class */ (function () {
                     case 3:
                         location = _a.sent();
                         _a.label = 4;
-                    case 4:
-                        if (!this.util.isNullOrEmpty(location)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.appHelper.getDefaultContainerAppLocation()];
-                    case 5:
-                        location = _a.sent();
-                        _a.label = 6;
-                    case 6: return [2 /*return*/, location];
+                    case 4: return [2 /*return*/, location];
                 }
             });
         });