Kubeapp (releases/v2) (#142)

* new app kind support * adding node_modules * rebuilding Co-authored-by: Amruta Kawade <[email protected]>
Azure · May 24, 2021 · 676ed2b · 676ed2b
1 parent 798e438
commit 676ed2b
Show file tree

Hide file tree

Showing 915 changed files with 34,785 additions and 178 deletions.
diff --git a/lib/ActionInputValidator/Validations.js b/lib/ActionInputValidator/Validations.js
@@ -44,7 +44,8 @@ function validateAppDetails() {
     let actionParams = actionparameters_1.ActionParameters.getActionParams();
     if (!!actionParams.appName || (!!actionParams.slotName && actionParams.slotName.toLowerCase() !== 'production')) {
         let creds = PublishProfile_1.PublishProfile.getPublishProfile(actionParams.publishProfileContent).creds;
-        let splitUsername = creds.username.toUpperCase().substring(1).split("__");
+        //for kubeapps in publishsettings file username doesn't start with $, for all other apps it starts with $
+        let splitUsername = creds.username.startsWith("$") ? creds.username.toUpperCase().substring(1).split("__") : creds.username.toUpperCase().split("__");
         let appNameMatch = !actionParams.appName || actionParams.appName.toUpperCase() === splitUsername[0];
         let slotNameMatch = actionParams.slotName.toLowerCase() === 'production' || actionParams.slotName.toUpperCase() === splitUsername[1];
         if (!appNameMatch || !slotNameMatch) {

diff --git a/lib/ActionInputValidator/ValidatorFactory.js b/lib/ActionInputValidator/ValidatorFactory.js
@@ -41,17 +41,21 @@ class ValidatorFactory {
                 // app-name is required to get resource details
                 Validations_1.appNameIsRequired(actionParams.appName);
                 yield this.getResourceDetails(actionParams);
-                switch (actionParams.kind) {
-                    case actionparameters_1.WebAppKind.Linux:
-                        return new SpnLinuxWebAppValidator_1.SpnLinuxWebAppValidator();
-                    case actionparameters_1.WebAppKind.Windows:
-                        return new SpnWindowsWebAppValidator_1.SpnWindowsWebAppValidator();
-                    case actionparameters_1.WebAppKind.LinuxContainer:
+                if (!!actionParams.isLinux) {
+                    if (!!actionParams.images) {
                         return new SpnLinuxContainerWebAppValidator_1.SpnLinuxContainerWebAppValidator();
-                    case actionparameters_1.WebAppKind.WindowsContainer:
+                    }
+                    else {
+                        return new SpnLinuxWebAppValidator_1.SpnLinuxWebAppValidator();
+                    }
+                }
+                else {
+                    if (!!actionParams.images) {
                         return new SpnWindowsContainerWebAppValidator_1.SpnWindowsContainerWebAppValidator();
-                    default:
-                        throw new Error(`Action does not support app service with kind ${actionParams.realKind}.`);
+                    }
+                    else {
+                        return new SpnWindowsWebAppValidator_1.SpnWindowsWebAppValidator();
+                    }
                 }
             }
             else {
@@ -65,7 +69,8 @@ class ValidatorFactory {
             params.resourceGroupName = appDetails["resourceGroupName"];
             params.realKind = appDetails["kind"];
             params.kind = actionparameters_1.appKindMap.get(params.realKind);
-            params.isLinux = params.realKind.indexOf("linux") > -1;
+            //app kind linux and kubeapp is supported only on linux environment currently
+            params.isLinux = params.realKind.indexOf("linux") > -1 || params.realKind.indexOf("kubeapp") > -1;
         });
     }
     static setResourceDetails(actionParams) {

diff --git a/lib/DeploymentProvider/DeploymentProviderFactory.js b/lib/DeploymentProvider/DeploymentProviderFactory.js
@@ -16,16 +16,11 @@ class DeploymentProviderFactory {
             }
         }
         else if (type == BaseWebAppDeploymentProvider_1.DEPLOYMENT_PROVIDER_TYPES.SPN) {
-            let kind = actionparameters_1.ActionParameters.getActionParams().kind;
-            switch (kind) {
-                case actionparameters_1.WebAppKind.Linux:
-                case actionparameters_1.WebAppKind.Windows:
-                    return new WebAppDeploymentProvider_1.WebAppDeploymentProvider(type);
-                case actionparameters_1.WebAppKind.LinuxContainer:
-                case actionparameters_1.WebAppKind.WindowsContainer:
-                    return new WebAppContainerDeployment_1.WebAppContainerDeploymentProvider(type);
-                default:
-                    throw new Error("No deployment provider supporting app kind: " + kind);
+            if (!!actionparameters_1.ActionParameters.getActionParams().images) {
+                return new WebAppContainerDeployment_1.WebAppContainerDeploymentProvider(type);
+            }
+            else {
+                return new WebAppDeploymentProvider_1.WebAppDeploymentProvider(type);
             }
         }
         else {

diff --git a/node_modules/available-typed-arrays/LICENSE b/node_modules/available-typed-arrays/LICENSE
diff --git a/node_modules/es-abstract/.gitattributes b/node_modules/es-abstract/.gitattributes
diff --git a/node_modules/es-abstract/.github/workflows/codeql-analysis.yml b/node_modules/es-abstract/.github/workflows/codeql-analysis.yml
diff --git a/node_modules/es-abstract/test/tests.js b/node_modules/es-abstract/test/tests.js
diff --git a/node_modules/is-callable/test/index.js b/node_modules/is-callable/test/index.js
diff --git a/node_modules/is-negative-zero/.jscs.json b/node_modules/is-negative-zero/.jscs.json
diff --git a/node_modules/is-negative-zero/.npmignore b/node_modules/is-negative-zero/.npmignore
diff --git a/node_modules/is-negative-zero/.travis.yml b/node_modules/is-negative-zero/.travis.yml
diff --git a/node_modules/is-negative-zero/test.js b/node_modules/is-negative-zero/test.js
diff --git a/...typed-arrays/.github/workflows/rebase.yml → ...-typed-array/.github/workflows/rebase.yml b/...typed-arrays/.github/workflows/rebase.yml → ...-typed-array/.github/workflows/rebase.yml