@sap-ux/deploy-tooling 0.3.4 → 0.4.1

package/README.md

@@ -57,6 +57,7 @@ Options:
   --verbose                            verbose log output (default: false)
   --destination  <destination>         Destination in SAP BTP pointing to an ABAP system
   --url <target-url>                   URL of target ABAP system
+  --service                            (Optional) Alias for the target SAPUI5 Respository OData Service
   --client <sap-client>                Client number of target ABAP system
   --cloud                              target is an ABAP Cloud system
   --cloud-service-key <file-location>  JSON file location with the ABAP cloud service key.
@@ -89,6 +90,7 @@ Options:
   --verbose                            verbose log output (default: false)
   --destination  <destination>         Destination in SAP BTP pointing to an ABAP system
   --url <target-url>                   URL of target ABAP system
+  --service                            (Optional) Alias for the target SAPUI5 Respository OData Service
   --client <sap-client>                Client number of target ABAP system
   --cloud                              target is an ABAP Cloud system
   --cloud-service-key <file-location>  JSON file location with the ABAP cloud service key.

package/dist/base/deploy.js

@@ -71,6 +71,15 @@ function createAbapCloudServiceProvider(options, target, noPrompt, logger) {
         }
     });
 }
+/**
+ * Checks if credentials are of basic auth type.
+ *
+ * @param authOpts credential options
+ * @returns boolean
+ */
+function isBasicAuth(authOpts) {
+    return !!authOpts && authOpts.password !== undefined;
+}
 /**
  * Enhance axios options and create a service provider instance for an on-premise ABAP system.
  *
@@ -86,12 +95,15 @@ function createAbapServiceProvider(options, target) {
         }
         if (!options.auth) {
             const storedOpts = yield getCredentials(target);
-            if (storedOpts === null || storedOpts === void 0 ? void 0 : storedOpts.password) {
+            if (isBasicAuth(storedOpts)) {
                 options.auth = {
                     username: storedOpts.username,
                     password: storedOpts.password
                 };
             }
+            if (storedOpts === null || storedOpts === void 0 ? void 0 : storedOpts.serviceKeys) {
+                throw new Error('This is an ABAP Cloud system, please add the --cloud arg to ensure the correct deployment flow.');
+            }
         }
         return (0, axios_extension_1.createForAbap)(options);
     });
@@ -104,7 +116,7 @@ function createAbapServiceProvider(options, target) {
  * @returns service instance
  */
 function createDeployService(config, logger) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         let provider;
         const options = {};
@@ -139,7 +151,7 @@ function createDeployService(config, logger) {
         else {
             throw new Error('Unable to handle the configuration in the current environment.');
         }
-        return provider.getUi5AbapRepository();
+        return provider.getUi5AbapRepository((_d = config.target) === null || _d === void 0 ? void 0 : _d.service);
     });
 }
 /**
@@ -259,7 +271,7 @@ function tryDeploy(service, config, logger, archive) {
                 logger.info('Deployment in TestMode completed. A successful TestMode execution does not necessarily mean that your upload will be successful.');
             }
             else {
-                logger.info('Successfully deployed.');
+                logger.info('Deployment Successful.');
             }
         }
         catch (error) {
@@ -298,7 +310,7 @@ function tryUndeploy(service, config, logger) {
                 logger.info('Undeployment in TestMode completed. A successful TestMode execution does not necessarily mean that your undeploy will be successful.');
             }
             else {
-                logger.info('Successfully undeployed.');
+                logger.info('Undeployment Successful.');
             }
         }
         catch (error) {

package/dist/cli/config.js

@@ -133,7 +133,7 @@ function getServiceKey(options, targetUrl) {
  * @returns merged target object
  */
 function mergeTarget(baseTarget, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const targetUrl = (_a = options.url) !== null && _a !== void 0 ? _a : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.url;
     return {
         url: targetUrl,
@@ -141,7 +141,8 @@ function mergeTarget(baseTarget, options) {
         cloud: options.cloud !== undefined ? options.cloud : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.cloud,
         destination: (_c = options.destination) !== null && _c !== void 0 ? _c : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.destination,
         serviceKey: getServiceKey(options, targetUrl),
-        params: options.queryParams ? parseQueryParams(options.queryParams) : undefined
+        params: options.queryParams ? parseQueryParams(options.queryParams) : undefined,
+        service: (_d = options.service) !== null && _d !== void 0 ? _d : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.service
     };
 }
 /**

package/dist/cli/index.js

@@ -34,7 +34,8 @@ function createCommand(name) {
         .addOption(new commander_1.Option('--destination  <destination>', 'Destination in SAP BTP pointing to an ABAP system').conflicts('url'))
         .addOption(new commander_1.Option('--url <target-url>', 'URL of target ABAP system').conflicts('destination'))
         .addOption(new commander_1.Option('--client <sap-client>', 'Client number of target ABAP system').conflicts('destination'))
-        .addOption(new commander_1.Option('--cloud', 'target is an ABAP Cloud system').conflicts('destination'))
+        .addOption(new commander_1.Option('--cloud', 'Target is an ABAP Cloud system').conflicts('destination'))
+        .addOption(new commander_1.Option('--service <service-path>', 'Target SAPUI5 Repository OData Service'))
         .addOption(new commander_1.Option('--cloud-service-key <file-location>', 'JSON file location with the ABAP cloud service key.').conflicts('destination'))
         .addOption(new commander_1.Option('--cloud-service-env', 'Read ABAP cloud service properties from environment variables or .env file').conflicts(['cloudServiceKey', 'destination']))
         .option('--transport <transport-request>', 'Transport number to record the change in the ABAP system')

package/dist/types/index.d.ts

@@ -4,6 +4,7 @@ export declare const NAME = "abap-deploy-task";
 export interface UrlAbapTarget {
     url: string;
     client?: string;
+    service?: string;
     cloud?: boolean;
     serviceKey?: ServiceInfo;
     params?: AxiosRequestConfig['params'];

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.3.4",
+  "version": "0.4.1",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",