ibm-cloud-sdk-core 5.4.14 → 5.4.16

package/auth/authenticators/basic-authenticator.js

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicAuthenticator = void 0;
-var extend_1 = __importDefault(require("extend"));
 var helpers_1 = require("../utils/helpers");
 var authenticator_1 = require("./authenticator");
 var logger_1 = __importDefault(require("../../lib/logger"));
@@ -79,7 +89,7 @@ var BasicAuthenticator = /** @class */ (function (_super) {
     BasicAuthenticator.prototype.authenticate = function (requestOptions) {
         var _this = this;
         return new Promise(function (resolve) {
-            requestOptions.headers = (0, extend_1.default)(true, {}, requestOptions.headers, _this.authHeader);
+            requestOptions.headers = __assign(__assign({}, requestOptions.headers), _this.authHeader);
             logger_1.default.debug("Authenticated outbound request (type=".concat(_this.authenticationType(), ")"));
             resolve();
         });

package/auth/authenticators/bearer-token-authenticator.js

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BearerTokenAuthenticator = void 0;
-var extend_1 = __importDefault(require("extend"));
 var helpers_1 = require("../utils/helpers");
 var authenticator_1 = require("./authenticator");
 var logger_1 = __importDefault(require("../../lib/logger"));
@@ -84,7 +94,7 @@ var BearerTokenAuthenticator = /** @class */ (function (_super) {
         var _this = this;
         return new Promise(function (resolve) {
             var authHeader = { Authorization: "Bearer ".concat(_this.bearerToken) };
-            requestOptions.headers = (0, extend_1.default)(true, {}, requestOptions.headers, authHeader);
+            requestOptions.headers = __assign(__assign({}, requestOptions.headers), authHeader);
             logger_1.default.debug("Authenticated outbound request (type=".concat(_this.authenticationType(), ")"));
             resolve();
         });

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

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenRequestBasedAuthenticatorImmutable = void 0;
-var extend_1 = __importDefault(require("extend"));
 var jwt_token_manager_1 = require("../token-managers/jwt-token-manager");
 var authenticator_1 = require("./authenticator");
 var logger_1 = __importDefault(require("../../lib/logger"));
@@ -82,7 +92,7 @@ var TokenRequestBasedAuthenticatorImmutable = /** @class */ (function (_super) {
         var _this = this;
         return this.tokenManager.getToken().then(function (token) {
             var authHeader = { Authorization: "Bearer ".concat(token) };
-            requestOptions.headers = (0, extend_1.default)(true, {}, requestOptions.headers, authHeader);
+            requestOptions.headers = __assign(__assign({}, requestOptions.headers), authHeader);
             logger_1.default.debug("Authenticated outbound request (type=".concat(_this.authenticationType(), ")"));
         });
     };

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

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cp4dTokenManager = void 0;
-var extend_1 = __importDefault(require("extend"));
 var helpers_1 = require("../utils/helpers");
 var build_user_agent_1 = require("../../lib/build-user-agent");
 var jwt_token_manager_1 = require("./jwt-token-manager");
@@ -96,7 +106,7 @@ var Cp4dTokenManager = /** @class */ (function (_super) {
                     api_key: this.apikey,
                 },
                 method: 'POST',
-                headers: (0, extend_1.default)(true, {}, this.headers, requiredHeaders),
+                headers: __assign(__assign({}, this.headers), requiredHeaders),
                 rejectUnauthorized: !this.disableSslVerification,
             },
         };

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

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IamRequestBasedTokenManager = void 0;
-var extend_1 = __importDefault(require("extend"));
 var logger_1 = __importDefault(require("../../lib/logger"));
 var helpers_1 = require("../utils/helpers");
 var jwt_token_manager_1 = require("./jwt-token-manager");
@@ -155,7 +165,7 @@ var IamRequestBasedTokenManager = /** @class */ (function (_super) {
             options: {
                 url: this.url + OPERATION_PATH,
                 method: 'POST',
-                headers: (0, extend_1.default)(true, {}, this.headers, requiredHeaders),
+                headers: __assign(__assign({}, this.headers), requiredHeaders),
                 form: this.formData,
                 rejectUnauthorized: !this.disableSslVerification,
             },

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

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McspTokenManager = void 0;
-var extend_1 = __importDefault(require("extend"));
 var helpers_1 = require("../utils/helpers");
 var build_user_agent_1 = require("../../lib/build-user-agent");
 var jwt_token_manager_1 = require("./jwt-token-manager");
@@ -87,7 +97,7 @@ var McspTokenManager = /** @class */ (function (_super) {
                     apikey: this.apikey,
                 },
                 method: 'POST',
-                headers: (0, extend_1.default)(true, {}, this.headers, requiredHeaders),
+                headers: __assign(__assign({}, this.headers), requiredHeaders),
                 rejectUnauthorized: !this.disableSslVerification,
             },
         };

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

@@ -29,12 +29,22 @@ var __extends = (this && this.__extends) || (function () {
         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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McspV2TokenManager = void 0;
-var extend_1 = __importDefault(require("extend"));
 var helpers_1 = require("../utils/helpers");
 var build_user_agent_1 = require("../../lib/build-user-agent");
 var jwt_token_manager_1 = require("./jwt-token-manager");
@@ -115,7 +125,7 @@ var McspV2TokenManager = /** @class */ (function (_super) {
             'Content-Type': 'application/json',
             'User-Agent': this.userAgent,
         };
-        var requestHeaders = (0, extend_1.default)(true, {}, this.headers, requiredHeaders);
+        var requestHeaders = __assign(__assign({}, this.headers), requiredHeaders);
         // The keys used here must match the path parameter references in PATH_TEMPLATE above.
         var pathParams = {
             scopeCollectionType: this.scopeCollectionType,

package/docs/ibm-cloud-sdk-core.api.json

@@ -3270,6 +3270,67 @@
           },
           "implementsTokenRanges": []
         },
+        {
+          "kind": "Function",
+          "canonicalReference": "ibm-cloud-sdk-core!deepMerge:function(1)",
+          "docComment": "",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export declare function deepMerge(target: "
+            },
+            {
+              "kind": "Content",
+              "text": "any"
+            },
+            {
+              "kind": "Content",
+              "text": ", source: "
+            },
+            {
+              "kind": "Content",
+              "text": "any"
+            },
+            {
+              "kind": "Content",
+              "text": "): "
+            },
+            {
+              "kind": "Content",
+              "text": "any"
+            },
+            {
+              "kind": "Content",
+              "text": ";"
+            }
+          ],
+          "fileUrlPath": "dist/es/lib/helper.d.ts",
+          "returnTypeTokenRange": {
+            "startIndex": 5,
+            "endIndex": 6
+          },
+          "releaseTag": "Public",
+          "overloadIndex": 1,
+          "parameters": [
+            {
+              "parameterName": "target",
+              "parameterTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              },
+              "isOptional": false
+            },
+            {
+              "parameterName": "source",
+              "parameterTypeTokenRange": {
+                "startIndex": 3,
+                "endIndex": 4
+              },
+              "isOptional": false
+            }
+          ],
+          "name": "deepMerge"
+        },
         {
           "kind": "Function",
           "canonicalReference": "ibm-cloud-sdk-core!fileExistsAtPath:function(1)",

package/es/auth/authenticators/basic-authenticator.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { computeBasicAuthHeader, validateInput } from '../utils/helpers';
 import { Authenticator } from './authenticator';
 import logger from '../../lib/logger';
@@ -55,7 +54,7 @@ export class BasicAuthenticator extends Authenticator {
      */
     authenticate(requestOptions) {
         return new Promise((resolve) => {
-            requestOptions.headers = extend(true, {}, requestOptions.headers, this.authHeader);
+            requestOptions.headers = Object.assign(Object.assign({}, requestOptions.headers), this.authHeader);
             logger.debug(`Authenticated outbound request (type=${this.authenticationType()})`);
             resolve();
         });

package/es/auth/authenticators/bearer-token-authenticator.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { validateInput } from '../utils/helpers';
 import { Authenticator } from './authenticator';
 import logger from '../../lib/logger';
@@ -60,7 +59,7 @@ export class BearerTokenAuthenticator extends Authenticator {
     authenticate(requestOptions) {
         return new Promise((resolve) => {
             const authHeader = { Authorization: `Bearer ${this.bearerToken}` };
-            requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
+            requestOptions.headers = Object.assign(Object.assign({}, requestOptions.headers), authHeader);
             logger.debug(`Authenticated outbound request (type=${this.authenticationType()})`);
             resolve();
         });

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { JwtTokenManager } from '../token-managers/jwt-token-manager';
 import { Authenticator } from './authenticator';
 import logger from '../../lib/logger';
@@ -58,7 +57,7 @@ export class TokenRequestBasedAuthenticatorImmutable extends Authenticator {
     authenticate(requestOptions) {
         return this.tokenManager.getToken().then((token) => {
             const authHeader = { Authorization: `Bearer ${token}` };
-            requestOptions.headers = extend(true, {}, requestOptions.headers, authHeader);
+            requestOptions.headers = Object.assign(Object.assign({}, requestOptions.headers), authHeader);
             logger.debug(`Authenticated outbound request (type=${this.authenticationType()})`);
         });
     }

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { validateInput } from '../utils/helpers';
 import { buildUserAgent } from '../../lib/build-user-agent';
 import { JwtTokenManager } from './jwt-token-manager';
@@ -73,7 +72,7 @@ export class Cp4dTokenManager extends JwtTokenManager {
                     api_key: this.apikey,
                 },
                 method: 'POST',
-                headers: extend(true, {}, this.headers, requiredHeaders),
+                headers: Object.assign(Object.assign({}, this.headers), requiredHeaders),
                 rejectUnauthorized: !this.disableSslVerification,
             },
         };

package/es/auth/token-managers/iam-request-based-token-manager.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import logger from '../../lib/logger';
 import { computeBasicAuthHeader, getCurrentTime, onlyOne, removeSuffix } from '../utils/helpers';
 import { JwtTokenManager } from './jwt-token-manager';
@@ -131,7 +130,7 @@ export class IamRequestBasedTokenManager extends JwtTokenManager {
             options: {
                 url: this.url + OPERATION_PATH,
                 method: 'POST',
-                headers: extend(true, {}, this.headers, requiredHeaders),
+                headers: Object.assign(Object.assign({}, this.headers), requiredHeaders),
                 form: this.formData,
                 rejectUnauthorized: !this.disableSslVerification,
             },

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { validateInput } from '../utils/helpers';
 import { buildUserAgent } from '../../lib/build-user-agent';
 import { JwtTokenManager } from './jwt-token-manager';
@@ -64,7 +63,7 @@ export class McspTokenManager extends JwtTokenManager {
                     apikey: this.apikey,
                 },
                 method: 'POST',
-                headers: extend(true, {}, this.headers, requiredHeaders),
+                headers: Object.assign(Object.assign({}, this.headers), requiredHeaders),
                 rejectUnauthorized: !this.disableSslVerification,
             },
         };

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { validateInput } from '../utils/helpers';
 import { buildUserAgent } from '../../lib/build-user-agent';
 import { JwtTokenManager } from './jwt-token-manager';
@@ -92,7 +91,7 @@ export class McspV2TokenManager extends JwtTokenManager {
             'Content-Type': 'application/json',
             'User-Agent': this.userAgent,
         };
-        const requestHeaders = extend(true, {}, this.headers, requiredHeaders);
+        const requestHeaders = Object.assign(Object.assign({}, this.headers), requiredHeaders);
         // The keys used here must match the path parameter references in PATH_TEMPLATE above.
         const pathParams = {
             scopeCollectionType: this.scopeCollectionType,

package/es/lib/base-service.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import extend from 'extend';
 import { checkCredentials, readExternalSources } from '../auth';
 import { stripTrailingSlash } from './helper';
 import logger from './logger';
@@ -206,7 +205,7 @@ export class BaseService {
         const userAgent = {
             'User-Agent': this.defaultUserAgent,
         };
-        parameters.defaultOptions.headers = extend(true, {}, userAgent, parameters.defaultOptions.headers);
+        parameters.defaultOptions.headers = Object.assign(Object.assign({}, userAgent), parameters.defaultOptions.headers);
         return this.authenticator.authenticate(parameters.defaultOptions).then(() => 
         // resolve() handles rejection as well, so resolving the result of sendRequest should allow for proper handling later
         this.requestWrapperInstance.sendRequest(parameters));

package/es/lib/cookie-support.js

@@ -23,7 +23,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { isAxiosError } from 'axios';
-import extend from 'extend';
 import { CookieJar } from 'tough-cookie';
 import logger from './logger';
 const internalCreateCookieInterceptor = (cookieJar) => {
@@ -42,8 +41,7 @@ const internalCreateCookieInterceptor = (cookieJar) => {
                 const cookieHeaderValue = yield cookieJar.getCookieString(config.url);
                 if (cookieHeaderValue) {
                     logger.debug('CookieInterceptor: setting cookie header');
-                    const cookieHeader = { cookie: cookieHeaderValue };
-                    config.headers = extend(true, {}, config.headers, cookieHeader);
+                    config.headers.cookie = cookieHeaderValue;
                 }
                 else {
                     logger.debug(`CookieInterceptor: no cookies for: ${config.url}`);

package/es/lib/helper.d.ts

@@ -126,3 +126,4 @@ export declare function constructServiceUrl(parameterizedUrl: string, defaultUrl
  * @returns true if "mimeType" represents a JSON media type and false otherwise
  */
 export declare function isJsonMimeType(mimeType: string): boolean;
+export declare function deepMerge(target: any, source: any): any;

package/es/lib/helper.js

@@ -310,3 +310,16 @@ export function isJsonMimeType(mimeType) {
     logger.debug(`Determining if the mime type '${mimeType}' specifies JSON content.`);
     return !!mimeType && /^application\/json(\s*;.*)?$/i.test(mimeType);
 }
+const isObj = (val) => val && typeof val === 'object' && !Array.isArray(val);
+export function deepMerge(target, source) {
+    const result = Object.assign({}, target);
+    Object.keys(source).forEach((key) => {
+        if (isObj(target[key]) && isObj(source[key])) {
+            result[key] = deepMerge(target[key], source[key]);
+        }
+        else {
+            result[key] = source[key];
+        }
+    });
+    return result;
+}

package/es/lib/request-wrapper.js

@@ -25,13 +25,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  */
 import axios from 'axios';
 import * as rax from 'retry-axios';
-import extend from 'extend';
 import FormData from 'form-data';
 import { Agent } from 'https';
 import isStream from 'isstream';
 import { stringify } from 'querystring';
 import { gzipSync } from 'zlib';
-import { buildRequestFileObject, isEmptyObject, isFileData, isFileWithMetadata, isJsonMimeType, stripTrailingSlash, } from './helper';
+import { buildRequestFileObject, deepMerge, isEmptyObject, isFileData, isFileWithMetadata, isJsonMimeType, stripTrailingSlash, } from './helper';
 import { redactSecrets } from './private-helpers';
 import logger from './logger';
 import { streamToPromise } from './stream-to-promise';
@@ -39,15 +38,10 @@ import { createCookieInterceptor } from './cookie-support';
 import { chainError } from './chain-error';
 export class RequestWrapper {
     constructor(axiosOptions) {
-        axiosOptions = axiosOptions || {};
+        axiosOptions !== null && axiosOptions !== void 0 ? axiosOptions : (axiosOptions = {});
         this.compressRequestData = Boolean(axiosOptions.enableGzipCompression);
-        // override a couple axios defaults
-        const axiosConfig = {
-            maxContentLength: -1,
-            maxBodyLength: Infinity,
-        };
-        // merge axios config into default
-        extend(true, axiosConfig, axiosOptions);
+        // override a couple axios defaults then merge axios config into default
+        const axiosConfig = Object.assign({ maxContentLength: -1, maxBodyLength: Infinity }, axiosOptions);
         // if the user explicitly sets `disableSslVerification` to true,
         // `rejectUnauthorized` must be set to false in the https agent
         if (axiosOptions.disableSslVerification === true) {
@@ -196,7 +190,7 @@ export class RequestWrapper {
      */
     sendRequest(parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const options = extend(true, {}, parameters.defaultOptions, parameters.options);
+            const options = deepMerge(parameters.defaultOptions || {}, parameters.options || {});
             const { path, body, form, formData, qs, method, serviceUrl, axiosOptions } = options;
             let { headers, url } = options;
             const multipartForm = new FormData();
@@ -249,10 +243,10 @@ export class RequestWrapper {
             if (formData) {
                 data = multipartForm;
                 // form-data generates headers that MUST be included or the request will fail
-                headers = extend(true, {}, headers, multipartForm.getHeaders());
+                headers = Object.assign(Object.assign({}, headers), multipartForm.getHeaders());
             }
             // accept gzip encoded responses if Accept-Encoding is not already set
-            headers['Accept-Encoding'] = headers['Accept-Encoding'] || 'gzip';
+            headers['Accept-Encoding'] || (headers['Accept-Encoding'] = 'gzip');
             // compress request body data if enabled
             if (this.compressRequestData) {
                 data = yield this.gzipRequestBody(data, headers);

package/ibm-cloud-sdk-core.d.ts

@@ -591,6 +591,8 @@ export declare class Cp4dTokenManager extends JwtTokenManager {
     protected requestToken(): Promise<any>;
 }
 
+export declare function deepMerge(target: any, source: any): any;
+
 export declare function fileExistsAtPath(filepath: string): boolean;
 
 /**

package/lib/base-service.js

@@ -30,7 +30,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseService = void 0;
-var extend_1 = __importDefault(require("extend"));
 var auth_1 = require("../auth");
 var helper_1 = require("./helper");
 var logger_1 = __importDefault(require("./logger"));
@@ -224,7 +223,7 @@ var BaseService = /** @class */ (function () {
         var userAgent = {
             'User-Agent': this.defaultUserAgent,
         };
-        parameters.defaultOptions.headers = (0, extend_1.default)(true, {}, userAgent, parameters.defaultOptions.headers);
+        parameters.defaultOptions.headers = __assign(__assign({}, userAgent), parameters.defaultOptions.headers);
         return this.authenticator.authenticate(parameters.defaultOptions).then(function () {
             // resolve() handles rejection as well, so resolving the result of sendRequest should allow for proper handling later
             return _this.requestWrapperInstance.sendRequest(parameters);

package/lib/cookie-support.js

@@ -56,7 +56,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCookieInterceptor = void 0;
 var axios_1 = require("axios");
-var extend_1 = __importDefault(require("extend"));
 var tough_cookie_1 = require("tough-cookie");
 var logger_1 = __importDefault(require("./logger"));
 var internalCreateCookieInterceptor = function (cookieJar) {
@@ -69,7 +68,7 @@ var internalCreateCookieInterceptor = function (cookieJar) {
      */
     function requestInterceptor(config) {
         return __awaiter(this, void 0, void 0, function () {
-            var cookieHeaderValue, cookieHeader;
+            var cookieHeaderValue;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -81,8 +80,7 @@ var internalCreateCookieInterceptor = function (cookieJar) {
                         cookieHeaderValue = _a.sent();
                         if (cookieHeaderValue) {
                             logger_1.default.debug('CookieInterceptor: setting cookie header');
-                            cookieHeader = { cookie: cookieHeaderValue };
-                            config.headers = (0, extend_1.default)(true, {}, config.headers, cookieHeader);
+                            config.headers.cookie = cookieHeaderValue;
                         }
                         else {
                             logger_1.default.debug("CookieInterceptor: no cookies for: ".concat(config.url));

package/lib/helper.d.ts

@@ -126,3 +126,4 @@ export declare function constructServiceUrl(parameterizedUrl: string, defaultUrl
  * @returns true if "mimeType" represents a JSON media type and false otherwise
  */
 export declare function isJsonMimeType(mimeType: string): boolean;
+export declare function deepMerge(target: any, source: any): any;

package/lib/helper.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);
+};
 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) {
@@ -63,7 +74,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isJsonMimeType = exports.constructServiceUrl = exports.toLowerKeys = exports.buildRequestFileObject = exports.getFormat = exports.isHTML = exports.validateParams = exports.getMissingParams = exports.getQueryParam = exports.stripTrailingSlash = exports.getContentType = exports.isEmptyObject = exports.isFileData = exports.isFileWithMetadata = void 0;
+exports.deepMerge = exports.isJsonMimeType = exports.constructServiceUrl = exports.toLowerKeys = exports.buildRequestFileObject = exports.getFormat = exports.isHTML = exports.validateParams = exports.getMissingParams = exports.getQueryParam = exports.stripTrailingSlash = exports.getContentType = exports.isEmptyObject = exports.isFileData = exports.isFileWithMetadata = void 0;
 var isstream_1 = require("isstream");
 var mime_types_1 = require("mime-types");
 var path_1 = require("path");
@@ -383,3 +394,17 @@ function isJsonMimeType(mimeType) {
     return !!mimeType && /^application\/json(\s*;.*)?$/i.test(mimeType);
 }
 exports.isJsonMimeType = isJsonMimeType;
+var isObj = function (val) { return val && typeof val === 'object' && !Array.isArray(val); };
+function deepMerge(target, source) {
+    var result = __assign({}, target);
+    Object.keys(source).forEach(function (key) {
+        if (isObj(target[key]) && isObj(source[key])) {
+            result[key] = deepMerge(target[key], source[key]);
+        }
+        else {
+            result[key] = source[key];
+        }
+    });
+    return result;
+}
+exports.deepMerge = deepMerge;

package/lib/request-wrapper.js

@@ -92,7 +92,6 @@ exports.RequestWrapper = void 0;
  */
 var axios_1 = __importDefault(require("axios"));
 var rax = __importStar(require("retry-axios"));
-var extend_1 = __importDefault(require("extend"));
 var form_data_1 = __importDefault(require("form-data"));
 var https_1 = require("https");
 var isstream_1 = __importDefault(require("isstream"));
@@ -107,15 +106,10 @@ var chain_error_1 = require("./chain-error");
 var RequestWrapper = /** @class */ (function () {
     function RequestWrapper(axiosOptions) {
         var _this = this;
-        axiosOptions = axiosOptions || {};
+        axiosOptions !== null && axiosOptions !== void 0 ? axiosOptions : (axiosOptions = {});
         this.compressRequestData = Boolean(axiosOptions.enableGzipCompression);
-        // override a couple axios defaults
-        var axiosConfig = {
-            maxContentLength: -1,
-            maxBodyLength: Infinity,
-        };
-        // merge axios config into default
-        (0, extend_1.default)(true, axiosConfig, axiosOptions);
+        // override a couple axios defaults then merge axios config into default
+        var axiosConfig = __assign({ maxContentLength: -1, maxBodyLength: Infinity }, axiosOptions);
         // if the user explicitly sets `disableSslVerification` to true,
         // `rejectUnauthorized` must be set to false in the https agent
         if (axiosOptions.disableSslVerification === true) {
@@ -269,7 +263,7 @@ var RequestWrapper = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        options = (0, extend_1.default)(true, {}, parameters.defaultOptions, parameters.options);
+                        options = (0, helper_1.deepMerge)(parameters.defaultOptions || {}, parameters.options || {});
                         path = options.path, body = options.body, form = options.form, formData = options.formData, qs = options.qs, method = options.method, serviceUrl = options.serviceUrl, axiosOptions = options.axiosOptions;
                         headers = options.headers, url = options.url;
                         multipartForm = new form_data_1.default();
@@ -333,10 +327,10 @@ var RequestWrapper = /** @class */ (function () {
                         if (formData) {
                             data = multipartForm;
                             // form-data generates headers that MUST be included or the request will fail
-                            headers = (0, extend_1.default)(true, {}, headers, multipartForm.getHeaders());
+                            headers = __assign(__assign({}, headers), multipartForm.getHeaders());
                         }
                         // accept gzip encoded responses if Accept-Encoding is not already set
-                        headers['Accept-Encoding'] = headers['Accept-Encoding'] || 'gzip';
+                        headers['Accept-Encoding'] || (headers['Accept-Encoding'] = 'gzip');
                         if (!this.compressRequestData) return [3 /*break*/, 9];
                         return [4 /*yield*/, this.gzipRequestBody(data, headers)];
                     case 8:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ibm-cloud-sdk-core",
-    "version": "5.4.14",
+    "version": "5.4.16",
     "description": "Core functionality to support SDKs generated with IBM's OpenAPI SDK Generator.",
     "main": "./index.js",
     "typings": "./es/index.d.ts",
@@ -45,7 +45,6 @@
         "camelcase": "6.3.0",
         "debug": "4.3.4",
         "dotenv": "16.4.5",
-        "extend": "3.0.2",
         "file-type": "21.3.2",
         "form-data": "4.0.4",
         "isstream": "0.1.2",