@sap-ux/deploy-tooling 0.11.3 → 0.11.5

package/dist/base/deploy.js

@@ -238,9 +238,7 @@ function tryDeploy(provider, config, logger, archive) {
             if ((0, config_1.isBspConfig)(config.app)) {
                 if (config.test === true) {
                     const validateOutput = yield (0, validate_1.validateBeforeDeploy)(config, provider, logger);
-                    if (!validateOutput.result) {
-                        logger.info(`Results of validating the deployment configuration settings:${(0, validate_1.formatSummary)(validateOutput.summary)}`);
-                    }
+                    logger.info(`Results of validating the deployment configuration settings:${(0, validate_1.formatSummary)(validateOutput.summary)}`);
                 }
                 const service = getDeployService(provider.getUi5AbapRepository.bind(provider), config, logger);
                 yield service.deploy({ archive, bsp: config.app, testMode: config.test, safeMode: config.safe });

package/dist/base/validate.d.ts

@@ -8,6 +8,7 @@ export type ValidationInputs = {
     transport: string;
     client: string;
     url: string;
+    destination: string;
 };
 export type ValidationOutput = {
     summary: SummaryRecord[];
@@ -45,6 +46,7 @@ export declare const summaryMessage: {
 export declare function validateBeforeDeploy(config: AbapDeployConfig, provider: AbapServiceProvider, logger: Logger): Promise<ValidationOutput>;
 /**
  * Format a list of summary records that is ready to be printed on the console.
+ * The reduce function makes sure a EOL is added at the beginning of the output.
  *
  * @param summary A list of summary records
  * @returns Formatted summary string

package/dist/base/validate.js

@@ -14,6 +14,7 @@ const axios_extension_1 = require("@sap-ux/axios-extension");
 const chalk_1 = require("chalk");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const os_1 = require("os");
+const btp_utils_1 = require("@sap-ux/btp-utils");
 var SummaryStatus;
 (function (SummaryStatus) {
     SummaryStatus[SummaryStatus["Valid"] = 0] = "Valid";
@@ -41,7 +42,7 @@ exports.summaryMessage = {
  * @returns Validation result and a summary report of identified issues.
  */
 function validateBeforeDeploy(config, provider, logger) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         const output = {
             summary: [],
@@ -53,7 +54,8 @@ function validateBeforeDeploy(config, provider, logger) {
             package: (_c = config.app.package) !== null && _c !== void 0 ? _c : '',
             transport: (_d = config.app.transport) !== null && _d !== void 0 ? _d : '',
             client: (_e = config.target.client) !== null && _e !== void 0 ? _e : '',
-            url: (_f = config.target.url) !== null && _f !== void 0 ? _f : ''
+            url: (_f = config.target.url) !== null && _f !== void 0 ? _f : '',
+            destination: (_g = config.target.destination) !== null && _g !== void 0 ? _g : ''
         };
         // output is passed by reference and status updated during the internal pipeline below.
         yield validateInputTextFormat(input, output, provider, logger);
@@ -65,6 +67,7 @@ function validateBeforeDeploy(config, provider, logger) {
 exports.validateBeforeDeploy = validateBeforeDeploy;
 /**
  * Format a list of summary records that is ready to be printed on the console.
+ * The reduce function makes sure a EOL is added at the beginning of the output.
  *
  * @param summary A list of summary records
  * @returns Formatted summary string
@@ -85,7 +88,7 @@ function formatSummary(summary) {
                 statusSymbol = (0, chalk_1.yellow)('?');
                 break;
         }
-        return `${'    '}${statusSymbol} ${next.message}`;
+        return `${' '.repeat(4)}${statusSymbol} ${next.message}`;
     })
         .reduce((aggregated, current) => {
         return `${aggregated}${os_1.EOL}${current}`;
@@ -119,7 +122,7 @@ function validateInputTextFormat(input, output, provider, logger) {
         processInputValidationResult(result, output);
         result = (0, project_input_validator_1.validateClient)(input.client);
         processInputValidationResult(result, output);
-        result = (0, project_input_validator_1.validateUrl)(input.url);
+        result = validateUrlForOnPremTargetOnly(input.destination, input.url);
         processInputValidationResult(result, output);
         // If all the text validation passed, only show the following success message.
         if (output.result) {
@@ -130,6 +133,26 @@ function validateInputTextFormat(input, output, provider, logger) {
         }
     });
 }
+/**
+ * A wrapper of validateUrl(). It uses same logic in system-access module's createAbapServiceProvider()
+ * function to determine the deploy target. Only validate URL for on-prem ABAP deploy target.
+ *
+ * @param destination
+ * @param url
+ * @returns
+ */
+function validateUrlForOnPremTargetOnly(destination, url) {
+    if ((0, btp_utils_1.isAppStudio)() && destination) {
+        // No validation required for destination name
+        return true;
+    }
+    else if (url) {
+        return (0, project_input_validator_1.validateUrl)(url);
+    }
+    else {
+        return 'Invalid deploy target';
+    }
+}
 /**
  * Helper function that calls ADT service to retrieve system specific prefix
  * requirement for Fiori app name.

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Adeploy-tooling"
   },
-  "version": "0.11.3",
+  "version": "0.11.5",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -37,11 +37,11 @@
     "@sap-ux/logger": "0.4.0",
     "@sap-ux/system-access": "0.3.3",
     "@sap-ux/ui5-config": "0.20.0",
-    "@sap-ux/project-input-validator": "0.2.0"
+    "@sap-ux/project-input-validator": "0.2.1"
   },
   "devDependencies": {
     "@types/prompts": "2.4.4",
-    "@types/adm-zip": "0.5.2",
+    "@types/adm-zip": "0.5.3",
     "@sap-ux/store": "0.4.0"
   },
   "ui5": {