@sap/cli-core 2023.22.0 → 2023.24.0

package/CHANGELOG.md

@@ -5,6 +5,46 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2023.24.0
+
+### Fixed
+
+- The defined HTTP protocol was not applied to calculated authorization URL and token URL. No matter which HTTP protocol (`http` or `https`) was used, the automatically calculated authorization URL and token URL always used the `https` protocol.
+
+### Added
+
+- HTTPS proxy support via environment variable `https_proxy`. When using an HTTPS proxy to communicate with the public internet, you can configure the environment variable `https_proxy`. The CLI uses the value from the environment variable to establish a correct connection to the HTTPS proxy.
+
+- Support for response header `x-sap-datasphere-cli-file-name`. When the user adds option `--output` and provides a path to a file location, this value is always used to store the response data, no matter whether response header `x-sap-datasphere-cli-file-name` is present. If the user adds option `--output` without providing a path to a file location and the response header `x-sap-datasphere-cli-file-name` is present, the response data is stored in the location mentioned in `x-sap-datasphere-cli-file-name`. In all other cases, the response data is printed to the console.
+
+## 2023.23.0
+
+### Fixed
+
+- Trailing single quotes (`'`) were removed from option values even though there was no leading single quote. This version contains a fix that trailing single quotes are only removed if there is a leading single quote.
+
+  Trailing single quote is not removed: `some 'value'` stays `some 'value'`.
+
+  Trailing single quote is removed: `'some value'` becomes `some value`.
+
+- The help output did not mention the correct CLI name. Instead the output showed the name 'terminal'.
+
+  ```javascript
+  Usage: terminal [options] [command]
+
+  Command-Line Interface for <product name>.
+  ...
+  ```
+
+  Since this version, the name is shown correctly.
+
+  ```javascript
+  Usage: <cli> [options] [command]
+
+  Command-Line Interface for <product name>.
+  ...
+  ```
+
 ## 2023.19.0
 
 ### Fixed

package/cache/secrets/SecretsStorageImpl.js

@@ -49,9 +49,10 @@ class SecretsStorageImpl {
     }
     async getDefaultSecretId() {
         const tenantUrl = (0, utils_2.getTenantUrl)();
-        const secret = this.secrets.find((s) => new URL(s.tenantUrl).host === new URL(tenantUrl).host);
+        const { host } = new URL(tenantUrl);
+        const secret = this.secrets.find((s) => new URL(s.tenantUrl).host === host);
         if (!secret) {
-            throw new Error("Method not implemented.");
+            throw new Error(`No secret found for host ${host}`);
         }
         return secret.id;
     }

package/commands/handler/fetch/utils.d.ts

@@ -8,7 +8,14 @@ export declare const buildParameters: (path: string, parameterMappings?: Paramet
     headers: KeyValuePair;
     body: any;
 };
-export declare const handleResponseData: (data: any) => Promise<void>;
+/**
+ * If --output is present: Return value of --output if defined, otherwise take value from outputPath.
+ * If --output is not present, print response to console
+ * @param outputPath Optional path defined by server
+ * @returns Path to output file
+ */
+export declare function getOutputFileName(outputPath?: string): string;
+export declare const handleResponseData: (data: any, outputPath?: string) => Promise<void>;
 export declare const handleResponse: (data: any, headers?: RawAxiosResponseHeaders | AxiosResponseHeaders) => Promise<void>;
 export declare const configRequiresBody: (method: HTTPMethod) => boolean;
 export declare const buildHttpConfig: (method: HTTPMethod, path: string, parameterMappings?: ParameterMappings) => HTTPConfig;

package/commands/handler/fetch/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildHttpConfig = exports.configRequiresBody = exports.handleResponse = exports.handleResponseData = exports.buildParameters = exports.removeLeadingPathSegmentForPasscode = exports.checkConfiguration = void 0;
+exports.buildHttpConfig = exports.configRequiresBody = exports.handleResponse = exports.handleResponseData = exports.getOutputFileName = exports.buildParameters = exports.removeLeadingPathSegmentForPasscode = exports.checkConfiguration = void 0;
 const url_1 = require("url");
 const lodash_1 = __importDefault(require("lodash"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -103,7 +103,22 @@ const buildParameters = (path, parameterMappings) => {
     };
 };
 exports.buildParameters = buildParameters;
-const handleResponseData = async (data) => {
+/**
+ * If --output is present: Return value of --output if defined, otherwise take value from outputPath.
+ * If --output is not present, print response to console
+ * @param outputPath Optional path defined by server
+ * @returns Path to output file
+ */
+function getOutputFileName(outputPath = "") {
+    const config = (0, config_1.get)();
+    if (typeof config.options[constants_1.OPTION_OUTPUT.longName] === "boolean" &&
+        config.options[constants_1.OPTION_OUTPUT.longName]) {
+        return outputPath;
+    }
+    return config.options[constants_1.OPTION_OUTPUT.longName];
+}
+exports.getOutputFileName = getOutputFileName;
+const handleResponseData = async (data, outputPath) => {
     const config = (0, config_1.get)();
     if (!config.doNotStoreResult) {
         ResultHandlerFactory_1.ResultHandlerFactory.get().setResult(data);
@@ -112,8 +127,9 @@ const handleResponseData = async (data) => {
     const formatted = config.options.pretty
         ? JSON.stringify(data, null, 2)
         : JSON.stringify(data);
-    if (config.options[constants_1.OPTION_OUTPUT.longName]) {
-        await fs_extra_1.default.writeFile(config.options[constants_1.OPTION_OUTPUT.longName], formatted);
+    const outputFileName = getOutputFileName(outputPath);
+    if (outputFileName) {
+        await fs_extra_1.default.writeFile(outputFileName, formatted);
     }
     else {
         output(formatted);
@@ -125,7 +141,7 @@ const handleResponse = async (data, headers) => {
         (0, config_1.set)({ [constants_1.X_CSRF_TOKEN]: headers[constants_1.X_CSRF_TOKEN] });
     }
     else if (data) {
-        await (0, exports.handleResponseData)(data);
+        await (0, exports.handleResponseData)(data, headers?.[constants_1.X_OUTPUT_FILE_NAME]);
     }
 };
 exports.handleResponse = handleResponse;

package/commands/handler/input/file.js

@@ -30,5 +30,5 @@ const readBodyFromFile = async () => async () => {
         throw err;
     }
 };
-const create = () => (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_INPUT), (0, options_1.create)(constants_1.OPTION_FILE_PATH, { readEnv: true, readFile: true, readOptions: true, readPipe: true }, true, true), readBodyFromFile);
+const create = () => (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_INPUT), (0, options_1.create)(constants_1.OPTION_FILE_PATH, { readEnv: true, readFile: true, readOptions: true }, true, true), readBodyFromFile);
 exports.create = create;

package/commands/handler/options/index.d.ts

@@ -1,6 +1,5 @@
 import { Handler, Option } from "../../../types";
-export declare const create: (options: Array<Option> | Option, { readPipe, readEnv, readFile, readOptions }?: {
-    readPipe: boolean;
+export declare const create: (options: Array<Option> | Option, { readEnv, readFile, readOptions }?: {
     readEnv: boolean;
     readFile: boolean;
     readOptions: boolean;

package/commands/handler/options/index.js

@@ -6,15 +6,13 @@ const utils_1 = require("./utils");
 const or_1 = require("../or");
 const next_1 = require("../next");
 const checkOptionsExistence_1 = require("../checkOptionsExistence");
-const pipe_1 = require("./pipe");
 const file_1 = require("./file");
 const option_1 = require("./option");
 const succeed_1 = require("../succeed");
 const fail_1 = require("../fail");
 const env_1 = require("./env");
 const createHandler = (use, option, handler) => (0, next_1.create)((0, checkOptionsExistence_1.create)(option), use ? handler : (0, succeed_1.create)());
-const create = (options, { readPipe, readEnv, readFile, readOptions } = {
-    readPipe: true,
+const create = (options, { readEnv, readFile, readOptions } = {
     readEnv: true,
     readFile: true,
     readOptions: true,
@@ -23,7 +21,7 @@ const create = (options, { readPipe, readEnv, readFile, readOptions } = {
     await (0, utils_1.checkOptions)(intOptions, command);
     return async () => {
         for (const option of intOptions) {
-            const handler = (0, or_1.create)((0, checkOptionsExistence_1.create)(option, false), (0, or_1.create)(createHandler(readPipe, option, (0, pipe_1.create)(option)), createHandler(readEnv, option, (0, env_1.create)(option)), createHandler(readFile, option, (0, file_1.create)(option)), createHandler(readOptions, option, (0, option_1.create)(option, promptAlways))), throwIfHandlersFailed
+            const handler = (0, or_1.create)((0, checkOptionsExistence_1.create)(option, false), (0, or_1.create)(createHandler(readEnv, option, (0, env_1.create)(option)), createHandler(readFile, option, (0, file_1.create)(option)), createHandler(readOptions, option, (0, option_1.create)(option, promptAlways))), throwIfHandlersFailed
                 ? (0, fail_1.create)()
                 : (0, succeed_1.create)());
             await (await handler(command))();

package/commands/handler/utils.js

@@ -4,6 +4,7 @@ exports.getTargetHost = exports.setTargetHost = exports.getAuthenticationMethod
 const logger_1 = require("../../logger");
 const config_1 = require("../../config");
 const constants_1 = require("../../constants");
+const REGEX_LEADING_TRAILING_SINGLE_QUOTE = /^'.*'$/;
 const getLogger = () => (0, logger_1.get)("commands.handler.utils");
 const getBooleanOption = (value) => !!value;
 exports.getBooleanOption = getBooleanOption;
@@ -17,7 +18,12 @@ const decodeURIComponentInt = (value) => {
         throw err;
     }
 };
-const replaceLeadingTrailingSingleQuotes = (value) => value.replace(/^'/, "").replace(/'$/, "");
+const replaceLeadingTrailingSingleQuotes = (value) => {
+    if (REGEX_LEADING_TRAILING_SINGLE_QUOTE.test(value)) {
+        return value.replace(/^'/, "").replace(/'$/, "");
+    }
+    return value;
+};
 const parseOption = (value) => {
     if (typeof value !== "string") {
         return value;

package/constants.d.ts

@@ -18,6 +18,7 @@ export declare const CLI_GENERIC_OPTIONS_HELP = "cli-generic-options-help";
 export declare const SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH: string[];
 export declare const DISCOVERY_METADATA_PATH = "discovery-metadata.json";
 export declare const X_CSRF_TOKEN = "x-csrf-token";
+export declare const X_OUTPUT_FILE_NAME = "x-sap-datasphere-cli-file-name";
 export declare const PATH_TO_SUCCESS_HTML: string;
 export declare const PATH_TO_ERROR_HTML: string;
 export declare const CACHE_SECRETS_FILE = "secrets.json";

package/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPTION_INPUT = exports.OPTION_FILE_PATH = exports.OPTION_OPTIONS_FILE = exports.CONFIG_PASSCODE_FUNCTION = exports.OPTION_PASSCODE = exports.OPTION_CODE = exports.OPTION_SECRETS_FILE = exports.OPTION_EXPIRES_IN = exports.OPTION_REFRESH_TOKEN = exports.OPTION_ACCESS_TOKEN = exports.OPTION_TOKEN_URL = exports.OPTION_AUTHORIZATION_URL = exports.OPTION_CLIENT_SECRET = exports.OPTION_CLIENT_ID = exports.OPTION_FORCE = exports.OPTION_VERBOSE = exports.OPTION_NO_PRETTY = exports.OPTION_OUTPUT = exports.OPTION_LOGIN_ID = exports.OPTION_HOST = exports.OPTION_HELP = exports.OPTION_VERSION = exports.CACHE_SECRETS_FILE = exports.PATH_TO_ERROR_HTML = exports.PATH_TO_SUCCESS_HTML = exports.X_CSRF_TOKEN = exports.DISCOVERY_METADATA_PATH = exports.SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = exports.CLI_GENERIC_OPTIONS_HELP = exports.CLI_SUPPORTED_AUTHENTICATION_METHODS = exports.CLI_DEPRECATION_MESSAGE = exports.CLI_DEPRECATED = exports.CLI_VERSION = exports.CLI_SAP_HELP = exports.CLI_DISCOVERY_PATH = exports.CLI_DESCRIPTION = exports.CLI_PACKAGE_NAME = exports.CLI_NAME = exports.AuthenticationMethod = exports.DISCOVERY_DOCUMENT_PREFIX = exports.VERSION = void 0;
+exports.OPTION_INPUT = exports.OPTION_FILE_PATH = exports.OPTION_OPTIONS_FILE = exports.CONFIG_PASSCODE_FUNCTION = exports.OPTION_PASSCODE = exports.OPTION_CODE = exports.OPTION_SECRETS_FILE = exports.OPTION_EXPIRES_IN = exports.OPTION_REFRESH_TOKEN = exports.OPTION_ACCESS_TOKEN = exports.OPTION_TOKEN_URL = exports.OPTION_AUTHORIZATION_URL = exports.OPTION_CLIENT_SECRET = exports.OPTION_CLIENT_ID = exports.OPTION_FORCE = exports.OPTION_VERBOSE = exports.OPTION_NO_PRETTY = exports.OPTION_OUTPUT = exports.OPTION_LOGIN_ID = exports.OPTION_HOST = exports.OPTION_HELP = exports.OPTION_VERSION = exports.CACHE_SECRETS_FILE = exports.PATH_TO_ERROR_HTML = exports.PATH_TO_SUCCESS_HTML = exports.X_OUTPUT_FILE_NAME = exports.X_CSRF_TOKEN = exports.DISCOVERY_METADATA_PATH = exports.SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = exports.CLI_GENERIC_OPTIONS_HELP = exports.CLI_SUPPORTED_AUTHENTICATION_METHODS = exports.CLI_DEPRECATION_MESSAGE = exports.CLI_DEPRECATED = exports.CLI_VERSION = exports.CLI_SAP_HELP = exports.CLI_DISCOVERY_PATH = exports.CLI_DESCRIPTION = exports.CLI_PACKAGE_NAME = exports.CLI_NAME = exports.AuthenticationMethod = exports.DISCOVERY_DOCUMENT_PREFIX = exports.VERSION = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils/utils");
 exports.VERSION = (0, utils_1.getVersion)();
@@ -26,6 +26,7 @@ exports.CLI_GENERIC_OPTIONS_HELP = "cli-generic-options-help";
 exports.SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = ["dwaas-core"];
 exports.DISCOVERY_METADATA_PATH = "discovery-metadata.json";
 exports.X_CSRF_TOKEN = "x-csrf-token";
+exports.X_OUTPUT_FILE_NAME = "x-sap-datasphere-cli-file-name";
 exports.PATH_TO_SUCCESS_HTML = path_1.default.join(__dirname, "assets", "success.html");
 exports.PATH_TO_ERROR_HTML = path_1.default.join(__dirname, "assets", "error.html");
 exports.CACHE_SECRETS_FILE = "secrets.json";
@@ -64,7 +65,7 @@ exports.OPTION_LOGIN_ID = {
 exports.OPTION_OUTPUT = {
     longName: "output",
     description: "specifies the file to store the output of the command",
-    args: [{ name: "output" }],
+    args: [{ name: "output", optional: true }],
     hidden: true,
 };
 exports.OPTION_NO_PRETTY = {

package/dwc/dwc.js

@@ -115,10 +115,11 @@ const init = async () => {
     await setTenant();
     await initCacheTolerant();
     await setupSecretsStorage();
+    const cliName = (0, config_1.get)()[constants_1.CLI_NAME];
     program = (0, commands_1.createCommand)();
+    program.name(cliName);
     program.version((0, core_1.getVersion)(), "-v, --version", "output the current version");
     program.description((0, config_1.get)()[constants_1.CLI_DESCRIPTION]);
-    const cliName = (0, config_1.get)()[constants_1.CLI_NAME];
     program.showHelpAfterError(`Make sure to always define the host using the --host option or by running ${cliName}` +
         ` config host set "<Server_URL>". Did you initialize the CLI by running ${cliName} config` +
         ` cache init --host "<Server_URL>"?` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cli-core",
-  "version": "2023.22.0",
+  "version": "2023.24.0",
   "description": "Command-Line Interface (CLI) Core Module",
   "license": "SEE LICENSE IN LICENSE",
   "author": "SAP SE",
@@ -18,12 +18,13 @@
   ],
   "dependencies": {
     "ajv": "8.12.0",
-    "axios": "1.5.0",
-    "commander": "11.0.0",
+    "axios": "1.5.1",
+    "commander": "11.1.0",
     "config": "3.3.9",
     "dotenv": "16.3.1",
     "fs-extra": "11.1.1",
     "https": "1.0.0",
+    "https-proxy-agent": "7.0.2",
     "lodash": "4.17.21",
     "open": "8.4.2",
     "path": "0.12.7",

package/utils/http/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetch = exports.DEFAULTS = void 0;
 const axios_1 = __importDefault(require("axios"));
+const https_proxy_agent_1 = require("https-proxy-agent");
 const config_1 = require("../../config");
 const logger_1 = require("../../logger");
 const constants_1 = require("../../constants");
@@ -13,10 +14,11 @@ const core_1 = require("../../config/core");
 exports.DEFAULTS = {
     maxBodyLength: -1,
     maxContentLength: -1,
-    maxRedirects: 0, // must be set to 0 because maxBodyLength: -1 won't work otherwise, see github.com/axios/axios/issues/4263
+    maxRedirects: 0, // must be set to 0 because maxBodyLength: -1 won't work otherwise, see github.com/axios/axios/issues/4263,
 };
 const HEADERS_ETAG = "x-sap-cli-core-discovery-etag";
 const getLogger = () => (0, logger_1.get)("http");
+const HTTPS_PROXY = process.env.https_proxy ?? process.env.HTTPS_PROXY;
 const setEtag = (headers) => {
     const { debug } = getLogger();
     if (headers?.[HEADERS_ETAG]) {
@@ -38,7 +40,16 @@ const fetch = async (config) => {
             output("%s %s", config.method.toUpperCase(), config.url);
         }
         debug("http config: %s", JSON.stringify(config));
+        const httpsAgent = HTTPS_PROXY ? new https_proxy_agent_1.HttpsProxyAgent(HTTPS_PROXY) : null;
+        if (httpsAgent && cnfg.verbose) {
+            output(`using https proxy agent for https proxy`);
+            debug(`using https proxy agent for https proxy ${HTTPS_PROXY}`);
+        }
+        else {
+            debug("no https proxy defined via environment variable https_proxy");
+        }
         const res = await (0, axios_1.default)({
+            httpsAgent,
             ...config,
             ...exports.DEFAULTS,
             headers: {

package/utils/utils.js

@@ -148,8 +148,8 @@ const getInfoFromTenant = (tenant, verbose, printOutput = true) => {
         host: `${protocol}//dwaas-core.sac${region}.cfapps.orca.net.sap`,
         publicfqdn: parsedTenant,
         passcodeUrl: `https://${hostname}.authentication.${region}.hana.ondemand.com/passcode`,
-        authorizationUrl: `https://${hostname}.authentication.${region}.hana.ondemand.com/oauth/authorize`,
-        tokenUrl: `https://${hostname}.authentication.${region}.hana.ondemand.com/oauth/token`,
+        authorizationUrl: `${protocol}//${hostname}.authentication.${region}.hana.ondemand.com/oauth/authorize`,
+        tokenUrl: `${protocol}//${hostname}.authentication.${region}.hana.ondemand.com/oauth/token`,
         tenantUrl: `${protocol}//${parsedTenant}`,
     };
 };

package/commands/handler/options/pipe.d.ts

@@ -1,2 +0,0 @@
-import { Handler, Option } from "../../../types";
-export declare const create: (option: Option) => Handler;

package/commands/handler/options/pipe.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
-const fs_extra_1 = require("fs-extra");
-const logger_1 = require("../../../logger");
-const utils_1 = require("./utils");
-const getLogger = () => (0, logger_1.get)("commands.handler.options.pipe");
-let data;
-const getDataFromPipe = () => {
-    if (data === undefined) {
-        try {
-            data = JSON.parse((0, fs_extra_1.readFileSync)(0, "utf-8"));
-        }
-        catch (err) {
-            const { error } = getLogger();
-            error("failed to read from pipe", err);
-            data = null;
-            return getDataFromPipe();
-        }
-    }
-    else if (data === null) {
-        throw new Error("no data received from pipe");
-    }
-    return data;
-};
-/* jscpd:ignore-start */
-const create = (option) => async () => async () => {
-    const { debug } = getLogger();
-    /* jscpd:ignore-end */
-    debug(`reading option ${option.longName} from pipe`);
-    const options = getDataFromPipe();
-    (0, utils_1.setOption)(option, options[option.longName]);
-};
-exports.create = create;