Kubeapp (releases/V1) (#83)

* app-kind changes

* updating tests folder

* kudu get appsettings altenative for kubeapp

* removed typo

* Release v1.2.1

* reverted test changes

* adding lib

* rebuilding

Co-authored-by: Amruta Kawade <[email protected]>
Co-authored-by: Hanzhang Zeng (Roger) <[email protected]>
Co-authored-by: Hanzhang Zeng <[email protected]>

Author: 4 people

lib/handlers/resourceValidator.js

@@ -77,7 +77,8 @@ class ResourceValidator {
             const scm = context.scmCredentials;
             this._kuduService = new azure_app_kudu_service_1.Kudu(scm.uri, scm.username, scm.password);
             this._kuduServiceUtil = new KuduServiceUtility_1.KuduServiceUtility(this._kuduService);
-            this._appSettings = yield this.getFunctionappSettingsScm(state, this._kuduService);
+            //Kudu API (GET {publishURL}/api/settings api is not available for kubeapp
+            this._appSettings = (scm.uri.indexOf("k4apps") === -1) ? yield this.getFunctionappSettingsScm(state, this._kuduService) : null;
             this._appUrl = scm.appUrl;
             this._isLinux = null;
         });
@@ -90,7 +91,7 @@ class ResourceValidator {
             }
             this._resourceGroupName = appDetails["resourceGroupName"];
             this._kind = appDetails["kind"];
-            this._isLinux = this._kind.indexOf('linux') >= 0;
+            this._isLinux = this._kind.indexOf('linux') >= 0 || this._kind.indexOf('kubeapp') >= 0;
         });
     }
     getOsTypeFromIsLinux(isLinux) {
@@ -120,7 +121,7 @@ class ResourceValidator {
             for (const key in configSettings.properties) {
                 utils_1.Logger.Debug(`- ${key} = ${configSettings.properties[key]}`);
             }
-            const result = function_sku_1.FunctionSkuUtil.FromString(configSettings.properties.sku);
+            const result = (!!configSettings.properties.sku) ? function_sku_1.FunctionSkuUtil.FromString(configSettings.properties.sku) : undefined;
             utils_1.Logger.Info(`Detected function app sku: ${function_sku_1.FunctionSkuConstant[result]}`);
             return result;
         });

lib/publishers/zipDeploy.js

@@ -48,12 +48,12 @@ class ZipDeploy {
     }
     static validateApplicationSettings(state, context) {
         const appSettings = context.appSettings;
-        if (appSettings.WEBSITE_RUN_FROM_PACKAGE !== undefined &&
+        if (!!appSettings && appSettings.WEBSITE_RUN_FROM_PACKAGE !== undefined &&
             appSettings.WEBSITE_RUN_FROM_PACKAGE.trim().startsWith('http')) {
             throw new exceptions_1.AzureResourceError(state, "zipDepoy", "WEBSITE_RUN_FROM_PACKAGE in your function app is " +
                 "set to an URL. Please remove WEBSITE_RUN_FROM_PACKAGE app setting from your function app.");
         }
-        if (appSettings.WEBSITE_RUN_FROM_PACKAGE !== undefined &&
+        if (!!appSettings && appSettings.WEBSITE_RUN_FROM_PACKAGE !== undefined &&
             appSettings.WEBSITE_RUN_FROM_PACKAGE.trim() === '1' &&
             (context.os === undefined || context.os === runtime_stack_1.RuntimeStackConstant.Linux)) {
             utils_1.Logger.Warn("Detected WEBSITE_RUN_FROM_PACKAGE is set to '1'. If you are deploying to a Linux " +
@@ -65,7 +65,7 @@ class ZipDeploy {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (context.os === runtime_stack_1.RuntimeStackConstant.Windows &&
-                    context.authenticationType === authentication_type_1.AuthenticationType.Rbac &&
+                    context.authenticationType === authentication_type_1.AuthenticationType.Rbac && !!context.appSettings &&
                     !utils_1.Parser.IsTrueLike(context.appSettings.WEBSITE_RUN_FROM_PACKAGE)) {
                     utils_1.Logger.Info('Setting WEBSITE_RUN_FROM_PACKAGE to 1');
                     yield this._updateApplicationSettings(context, { 'WEBSITE_RUN_FROM_PACKAGE': '1' });
@@ -96,17 +96,17 @@ class ZipDeploy {
             try {
                 if (context.authenticationType === authentication_type_1.AuthenticationType.Scm) {
                     // Restore previous app settings if they are temporarily changed
-                    if (original.WEBSITE_RUN_FROM_PACKAGE) {
+                    if (!!original && original.WEBSITE_RUN_FROM_PACKAGE) {
                         yield utils_1.Client.updateAppSettingViaKudu(context.scmCredentials, {
                             'WEBSITE_RUN_FROM_PACKAGE': original.WEBSITE_RUN_FROM_PACKAGE
                         }, 3, 3, false);
                     }
-                    if (original.SCM_DO_BUILD_DURING_DEPLOYMENT) {
+                    if (!!original && original.SCM_DO_BUILD_DURING_DEPLOYMENT) {
                         yield utils_1.Client.updateAppSettingViaKudu(context.scmCredentials, {
                             'SCM_DO_BUILD_DURING_DEPLOYMENT': original.SCM_DO_BUILD_DURING_DEPLOYMENT
                         }, 3, 3, false);
                     }
-                    if (original.ENABLE_ORYX_BUILD) {
+                    if (!!original && original.ENABLE_ORYX_BUILD) {
                         yield utils_1.Client.updateAppSettingViaKudu(context.scmCredentials, {
                             'ENABLE_ORYX_BUILD': original.ENABLE_ORYX_BUILD
                         }, 3, 3, false);
@@ -123,13 +123,13 @@ class ZipDeploy {
             try {
                 if (context.authenticationType === authentication_type_1.AuthenticationType.Scm) {
                     // Delete previous app settings if they are temporarily set
-                    if (original.WEBSITE_RUN_FROM_PACKAGE === undefined) {
+                    if (!!original && original.WEBSITE_RUN_FROM_PACKAGE === undefined) {
                         yield utils_1.Client.deleteAppSettingViaKudu(context.scmCredentials, 'WEBSITE_RUN_FROM_PACKAGE', 3, 3, false);
                     }
-                    if (original.SCM_DO_BUILD_DURING_DEPLOYMENT === undefined) {
+                    if (!!original && original.SCM_DO_BUILD_DURING_DEPLOYMENT === undefined) {
                         yield utils_1.Client.deleteAppSettingViaKudu(context.scmCredentials, 'SCM_DO_BUILD_DURING_DEPLOYMENT', 3, 3, false);
                     }
-                    if (original.ENABLE_ORYX_BUILD === undefined) {
+                    if (!!original && original.ENABLE_ORYX_BUILD === undefined) {
                         yield utils_1.Client.deleteAppSettingViaKudu(context.scmCredentials, 'ENABLE_ORYX_BUILD', 3, 3, false);
                     }
                 }
@@ -147,8 +147,8 @@ class ZipDeploy {
             while (retryCount > 0) {
                 yield utils_1.Sleeper.timeout(retryInterval);
                 try {
-                    const settings = yield context.kuduService.getAppSettings();
-                    if (settings && settings[key] && settings[key] === expectedValue) {
+                    const settings = yield context.appService.getApplicationSettings();
+                    if (settings && settings.properties[key] && settings.properties[key] === expectedValue) {
                         isSuccess = true;
                         break;
                     }