ibm-cloud-sdk-core 2.10.4 → 2.11.3

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [2.11.3](https://github.com/IBM/node-sdk-core/compare/v2.11.2...v2.11.3) (2021-06-14)
+
+
+### Bug Fixes
+
+* **build:** revert inadvertently-committed directories ([#147](https://github.com/IBM/node-sdk-core/issues/147)) ([1fb6295](https://github.com/IBM/node-sdk-core/commit/1fb62955e74e73c805b6221ca85e22517335f273))
+
+## [2.11.2](https://github.com/IBM/node-sdk-core/compare/v2.11.1...v2.11.2) (2021-06-10)
+
+
+### Bug Fixes
+
+* remove default limit on request body length ([#145](https://github.com/IBM/node-sdk-core/issues/145)) ([abf604a](https://github.com/IBM/node-sdk-core/commit/abf604a10483194d0e46e3a1d2e4c27c20331867))
+
+## [2.11.1](https://github.com/IBM/node-sdk-core/compare/v2.11.0...v2.11.1) (2021-06-07)
+
+
+### Bug Fixes
+
+* change constructServiceURL from method to function ([#141](https://github.com/IBM/node-sdk-core/issues/141)) ([cd2d28c](https://github.com/IBM/node-sdk-core/commit/cd2d28ce12b5189ab9de240d6b6d86aa77d33a73))
+
+# [2.11.0](https://github.com/IBM/node-sdk-core/compare/v2.10.4...v2.11.0) (2021-05-27)
+
+
+### Features
+
+* add `BaseService.constructServiceURL` method ([#138](https://github.com/IBM/node-sdk-core/issues/138)) ([0e73bde](https://github.com/IBM/node-sdk-core/commit/0e73bde12df3cfab0b9243d0064ef40d93c1072a))
+
 ## [2.10.4](https://github.com/IBM/node-sdk-core/compare/v2.10.3...v2.10.4) (2021-05-10)
 
 

package/auth/authenticators/authenticator.js

@@ -1,19 +1,5 @@
 "use strict";
-/**
- * Copyright 2019 IBM Corp. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* eslint-disable @typescript-eslint/no-unused-vars, class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Base Authenticator class for other Authenticators to extend. Not intended

package/auth/authenticators/no-auth-authenticator.d.ts

@@ -21,6 +21,5 @@ import { AuthenticateOptions } from './authenticator-interface';
  * useful during development and testing.
  */
 export declare class NoAuthAuthenticator extends Authenticator {
-    constructor();
     authenticate(requestOptions: AuthenticateOptions): Promise<void>;
 }

package/auth/authenticators/no-auth-authenticator.js

@@ -1,4 +1,19 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-unused-vars, class-methods-use-this */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Copyright 2019 IBM Corp. All Rights Reserved.
  *
@@ -14,20 +29,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
 var authenticator_1 = require("./authenticator");
 /**
  * NoAuthAuthenticator is a placeholder authenticator implementation which
@@ -37,7 +38,7 @@ var authenticator_1 = require("./authenticator");
 var NoAuthAuthenticator = /** @class */ (function (_super) {
     __extends(NoAuthAuthenticator, _super);
     function NoAuthAuthenticator() {
-        return _super.call(this) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     NoAuthAuthenticator.prototype.authenticate = function (requestOptions) {
         // immediately proceed to request. it will probably fail

package/auth/authenticators/token-request-based-authenticator.js

@@ -107,7 +107,6 @@ var TokenRequestBasedAuthenticator = /** @class */ (function (_super) {
         return this.tokenManager.getToken().then(function (token) {
             var authHeader = { Authorization: "Bearer " + token };
             requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
-            return;
         });
     };
     return TokenRequestBasedAuthenticator;

package/auth/token-managers/cp4d-token-manager.js

@@ -65,7 +65,7 @@ var Cp4dTokenManager = /** @class */ (function (_super) {
         var tokenApiPath = '/v1/authorize';
         // do not append the path if user already has
         if (_this.url && !_this.url.endsWith(tokenApiPath)) {
-            _this.url = _this.url + tokenApiPath;
+            _this.url += tokenApiPath;
         }
         _this.username = options.username;
         _this.password = options.password;
@@ -88,7 +88,7 @@ var Cp4dTokenManager = /** @class */ (function (_super) {
                 method: 'POST',
                 headers: extend(true, {}, this.headers, requiredHeaders),
                 rejectUnauthorized: !this.disableSslVerification,
-            }
+            },
         };
         return this.requestWrapperInstance.sendRequest(parameters);
     };

package/auth/token-managers/iam-token-manager.js

@@ -185,10 +185,10 @@ var IamTokenManager = /** @class */ (function (_super) {
                 form: {
                     grant_type: 'urn:ibm:params:oauth:grant-type:apikey',
                     apikey: this.apikey,
-                    response_type: 'cloud_iam'
+                    response_type: 'cloud_iam',
                 },
                 rejectUnauthorized: !this.disableSslVerification,
-            }
+            },
         };
         if (this.scope) {
             parameters.options.form[SCOPE] = this.scope;

package/auth/token-managers/jwt-token-manager.d.ts

@@ -1,19 +1,4 @@
-/**
- * Copyright 2019 IBM Corp. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { TokenManager, TokenManagerOptions } from "./token-manager";
+import { TokenManager, TokenManagerOptions } from './token-manager';
 /** Configuration options for JWT token retrieval. */
 export declare type JwtTokenManagerOptions = TokenManagerOptions;
 /**

package/auth/token-managers/jwt-token-manager.js

@@ -1,4 +1,30 @@
 "use strict";
+/* eslint-disable class-methods-use-this */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Copyright 2019 IBM Corp. All Rights Reserved.
  *
@@ -14,20 +40,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
 var jwt = require("jsonwebtoken");
 var logger_1 = require("../../lib/logger");
 var token_manager_1 = require("./token-manager");
@@ -103,9 +115,9 @@ var JwtTokenManager = /** @class */ (function (_super) {
             var fractionOfTtl = 0.8;
             var timeToLive = exp - iat;
             this.expireTime = exp;
-            this.refreshTime = exp - (timeToLive * (1.0 - fractionOfTtl));
+            this.refreshTime = exp - timeToLive * (1.0 - fractionOfTtl);
         }
-        this.tokenInfo = Object.assign({}, responseBody);
+        this.tokenInfo = __assign({}, responseBody);
     };
     return JwtTokenManager;
 }(token_manager_1.TokenManager));

package/auth/token-managers/token-manager.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 /**
  * Copyright 2020 IBM Corp. All Rights Reserved.
  *
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/// <reference types="node" />
 import { OutgoingHttpHeaders } from 'http';
 import { RequestWrapper } from '../../lib/request-wrapper';
 /** Configuration options for token retrieval. */

package/auth/token-managers/token-manager.js

@@ -1,19 +1,5 @@
 "use strict";
-/**
- * Copyright 2020 IBM Corp. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* eslint-disable @typescript-eslint/no-unused-vars, class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
 var helper_1 = require("../../lib/helper");
 var logger_1 = require("../../lib/logger");
@@ -61,20 +47,16 @@ var TokenManager = /** @class */ (function () {
         var _this = this;
         if (!this.accessToken || this.isTokenExpired()) {
             // 1. request a new token
-            return this.pacedRequestToken().then(function () {
-                return _this.accessToken;
-            });
+            return this.pacedRequestToken().then(function () { return _this.accessToken; });
         }
-        else {
-            // If refresh needed, kick one off
-            if (this.tokenNeedsRefresh()) {
-                this.requestToken().then(function (tokenResponse) {
-                    _this.saveTokenInfo(tokenResponse);
-                });
-            }
-            // 2. use valid, managed token
-            return Promise.resolve(this.accessToken);
+        // If refresh needed, kick one off
+        if (this.tokenNeedsRefresh()) {
+            this.requestToken().then(function (tokenResponse) {
+                _this.saveTokenInfo(tokenResponse);
+            });
         }
+        // 2. use valid, managed token
+        return Promise.resolve(this.accessToken);
     };
     /**
      * Setter for the disableSslVerification property.
@@ -115,30 +97,30 @@ var TokenManager = /** @class */ (function () {
     TokenManager.prototype.pacedRequestToken = function () {
         var _this = this;
         var currentTime = utils_1.getCurrentTime();
-        if (this.requestTime > (currentTime - 60)) {
+        if (this.requestTime > currentTime - 60) {
             // token request is active -- queue the promise for this request
             return new Promise(function (resolve, reject) {
                 _this.pendingRequests.push({ resolve: resolve, reject: reject });
             });
         }
-        else {
-            this.requestTime = currentTime;
-            return this.requestToken().then(function (tokenResponse) {
-                _this.saveTokenInfo(tokenResponse);
-                _this.pendingRequests.forEach(function (_a) {
-                    var resolve = _a.resolve;
-                    resolve();
-                });
-                _this.pendingRequests = [];
-                _this.requestTime = 0;
-            }).catch(function (err) {
-                _this.pendingRequests.forEach(function (_a) {
-                    var reject = _a.reject;
-                    reject(err);
-                });
-                throw (err);
+        this.requestTime = currentTime;
+        return this.requestToken()
+            .then(function (tokenResponse) {
+            _this.saveTokenInfo(tokenResponse);
+            _this.pendingRequests.forEach(function (_a) {
+                var resolve = _a.resolve;
+                resolve();
             });
-        }
+            _this.pendingRequests = [];
+            _this.requestTime = 0;
+        })
+            .catch(function (err) {
+            _this.pendingRequests.forEach(function (_a) {
+                var reject = _a.reject;
+                reject(err);
+            });
+            throw err;
+        });
     };
     /**
      * Request a token using an API endpoint.
@@ -163,7 +145,6 @@ var TokenManager = /** @class */ (function () {
      */
     TokenManager.prototype.saveTokenInfo = function (tokenResponse) {
         var errMsg = '`saveTokenInfo` MUST be overridden by a subclass of TokenManager.';
-        var err = new Error(errMsg);
         logger_1.default.error(errMsg);
     };
     /**

package/auth/utils/get-authenticator-from-environment.js

@@ -74,7 +74,7 @@ function getAuthenticatorFromEnvironment(serviceName) {
             authenticator = new authenticators_1.IamAuthenticator(credentials);
             break;
         default:
-            throw new Error('Invalid value for AUTH_TYPE: ' + authType);
+            throw new Error("Invalid value for AUTH_TYPE: " + authType);
     }
     return authenticator;
 }

package/auth/utils/helpers.js

@@ -31,7 +31,7 @@ exports.computeBasicAuthHeader = computeBasicAuthHeader;
 // returns true if the string has a curly bracket or quote as the first or last character
 // these are common user-issues that we should handle before they get a network error
 function badCharAtAnEnd(value) {
-    return value.startsWith('{') || value.startsWith('"') || value.endsWith('}') || value.endsWith('"');
+    return (value.startsWith('{') || value.startsWith('"') || value.endsWith('}') || value.endsWith('"'));
 }
 /**
  * Checks credentials for common user mistakes of copying {, }, or " characters from the documentation
@@ -48,12 +48,11 @@ function checkCredentials(obj, credsToCheck) {
         }
     });
     if (errorMessage.length) {
-        errorMessage += 'Revise these credentials - they should not start or end with curly brackets or quotes.';
+        errorMessage +=
+            'Revise these credentials - they should not start or end with curly brackets or quotes.';
         return new Error(errorMessage);
     }
-    else {
-        return null;
-    }
+    return null;
 }
 exports.checkCredentials = checkCredentials;
 /**

package/auth/utils/read-credentials-file.browser.js

@@ -5,4 +5,3 @@ function readCredentialsFile() {
     return {};
 }
 exports.readCredentialsFile = readCredentialsFile;
-;

package/auth/utils/read-credentials-file.js

@@ -18,7 +18,7 @@ function readCredentialsFile() {
     // it should be the path to the file
     // then look at the current working directory
     // then at the os-dependent home directory
-    var givenFilepath = process.env['IBM_CREDENTIALS_FILE'] || '';
+    var givenFilepath = process.env.IBM_CREDENTIALS_FILE || '';
     var workingDir = constructFilepath(process.cwd());
     var homeDir = constructFilepath(os.homedir());
     var filepathToUse;

package/auth/utils/read-external-sources.d.ts

@@ -1,18 +1,3 @@
-/**
- * Copyright 2019 IBM Corp. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * Read properties stored in external sources like Environment Variables,
  * the credentials file, VCAP services, etc. and return them as an

package/auth/utils/read-external-sources.js

@@ -1,4 +1,6 @@
 "use strict";
+/* eslint-disable no-restricted-syntax */
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Copyright 2019 IBM Corp. All Rights Reserved.
  *
@@ -14,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
 var camelcase = require("camelcase");
 var isEmpty = require("lodash.isempty");
 var logger_1 = require("../../lib/logger");
@@ -64,7 +65,7 @@ function getProperties(serviceName) {
  */
 function filterPropertiesByServiceName(envObj, serviceName) {
     var credentials = {};
-    var name = serviceName.toUpperCase().replace(/-/g, '_') + '_'; // append the underscore that must follow the service name
+    var name = serviceName.toUpperCase().replace(/-/g, '_') + "_"; // append the underscore that must follow the service name
     // filter out properties that don't begin with the service name
     Object.keys(envObj).forEach(function (key) {
         if (key.startsWith(name)) {
@@ -101,14 +102,12 @@ function getVCAPCredentialsForService(name) {
             var serviceName = _a[_i];
             for (var _b = 0, _c = services[serviceName]; _b < _c.length; _b++) {
                 var instance = _c[_b];
-                if (instance['name'] === name) {
-                    if (instance.hasOwnProperty('credentials')) {
+                if (instance.name === name) {
+                    if (Object.prototype.hasOwnProperty.call(instance, 'credentials')) {
                         return instance.credentials;
                     }
-                    else {
-                        logger_1.default.debug('no data read from VCAP_SERVICES');
-                        return {};
-                    }
+                    logger_1.default.debug('no data read from VCAP_SERVICES');
+                    return {};
                 }
             }
         }
@@ -116,19 +115,14 @@ function getVCAPCredentialsForService(name) {
             var serviceName = _e[_d];
             if (serviceName === name) {
                 if (services[serviceName].length > 0) {
-                    if (services[serviceName][0].hasOwnProperty('credentials')) {
+                    if (Object.prototype.hasOwnProperty.call(services[serviceName][0], 'credentials')) {
                         return services[serviceName][0].credentials;
                     }
-                    else {
-                        logger_1.default.debug('no data read from VCAP_SERVICES');
-                        return {};
-                    }
-                    return services[serviceName][0].credentials || {};
-                }
-                else {
                     logger_1.default.debug('no data read from VCAP_SERVICES');
                     return {};
                 }
+                logger_1.default.debug('no data read from VCAP_SERVICES');
+                return {};
             }
         }
     }

package/index.d.ts

@@ -16,11 +16,11 @@
 /**
  * @module ibm-cloud-sdk-core
  */
+import * as unitTestUtils from './lib/sdk-test-helpers';
 export { BaseService, UserOptions } from './lib/base-service';
 export * from './auth';
 export * from './lib/helper';
 export { default as qs } from './lib/querystring';
 export { default as contentType } from './lib/content-type';
 export * from './lib/stream-to-promise';
-import * as unitTestUtils from './lib/sdk-test-helpers';
 export { unitTestUtils };

package/index.js

@@ -21,6 +21,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @module ibm-cloud-sdk-core
  */
+var unitTestUtils = require("./lib/sdk-test-helpers");
+exports.unitTestUtils = unitTestUtils;
 var base_service_1 = require("./lib/base-service");
 exports.BaseService = base_service_1.BaseService;
 __export(require("./auth"));
@@ -30,5 +32,3 @@ exports.qs = querystring_1.default;
 var content_type_1 = require("./lib/content-type");
 exports.contentType = content_type_1.default;
 __export(require("./lib/stream-to-promise"));
-var unitTestUtils = require("./lib/sdk-test-helpers");
-exports.unitTestUtils = unitTestUtils;

package/lib/base-service.js

@@ -14,6 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var auth_1 = require("../auth");
 var helper_1 = require("./helper");
@@ -45,14 +56,14 @@ var BaseService = /** @class */ (function () {
             logger_1.default.error("Error creating an instance of BaseService: " + err);
             throw new Error(err);
         }
-        var _options = {};
-        var options = Object.assign({}, userOptions);
+        var baseServiceOptions = {};
+        var options = __assign({}, userOptions);
         // for compatibility
         if (options.url && !options.serviceUrl) {
             options.serviceUrl = options.url;
         }
         if (options.serviceUrl) {
-            _options.serviceUrl = helper_1.stripTrailingSlash(options.serviceUrl);
+            baseServiceOptions.serviceUrl = helper_1.stripTrailingSlash(options.serviceUrl);
         }
         // check serviceUrl for common user errors
         var credentialProblems = auth_1.checkCredentials(options, ['serviceUrl']);
@@ -66,7 +77,7 @@ var BaseService = /** @class */ (function () {
             options.disableSslVerification = false;
         }
         var serviceClass = this.constructor;
-        this.baseOptions = Object.assign({ qs: {}, serviceUrl: serviceClass.DEFAULT_SERVICE_URL }, options, _options);
+        this.baseOptions = __assign(__assign({ qs: {}, serviceUrl: serviceClass.DEFAULT_SERVICE_URL }, options), baseServiceOptions);
         this.requestWrapperInstance = new request_wrapper_1.RequestWrapper(this.baseOptions);
         // enforce that an authenticator is set
         if (!options.authenticator) {
@@ -151,6 +162,7 @@ var BaseService = /** @class */ (function () {
             return _this.requestWrapperInstance.sendRequest(parameters);
         });
     };
+    // eslint-disable-next-line class-methods-use-this
     BaseService.prototype.readOptionsFromExternalConfig = function (serviceName) {
         var results = {};
         var properties = auth_1.readExternalSources(serviceName);

package/lib/content-type.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { FileObject } from '../lib/helper';
+import { FileObject } from "./helper";
 declare const _default: {
     fromFilename: (file: String | File | Buffer | NodeJS.ReadableStream | FileObject) => string;
     fromHeader: (buffer: Buffer) => string;

package/lib/content-type.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable prettier/prettier */
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = require("path");
 // This module attempts to identify common content-types based on the filename or header
@@ -46,7 +47,9 @@ var fromHeader = function (buffer) {
  * @return {String|undefined}
  */
 var fromFilename = function (file) {
-    var ext = path_1.extname((typeof file === 'string' && file) || file['name'] || '');
+    var ext = path_1.extname(
+    // eslint-disable-next-line @typescript-eslint/dot-notation
+    (typeof file === 'string' && file) || file['name'] || '');
     return filenameContentTypes[ext];
 };
 exports.default = {

package/lib/helper.d.ts

@@ -96,3 +96,15 @@ export declare function buildRequestFileObject(fileParam: FileWithMetadata): Fil
  * @returns {Object}
  */
 export declare function toLowerKeys(obj: Object): Object;
+/**
+ * Constructs a service URL by formatting a parameterized URL.
+ *
+ * @param {string} parameterizedUrl URL that contains variable placeholders, e.g. '{scheme}://ibm.com'.
+ * @param {Map<string, string>} defaultUrlVariables Map from variable names to default values.
+ *  Each variable in the parameterized URL must have a default value specified in this map.
+ * @param {Map<string, string>} providedUrlVariables Map from variable names to desired values.
+ *  If a variable is not provided in this map,
+ *  the default variable value will be used instead.
+ * @returns {string} The formatted URL with all variable placeholders replaced by values.
+ */
+export declare function constructServiceUrl(parameterizedUrl: string, defaultUrlVariables: Map<string, string>, providedUrlVariables: Map<string, string> | null): string;

package/lib/helper.js

@@ -113,7 +113,7 @@ function getMissingParams(params, requires) {
         });
     }
     return missing.length > 0
-        ? new Error('Missing required parameters: ' + missing.join(', '))
+        ? new Error("Missing required parameters: " + missing.join(', '))
         : null;
 }
 exports.getMissingParams = getMissingParams;
@@ -149,12 +149,9 @@ function getFormat(params, formats) {
         logger_1.default.debug("No formats to parse in getFormat. Returning null");
         return null;
     }
-    for (var _i = 0, formats_1 = formats; _i < formats_1.length; _i++) {
-        var item = formats_1[_i];
-        if (item in params) {
-            return item;
-        }
-    }
+    var validFormats = formats.filter(function (item) { return item in params; });
+    if (validFormats.length)
+        return validFormats[0];
     logger_1.default.debug("No formats to parse in getFormat. Returning null");
     return null;
 }
@@ -185,7 +182,7 @@ function buildRequestFileObject(fileParam) {
             options: {
                 filename: fileParam.filename,
                 contentType: fileParam.contentType,
-            }
+            },
         };
     }
     // Also for backward compatibility, we allow data to be a string
@@ -193,6 +190,7 @@ function buildRequestFileObject(fileParam) {
         fileObj.value = Buffer.from(fileObj.value);
     }
     // build filename
+    // eslint-disable-next-line prefer-destructuring
     var filename = fileObj.options.filename;
     if (!filename && isFileStream(fileObj.value)) {
         // if readable stream with path property
@@ -214,15 +212,49 @@ exports.buildRequestFileObject = buildRequestFileObject;
  * @returns {Object}
  */
 function toLowerKeys(obj) {
-    var _obj = {};
+    var lowerCaseObj = {};
     if (obj) {
-        _obj = Object.assign.apply(Object, __spreadArrays([{}], Object.keys(obj).map(function (key) {
+        lowerCaseObj = Object.assign.apply(Object, __spreadArrays([{}], Object.keys(obj).map(function (key) {
             var _a;
             return (_a = {},
                 _a[key.toLowerCase()] = obj[key],
                 _a);
         })));
     }
-    return _obj;
+    return lowerCaseObj;
 }
 exports.toLowerKeys = toLowerKeys;
+/**
+ * Constructs a service URL by formatting a parameterized URL.
+ *
+ * @param {string} parameterizedUrl URL that contains variable placeholders, e.g. '{scheme}://ibm.com'.
+ * @param {Map<string, string>} defaultUrlVariables Map from variable names to default values.
+ *  Each variable in the parameterized URL must have a default value specified in this map.
+ * @param {Map<string, string>} providedUrlVariables Map from variable names to desired values.
+ *  If a variable is not provided in this map,
+ *  the default variable value will be used instead.
+ * @returns {string} The formatted URL with all variable placeholders replaced by values.
+ */
+function constructServiceUrl(parameterizedUrl, defaultUrlVariables, providedUrlVariables) {
+    // If null was passed, we set the variables to an empty map.
+    // This results in all default variable values being used.
+    if (providedUrlVariables === null) {
+        providedUrlVariables = new Map();
+    }
+    // Verify the provided variable names.
+    providedUrlVariables.forEach(function (_, name) {
+        if (!defaultUrlVariables.has(name)) {
+            throw new Error("'" + name + "' is an invalid variable name.\n      Valid variable names: [" + Array.from(defaultUrlVariables.keys()).sort() + "].");
+        }
+    });
+    // Format the URL with provided or default variable values.
+    var formattedUrl = parameterizedUrl;
+    defaultUrlVariables.forEach(function (defaultValue, name) {
+        // Use the default variable value if none was provided.
+        var providedValue = providedUrlVariables.get(name);
+        var formatValue = providedValue !== undefined ? providedValue : defaultValue;
+        formattedUrl = formattedUrl.replace("{" + name + "}", formatValue);
+    });
+    return formattedUrl;
+}
+exports.constructServiceUrl = constructServiceUrl;

package/lib/logger.js

@@ -28,5 +28,5 @@ exports.default = {
     error: error,
     info: info,
     verbose: verbose,
-    warn: warn
+    warn: warn,
 };

package/lib/querystring.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable prettier/prettier, arrow-body-style */
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Stringify query params, Watson-style
@@ -13,11 +14,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var stringify = function (queryParams) {
     return Object.keys(queryParams)
         .map(function (key) {
-        return (key +
-            '=' +
-            (key === 'watson-token'
-                ? queryParams[key]
-                : encodeURIComponent(queryParams[key]))); // the server chokes if the token is correctly url-encoded
+        return (key + "=" + (key === 'watson-token'
+            ? queryParams[key]
+            : encodeURIComponent(queryParams[key]))); // the server chokes if the token is correctly url-encoded
     })
         .join('&');
 };

package/lib/request-wrapper.d.ts

@@ -1,18 +1,3 @@
-/**
- * Copyright 2014 IBM Corp. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 export declare class RequestWrapper {
     private axiosInstance;
     private compressRequestData;

package/lib/request-wrapper.js

@@ -1,19 +1,16 @@
 "use strict";
-/**
- * Copyright 2014 IBM Corp. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* eslint-disable class-methods-use-this */
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -51,6 +48,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Copyright 2014 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var axios_1 = require("axios");
 var axios_cookiejar_support_1 = require("axios-cookiejar-support");
 var extend = require("extend");
@@ -62,8 +74,6 @@ var zlib = require("zlib");
 var helper_1 = require("./helper");
 var logger_1 = require("./logger");
 var stream_to_promise_1 = require("./stream-to-promise");
-var isBrowser = typeof window === 'object';
-var globalTransactionId = 'x-global-transaction-id';
 var RequestWrapper = /** @class */ (function () {
     function RequestWrapper(axiosOptions) {
         axiosOptions = axiosOptions || {};
@@ -74,17 +84,18 @@ var RequestWrapper = /** @class */ (function () {
         // defaults here
         var axiosConfig = {
             maxContentLength: Infinity,
+            maxBodyLength: Infinity,
             headers: {
                 post: {
-                    'Content-Type': 'application/json'
+                    'Content-Type': 'application/json',
                 },
                 put: {
-                    'Content-Type': 'application/json'
+                    'Content-Type': 'application/json',
                 },
                 patch: {
-                    'Content-Type': 'application/json'
+                    'Content-Type': 'application/json',
                 },
-            }
+            },
         };
         // merge axios config into default
         extend(true, axiosConfig, axiosOptions);
@@ -180,9 +191,12 @@ var RequestWrapper = /** @class */ (function () {
                             Object.keys(formData).forEach(function (key) {
                                 var values = Array.isArray(formData[key]) ? formData[key] : [formData[key]];
                                 // Skip keys with undefined/null values or empty object value
-                                values.filter(function (v) { return v != null && !helper_1.isEmptyObject(v); }).forEach(function (value) {
+                                values
+                                    .filter(function (v) { return v != null && !helper_1.isEmptyObject(v); })
+                                    .forEach(function (value) {
                                     // Special case of empty file object
-                                    if (value.hasOwnProperty('contentType') && !value.hasOwnProperty('data')) {
+                                    if (Object.prototype.hasOwnProperty.call(value, 'contentType') &&
+                                        !Object.prototype.hasOwnProperty.call(value, 'data')) {
                                         return;
                                     }
                                     if (helper_1.isFileWithMetadata(value)) {
@@ -201,10 +215,14 @@ var RequestWrapper = /** @class */ (function () {
                         // Path params
                         url = parsePath(url, path);
                         // Headers
-                        options.headers = Object.assign({}, options.headers);
+                        options.headers = __assign({}, options.headers);
                         // Convert array-valued query params to strings
                         if (qs && Object.keys(qs).length > 0) {
-                            Object.keys(qs).forEach(function (key) { return Array.isArray(qs[key]) && (qs[key] = qs[key].join(',')); });
+                            Object.keys(qs).forEach(function (key) {
+                                if (Array.isArray(qs[key])) {
+                                    qs[key] = qs[key].join(',');
+                                }
+                            });
                         }
                         // Add service default endpoint if options.url start with /
                         if (url && url.charAt(0) === '/') {
@@ -236,16 +254,13 @@ var RequestWrapper = /** @class */ (function () {
                             params: qs,
                             data: data,
                             responseType: options.responseType || 'json',
-                            paramsSerializer: function (params) {
-                                return querystring.stringify(params);
-                            },
+                            paramsSerializer: function (params) { return querystring.stringify(params); },
                         };
                         return [2 /*return*/, this.axiosInstance(requestParams).then(function (res) {
                                 // sometimes error responses will still trigger the `then` block - escape that behavior here
                                 if (!res) {
-                                    return;
+                                    return undefined;
                                 }
-                                ;
                                 // these objects contain circular json structures and are not always relevant to the user
                                 // if the user wants them, they can be accessed through the debug properties
                                 delete res.config;
@@ -316,8 +331,9 @@ var RequestWrapper = /** @class */ (function () {
             error.body = 'Response not received - no connection was made to the service.';
             // when a request to a private cloud instance has an ssl problem, it never connects and follows this branch of the error handling
             if (isSelfSignedCertificateError(axiosError)) {
-                error.message = "The connection failed because the SSL certificate is not valid. " +
-                    "To use a self-signed certificate, set the `disableSslVerification` parameter in the constructor options.";
+                error.message =
+                    "The connection failed because the SSL certificate is not valid. " +
+                        "To use a self-signed certificate, set the `disableSslVerification` parameter in the constructor options.";
             }
         }
         else {
@@ -332,8 +348,7 @@ var RequestWrapper = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        contentSetToGzip = headers['Content-Encoding'] &&
-                            headers['Content-Encoding'].toString().includes('gzip');
+                        contentSetToGzip = headers['Content-Encoding'] && headers['Content-Encoding'].toString().includes('gzip');
                         if (!data || contentSetToGzip) {
                             return [2 /*return*/, data];
                         }
@@ -407,9 +422,7 @@ function isAuthenticationError(error) {
     var code = error.status || null;
     var body = error.data || {};
     // handle specific error from iam service, should be relevant across platforms
-    var isIamServiceError = body.context &&
-        body.context.url &&
-        body.context.url.indexOf('iam') > -1;
+    var isIamServiceError = body.context && body.context.url && body.context.url.indexOf('iam') > -1;
     if (code === 401 || code === 403 || isIamServiceError) {
         isAuthErr = true;
     }
@@ -452,7 +465,9 @@ function hasStringProperty(obj, property) {
  */
 function parseServiceErrorMessage(response) {
     var message;
-    if (Array.isArray(response.errors) && response.errors.length > 0 && hasStringProperty(response.errors[0], 'message')) {
+    if (Array.isArray(response.errors) &&
+        response.errors.length > 0 &&
+        hasStringProperty(response.errors[0], 'message')) {
         message = response.errors[0].message;
     }
     else if (hasStringProperty(response, 'error')) {

package/lib/sdk-test-helpers.browser.js

@@ -1,33 +1,16 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
 // Dummy for browser
-function checkUrlAndMethod(options, url, method) {
-    return;
-}
+function checkUrlAndMethod(options, url, method) { }
 exports.checkUrlAndMethod = checkUrlAndMethod;
-;
-function checkMediaHeaders(createRequestMock, accept, contentType) {
-    return;
-}
+function checkMediaHeaders(createRequestMock, accept, contentType) { }
 exports.checkMediaHeaders = checkMediaHeaders;
-;
-function checkUserHeader(createRequestMock, userHeaderName, userHeaderValue) {
-    return;
-}
+function checkUserHeader(createRequestMock, userHeaderName, userHeaderValue) { }
 exports.checkUserHeader = checkUserHeader;
-;
-function checkForSuccessfulExecution(createRequestMock) {
-    return;
-}
+function checkForSuccessfulExecution(createRequestMock) { }
 exports.checkForSuccessfulExecution = checkForSuccessfulExecution;
-;
-function getOptions(createRequestMock) {
-    return;
-}
+function getOptions(createRequestMock) { }
 exports.getOptions = getOptions;
-;
-function expectToBePromise(sdkPromise) {
-    return;
-}
+function expectToBePromise(sdkPromise) { }
 exports.expectToBePromise = expectToBePromise;
-;

package/lib/sdk-test-helpers.js

@@ -35,7 +35,6 @@ function checkUrlAndMethod(options, url, method) {
     expect(options.method).toEqual(method);
 }
 exports.checkUrlAndMethod = checkUrlAndMethod;
-;
 /**
  * Takes the mock object for the `createRequest` method, extracts the headers that were sent with the call,
  * and checks for the expected values for `Accept` and `Content-Type`. This to verify that the SDK sets
@@ -52,7 +51,6 @@ function checkMediaHeaders(createRequestMock, accept, contentType) {
     expect(headers['Content-Type']).toEqual(contentType);
 }
 exports.checkMediaHeaders = checkMediaHeaders;
-;
 /**
  * Takes the mock object for the `createRequest` method, extracts the headers that were sent with the call,
  * and checks for the expected value for a user-defined header. This is verify that the SDK accepts header
@@ -68,7 +66,6 @@ function checkUserHeader(createRequestMock, userHeaderName, userHeaderValue) {
     expect(headers[userHeaderName]).toEqual(userHeaderValue);
 }
 exports.checkUserHeader = checkUserHeader;
-;
 /**
  * This method simply ensures that the method executed without any issues by extracting
  * the argument from the mock object for the `createRequest` method and verifying that it is an object.
@@ -81,7 +78,6 @@ function checkForSuccessfulExecution(createRequestMock) {
     expect(typeof sdkParams).toEqual('object');
 }
 exports.checkForSuccessfulExecution = checkForSuccessfulExecution;
-;
 /**
  * This method extracts the `options` property from the object passed into `createRequest`. This property is
  * an object containing all of the SDK method-specific information (like `path` and `body`) used to build a request.
@@ -94,7 +90,6 @@ function getOptions(createRequestMock) {
     return createRequestMock.mock.calls[0][0].options;
 }
 exports.getOptions = getOptions;
-;
 /**
  * This method simply ensures that the SDK methods return Promises by checking for
  * the `then` function - common way to assess whether or not an object is a Promise.
@@ -106,4 +101,3 @@ function expectToBePromise(sdkPromise) {
     expect(typeof sdkPromise.then).toBe('function');
 }
 exports.expectToBePromise = expectToBePromise;
-;

package/lib/stream-to-promise.js

@@ -16,9 +16,7 @@ function streamToPromise(stream) {
             results.push(result);
         })
             .on('end', function () {
-            resolve(Buffer.isBuffer(results[0])
-                ? Buffer.concat(results).toString()
-                : results);
+            resolve(Buffer.isBuffer(results[0]) ? Buffer.concat(results).toString() : results);
         })
             .on('error', reject);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ibm-cloud-sdk-core",
-  "version": "2.10.4",
+  "version": "2.11.3",
   "description": "Core functionality to support SDKs generated with IBM's OpenAPI SDK Generator.",
   "main": "index",
   "repository": {
@@ -64,14 +64,11 @@
   },
   "scripts": {
     "commitmsg": "commitlint -E GIT_PARAMS",
-    "tslint:config": "tslint-config-prettier-check ./tslint.json",
-    "tslint:fix": "tslint --fix -p . -c tslint.json",
-    "tslint:check": "tslint -p . -c ./tslint.json",
     "eslint:config": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
     "eslint:fix": "eslint . --fix",
     "eslint:check": "eslint . --cache",
-    "lint": "npm run eslint:check && npm run tslint:check",
-    "lint:fix": "npm run eslint:fix && npm run tslint:fix",
+    "lint": "npm run eslint:check",
+    "lint:fix": "npm run eslint:fix",
     "jest": "jest",
     "test": "jest test/unit/",
     "test-travis": "jest --runInBand test/unit/",