@sap-ux/deploy-tooling 0.4.4 → 0.5.0

package/README.md

@@ -62,6 +62,8 @@ Options:
   --cloud                              target is an ABAP Cloud system
   --cloud-service-key <file-location>  JSON file location with the ABAP cloud service key.
   --cloud-service-env                  Load ABAP cloud service properties from either a .env file or your environment variables. Secrets in your .env should not be committed to source control.
+  --username                           ABAP Service username
+  --password                           ABAP Service password
   --transport <transport-request>      Transport number to record the change in the ABAP system
   --name <bsp-name>                    Project name of the app
   --strict-ssl                         Perform certificate validation (use --no-strict-ssl to deactivate it)
@@ -95,6 +97,8 @@ Options:
   --cloud                              target is an ABAP Cloud system
   --cloud-service-key <file-location>  JSON file location with the ABAP cloud service key.
   --cloud-service-env                  Load ABAP cloud service properties from either a .env file or your environment variables
+  --username                           ABAP Service username
+  --password                           ABAP Service password
   --transport <transport-request>      Transport number to record the change in the ABAP system
   --name <bsp-name>                    Project name of the app
   --strict-ssl                         Perform certificate validation (use --no-strict-ssl to deactivate it)

package/dist/base/prompt.d.ts

@@ -13,7 +13,7 @@ export declare function promptConfirmation(message: string): Promise<boolean>;
  * @param username - optional username that is to be offered as default
  * @returns credentials object with username/password
  */
-export declare function promptCredentials(username?: string): Promise<prompts.Answers<"password" | "username">>;
+export declare function promptCredentials(username?: string): Promise<prompts.Answers<"username" | "password">>;
 /**
  * Prompt for the location of the service keys.
  *

package/dist/cli/config.js

@@ -145,6 +145,22 @@ function mergeTarget(baseTarget, options) {
         service: (_d = options.service) !== null && _d !== void 0 ? _d : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.service
     };
 }
+/**
+ * Merge CLI and environment credentials.
+ *
+ * @param taskConfig - base configuration from the file
+ * @param options - CLI options
+ * @returns merged credentials
+ */
+function mergeCredentials(taskConfig, options) {
+    var _a, _b, _c, _d;
+    let credentials = taskConfig.credentials;
+    // Support CLI params and|or dotenv file
+    if (options.username || process.env.SERVICE_USERNAME) {
+        credentials = Object.assign(Object.assign({}, (credentials !== null && credentials !== void 0 ? credentials : {})), { username: (_b = (_a = options.username) !== null && _a !== void 0 ? _a : process.env.SERVICE_USERNAME) !== null && _b !== void 0 ? _b : '', password: (_d = (_c = options.password) !== null && _c !== void 0 ? _c : process.env.SERVICE_PASSWORD) !== null && _d !== void 0 ? _d : '' });
+    }
+    return credentials;
+}
 /**
  * Merge the configuration from the ui5*.yaml with CLI options.
  *
@@ -162,7 +178,7 @@ function mergeConfig(taskConfig, options) {
             transport: (_g = options.transport) !== null && _g !== void 0 ? _g : (_h = taskConfig.app) === null || _h === void 0 ? void 0 : _h.transport
         };
         const target = mergeTarget(taskConfig.target, options);
-        const config = { app, target, credentials: taskConfig.credentials };
+        const config = { app, target, credentials: mergeCredentials(taskConfig, options) };
         config.test = mergeFlag(options.test, taskConfig.test);
         config.safe = mergeFlag(options.safe, taskConfig.safe);
         config.keep = mergeFlag(options.keep, taskConfig.keep);

package/dist/cli/index.js

@@ -39,6 +39,16 @@ function createCommand(name) {
         .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')
+        .addOption(new commander_1.Option('--username <username>', 'ABAP System username').conflicts([
+        'cloudServiceKey',
+        'cloudServiceEnv',
+        'destination'
+    ]))
+        .addOption(new commander_1.Option('--password <password>', 'ABAP System password').conflicts([
+        'cloudServiceKey',
+        'cloudServiceEnv',
+        'destination'
+    ]))
         .option('--name <bsp-name>', 'Project name of the app')
         .option('--strict-ssl', 'Perform certificate validation (use --no-strict-ssl to deactivate it)')
         .option('--query-params <param1=value&param2=value>', 'Additional parameters that are to be added to calls to the target.')

package/dist/types/index.d.ts

@@ -64,5 +64,7 @@ export interface CliOptions extends Partial<BspConfig>, Partial<DestinationAbapT
     cloudServiceKey?: string;
     queryParams?: string;
     cloudServiceEnv?: boolean;
+    username?: string;
+    password?: string;
 }
 //# sourceMappingURL=index.d.ts.map

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.4.4",
+  "version": "0.5.0",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
     "dotenv": "16.0.0",
     "prompts": "2.4.2",
     "yazl": "2.5.1",
-    "@sap-ux/axios-extension": "1.3.6",
+    "@sap-ux/axios-extension": "1.4.0",
     "@sap-ux/btp-utils": "0.11.7",
     "@sap-ux/logger": "0.3.7",
     "@sap-ux/store": "0.3.12",