ibm-cloud-sdk-core 2.4.1 → 2.4.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.4.2](https://github.com/IBM/node-sdk-core/compare/v2.4.1...v2.4.2) (2020-07-22)
+
+
+### Bug Fixes
+
+* move test utilities to lib/ and rely directly on `expect` ([#101](https://github.com/IBM/node-sdk-core/issues/101)) ([57ca4c2](https://github.com/IBM/node-sdk-core/commit/57ca4c2edba31a39bae479a041b974ffd94f31a3))
+
 ## [2.4.1](https://github.com/IBM/node-sdk-core/compare/v2.4.0...v2.4.1) (2020-05-14)
 
 

package/auth/authenticators/authenticator.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Authenticator = void 0;
 /**
  * Base Authenticator class for other Authenticators to extend. Not intended
  * to be used as a stand-alone authenticator.

package/auth/authenticators/basic-authenticator.js

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasicAuthenticator = void 0;
 var extend = require("extend");
 var utils_1 = require("../utils");
 var authenticator_1 = require("./authenticator");

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BearerTokenAuthenticator = void 0;
 var extend = require("extend");
 var utils_1 = require("../utils");
 var authenticator_1 = require("./authenticator");

package/auth/authenticators/cloud-pak-for-data-authenticator.js

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudPakForDataAuthenticator = void 0;
 var token_managers_1 = require("../token-managers");
 var utils_1 = require("../utils");
 var token_request_based_authenticator_1 = require("./token-request-based-authenticator");

package/auth/authenticators/iam-authenticator.js

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IamAuthenticator = void 0;
 var token_managers_1 = require("../token-managers");
 var utils_1 = require("../utils");
 var token_request_based_authenticator_1 = require("./token-request-based-authenticator");

package/auth/authenticators/index.js

@@ -16,16 +16,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var authenticator_1 = require("./authenticator");
-exports.Authenticator = authenticator_1.Authenticator;
+Object.defineProperty(exports, "Authenticator", { enumerable: true, get: function () { return authenticator_1.Authenticator; } });
 var basic_authenticator_1 = require("./basic-authenticator");
-exports.BasicAuthenticator = basic_authenticator_1.BasicAuthenticator;
+Object.defineProperty(exports, "BasicAuthenticator", { enumerable: true, get: function () { return basic_authenticator_1.BasicAuthenticator; } });
 var bearer_token_authenticator_1 = require("./bearer-token-authenticator");
-exports.BearerTokenAuthenticator = bearer_token_authenticator_1.BearerTokenAuthenticator;
+Object.defineProperty(exports, "BearerTokenAuthenticator", { enumerable: true, get: function () { return bearer_token_authenticator_1.BearerTokenAuthenticator; } });
 var cloud_pak_for_data_authenticator_1 = require("./cloud-pak-for-data-authenticator");
-exports.CloudPakForDataAuthenticator = cloud_pak_for_data_authenticator_1.CloudPakForDataAuthenticator;
+Object.defineProperty(exports, "CloudPakForDataAuthenticator", { enumerable: true, get: function () { return cloud_pak_for_data_authenticator_1.CloudPakForDataAuthenticator; } });
 var iam_authenticator_1 = require("./iam-authenticator");
-exports.IamAuthenticator = iam_authenticator_1.IamAuthenticator;
+Object.defineProperty(exports, "IamAuthenticator", { enumerable: true, get: function () { return iam_authenticator_1.IamAuthenticator; } });
 var no_auth_authenticator_1 = require("./no-auth-authenticator");
-exports.NoAuthAuthenticator = no_auth_authenticator_1.NoAuthAuthenticator;
+Object.defineProperty(exports, "NoAuthAuthenticator", { enumerable: true, get: function () { return no_auth_authenticator_1.NoAuthAuthenticator; } });
 var token_request_based_authenticator_1 = require("./token-request-based-authenticator");
-exports.TokenRequestBasedAuthenticator = token_request_based_authenticator_1.TokenRequestBasedAuthenticator;
+Object.defineProperty(exports, "TokenRequestBasedAuthenticator", { enumerable: true, get: function () { return token_request_based_authenticator_1.TokenRequestBasedAuthenticator; } });

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoAuthAuthenticator = void 0;
 var authenticator_1 = require("./authenticator");
 /**
  * NoAuthAuthenticator is a placeholder authenticator implementation which

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenRequestBasedAuthenticator = void 0;
 var extend = require("extend");
 var token_managers_1 = require("../token-managers");
 var authenticator_1 = require("./authenticator");

package/auth/index.js

@@ -14,10 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./authenticators"));
-__export(require("./token-managers"));
-__export(require("./utils"));
+__exportStar(require("./authenticators"), exports);
+__exportStar(require("./token-managers"), exports);
+__exportStar(require("./utils"), exports);

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cp4dTokenManager = void 0;
 var extend = require("extend");
 var utils_1 = require("../utils");
 var jwt_token_manager_1 = require("./jwt-token-manager");

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IamTokenManager = void 0;
 var extend = require("extend");
 var logger_1 = require("../../lib/logger");
 var utils_1 = require("../utils");

package/auth/token-managers/index.js

@@ -31,10 +31,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *   JwtTokenManager: A class for shared functionality for parsing, storing, and requesting JWT tokens.
  */
 var iam_token_manager_1 = require("./iam-token-manager");
-exports.IamTokenManager = iam_token_manager_1.IamTokenManager;
+Object.defineProperty(exports, "IamTokenManager", { enumerable: true, get: function () { return iam_token_manager_1.IamTokenManager; } });
 var cp4d_token_manager_1 = require("./cp4d-token-manager");
-exports.Cp4dTokenManager = cp4d_token_manager_1.Cp4dTokenManager;
+Object.defineProperty(exports, "Cp4dTokenManager", { enumerable: true, get: function () { return cp4d_token_manager_1.Cp4dTokenManager; } });
 var jwt_token_manager_1 = require("./jwt-token-manager");
-exports.JwtTokenManager = jwt_token_manager_1.JwtTokenManager;
+Object.defineProperty(exports, "JwtTokenManager", { enumerable: true, get: function () { return jwt_token_manager_1.JwtTokenManager; } });
 var token_manager_1 = require("./token-manager");
-exports.TokenManager = token_manager_1.TokenManager;
+Object.defineProperty(exports, "TokenManager", { enumerable: true, get: function () { return token_manager_1.TokenManager; } });

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.JwtTokenManager = void 0;
 var extend = require("extend");
 var jwt = require("jsonwebtoken");
 var logger_1 = require("../../lib/logger");

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenManager = void 0;
 var helper_1 = require("../../lib/helper");
 var logger_1 = require("../../lib/logger");
 var request_wrapper_1 = require("../../lib/request-wrapper");

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAuthenticatorFromEnvironment = void 0;
 var authenticators_1 = require("../authenticators");
 var read_external_sources_1 = require("./read-external-sources");
 /**

package/auth/utils/helpers.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentTime = exports.validateInput = exports.checkCredentials = exports.computeBasicAuthHeader = void 0;
 var helper_1 = require("../../lib/helper");
 /**
  * Compute and return a Basic Authorization header from a username and password.

package/auth/utils/index.js

@@ -14,9 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @module utils
@@ -26,9 +33,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *   getAuthenticatorFromEnvironment: Get authenticator from external sources.
  *   readExternalSources: Get config object from external sources.
  */
-__export(require("./helpers"));
-__export(require("./read-credentials-file"));
+__exportStar(require("./helpers"), exports);
+__exportStar(require("./read-credentials-file"), exports);
 var get_authenticator_from_environment_1 = require("./get-authenticator-from-environment");
-exports.getAuthenticatorFromEnvironment = get_authenticator_from_environment_1.getAuthenticatorFromEnvironment;
+Object.defineProperty(exports, "getAuthenticatorFromEnvironment", { enumerable: true, get: function () { return get_authenticator_from_environment_1.getAuthenticatorFromEnvironment; } });
 var read_external_sources_1 = require("./read-external-sources");
-exports.readExternalSources = read_external_sources_1.readExternalSources;
+Object.defineProperty(exports, "readExternalSources", { enumerable: true, get: function () { return read_external_sources_1.readExternalSources; } });

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readCredentialsFile = void 0;
 // Dummy for browser
 function readCredentialsFile() {
     return {};

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructFilepath = exports.fileExistsAtPath = exports.readCredentialsFile = void 0;
 var dotenv = require("dotenv");
 var fs = require("fs");
 var os = require("os");

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readExternalSources = void 0;
 var camelcase = require("camelcase");
 var isEmpty = require("lodash.isempty");
 var logger_1 = require("../../lib/logger");

package/index.d.ts

@@ -22,4 +22,5 @@ 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';
-export * from './test/utils';
+import * as unitTestUtils from './lib/sdk-test-helpers';
+export { unitTestUtils };

package/index.js

@@ -14,20 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.unitTestUtils = void 0;
 /**
  * @module ibm-cloud-sdk-core
  */
 var base_service_1 = require("./lib/base-service");
-exports.BaseService = base_service_1.BaseService;
-__export(require("./auth"));
-__export(require("./lib/helper"));
+Object.defineProperty(exports, "BaseService", { enumerable: true, get: function () { return base_service_1.BaseService; } });
+__exportStar(require("./auth"), exports);
+__exportStar(require("./lib/helper"), exports);
 var querystring_1 = require("./lib/querystring");
-exports.qs = querystring_1.default;
+Object.defineProperty(exports, "qs", { enumerable: true, get: function () { return querystring_1.default; } });
 var content_type_1 = require("./lib/content-type");
-exports.contentType = content_type_1.default;
-__export(require("./lib/stream-to-promise"));
-__export(require("./test/utils"));
+Object.defineProperty(exports, "contentType", { enumerable: true, get: function () { return content_type_1.default; } });
+__exportStar(require("./lib/stream-to-promise"), exports);
+var unitTestUtils = require("./lib/sdk-test-helpers");
+exports.unitTestUtils = unitTestUtils;

package/lib/base-service.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseService = void 0;
 var extend = require("extend");
 var auth_1 = require("../auth");
 var helper_1 = require("./helper");

package/lib/helper.js

@@ -22,6 +22,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toLowerKeys = exports.buildRequestFileObject = exports.getFormat = exports.isHTML = exports.getMissingParams = exports.stripTrailingSlash = exports.getContentType = exports.isEmptyObject = exports.isFileData = exports.isFileWithMetadata = void 0;
 var extend = require("extend");
 var fileType = require("file-type");
 var isstream_1 = require("isstream");

package/lib/request-wrapper.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestWrapper = void 0;
 var axios_1 = require("axios");
 var axios_cookiejar_support_1 = require("axios-cookiejar-support");
 var extend = require("extend");

package/{test/utils/unit-test-helpers.d.ts → lib/sdk-test-helpers.d.ts}

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 IBM Corp. All Rights Reserved.
+ * Copyright 2019, 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.
@@ -17,9 +17,6 @@
  * This module provides a set of helper methods used to reduce code duplication in the generated unit tests
  * for the SDKs that depend on this core package. Note that these methods are not used by the tests for this
  * package - they are meant to be exported and made available to dependent libraries.
- *
- * They are included in the `test` directory since they rely on `jest` globals (like `expect`) and this
- * requires special linting rules that should not be configured in the rest of the source code.
  */
 /**
  * Takes the request options constructed by the SDK and checks that the `url` and `method` properties

package/{test/utils/unit-test-helpers.js → lib/sdk-test-helpers.js}

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright 2019 IBM Corp. All Rights Reserved.
+ * Copyright 2019, 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.
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-/* istanbul ignore file */
+exports.expectToBePromise = exports.getOptions = exports.checkForSuccessfulExecution = exports.checkUserHeader = exports.checkMediaHeaders = exports.checkUrlAndMethod = void 0;
+var expect = require("expect");
 /**
  * This module provides a set of helper methods used to reduce code duplication in the generated unit tests
  * for the SDKs that depend on this core package. Note that these methods are not used by the tests for this
  * package - they are meant to be exported and made available to dependent libraries.
- *
- * They are included in the `test` directory since they rely on `jest` globals (like `expect`) and this
- * requires special linting rules that should not be configured in the rest of the source code.
  */
 /**
  * Takes the request options constructed by the SDK and checks that the `url` and `method` properties

package/lib/stream-to-promise.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.streamToPromise = void 0;
 /**
  * Helper method that can be bound to a stream - it sets the output to utf-8, captures all of the results, and returns a promise that resolves to the final text
  * Essentially a smaller version of concat-stream wrapped in a promise

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ibm-cloud-sdk-core",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Core functionality to support SDKs generated with IBM's OpenAPI 3 SDK Generator.",
   "main": "index",
   "repository": {
@@ -32,13 +32,13 @@
     "@types/extend": "~3.0.0",
     "@types/file-type": "~5.2.1",
     "@types/isstream": "^0.1.0",
-    "@types/jest": "^24.0.23",
     "@types/node": "~10.14.19",
-    "axios": "^0.18.0",
-    "axios-cookiejar-support": "^0.5.1",
+    "axios": "^0.18.1",
+    "axios-cookiejar-support": "^1.0.0",
     "camelcase": "^5.3.1",
     "debug": "^4.1.1",
     "dotenv": "^6.2.0",
+    "expect": "^26.1.0",
     "extend": "~3.0.2",
     "file-type": "^7.7.1",
     "form-data": "^2.3.3",
@@ -49,7 +49,7 @@
     "object.omit": "~3.0.0",
     "object.pick": "~1.3.0",
     "semver": "^6.2.0",
-    "ts-jest": "^24.2.0"
+    "tough-cookie": "^4.0.0"
   },
   "browser": {
     "./auth/utils/read-credentials-file": "./auth/utils/read-credentials-file.browser"

package/test/utils/index.d.ts

@@ -1,17 +0,0 @@
-/**
- * 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 * as unitTestUtils from './unit-test-helpers';
-export { unitTestUtils };

package/test/utils/index.js

@@ -1,25 +0,0 @@
-"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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-/*
- * The utility methods in this directory are not to assist in the testing
- * of the core, but to assist with the testing of the SDKs that depend on
- * this core library. Specifically, the unit tests generated by the
- * IBM OpenAPI SDK Gen project rely on these methods.
-*/
-var unitTestUtils = require("./unit-test-helpers");
-exports.unitTestUtils = unitTestUtils;