ibm-cloud-sdk-core 4.0.6 → 4.0.8

package/Authentication.md

@@ -252,7 +252,8 @@ The IAM access token is added to each outbound request in the `Authorization` he
 ### Properties
 
 - crTokenFilename: (optional) the name of the file containing the injected CR token value.
-If not specified, then `/var/run/secrets/tokens/vault-token` is used as the default value.
+If not specified, then the authenticator will first try `/var/run/secrets/tokens/vault-token`
+and then `/var/run/secrets/tokens/sa-token` as the default value (first file found is used).
 The application must have `read` permissions on the file containing the CR token value.
 
 - iamProfileName: (optional) the name of the linked trusted IAM profile to be used when obtaining the

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.0.8](https://github.com/IBM/node-sdk-core/compare/v4.0.7...v4.0.8) (2023-05-22)
+
+
+### Bug Fixes
+
+* refresh dependencies and address import cycles ([#244](https://github.com/IBM/node-sdk-core/issues/244)) ([72aa8d5](https://github.com/IBM/node-sdk-core/commit/72aa8d5f8308ea0e7d092e79b45743fc3f273506))
+
+## [4.0.7](https://github.com/IBM/node-sdk-core/compare/v4.0.6...v4.0.7) (2023-05-22)
+
+
+### Bug Fixes
+
+* **ContainerAuthenticator:** add sa-token as default CR token filename ([#241](https://github.com/IBM/node-sdk-core/issues/241)) ([91f9932](https://github.com/IBM/node-sdk-core/commit/91f9932ab0a74c11e1de5aecb46481dee3058018))
+
 ## [4.0.6](https://github.com/IBM/node-sdk-core/compare/v4.0.5...v4.0.6) (2023-05-18)
 
 

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/auth/authenticators/basic-authenticator.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicAuthenticator = void 0;
 var extend_1 = __importDefault(require("extend"));
-var utils_1 = require("../utils");
+var helpers_1 = require("../utils/helpers");
 var authenticator_1 = require("./authenticator");
 /**
  * The BasicAuthenticator is used to add basic authentication information to
@@ -61,9 +61,9 @@ var BasicAuthenticator = /** @class */ (function (_super) {
     function BasicAuthenticator(options) {
         var _this = _super.call(this) || this;
         _this.requiredOptions = ['username', 'password'];
-        (0, utils_1.validateInput)(options, _this.requiredOptions);
+        (0, helpers_1.validateInput)(options, _this.requiredOptions);
         var username = options.username, password = options.password;
-        var authHeaderString = (0, utils_1.computeBasicAuthHeader)(username, password);
+        var authHeaderString = (0, helpers_1.computeBasicAuthHeader)(username, password);
         _this.authHeader = { Authorization: authHeaderString };
         return _this;
     }

package/auth/authenticators/bearer-token-authenticator.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BearerTokenAuthenticator = void 0;
 var extend_1 = __importDefault(require("extend"));
-var utils_1 = require("../utils");
+var helpers_1 = require("../utils/helpers");
 var authenticator_1 = require("./authenticator");
 /**
  * The BearerTokenAuthenticator will set a user-provided bearer token
@@ -58,7 +58,7 @@ var BearerTokenAuthenticator = /** @class */ (function (_super) {
     function BearerTokenAuthenticator(options) {
         var _this = _super.call(this) || this;
         _this.requiredOptions = ['bearerToken'];
-        (0, utils_1.validateInput)(options, _this.requiredOptions);
+        (0, helpers_1.validateInput)(options, _this.requiredOptions);
         _this.bearerToken = options.bearerToken;
         return _this;
     }

package/auth/authenticators/cloud-pak-for-data-authenticator.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Cp4dTokenManager } from '../token-managers';
+import { Cp4dTokenManager } from '../token-managers/cp4d-token-manager';
 import { BaseOptions, TokenRequestBasedAuthenticator } from './token-request-based-authenticator';
 /** Configuration options for CloudPakForData authentication. */
 export interface Options extends BaseOptions {

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudPakForDataAuthenticator = void 0;
 var authenticator_1 = require("./authenticator");
-var token_managers_1 = require("../token-managers");
+var cp4d_token_manager_1 = require("../token-managers/cp4d-token-manager");
 var token_request_based_authenticator_1 = require("./token-request-based-authenticator");
 /**
  * The CloudPakForDataAuthenticator will either use a username/password pair or a username/apikey pair to obtain
@@ -68,7 +68,7 @@ var CloudPakForDataAuthenticator = /** @class */ (function (_super) {
         // the param names are shared between the authenticator and the token
         // manager so we can just pass along the options object.
         // also, the token manager will handle input validation
-        _this.tokenManager = new token_managers_1.Cp4dTokenManager(options);
+        _this.tokenManager = new cp4d_token_manager_1.Cp4dTokenManager(options);
         return _this;
     }
     /**

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021, 2022 IBM Corp. All Rights Reserved.
+ * Copyright 2021, 202e 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ContainerTokenManager } from '../token-managers';
+import { ContainerTokenManager } from '../token-managers/container-token-manager';
 import { IamRequestOptions, IamRequestBasedAuthenticator } from './iam-request-based-authenticator';
 /** Configuration options for IAM authentication. */
 export interface Options extends IamRequestOptions {

package/auth/authenticators/container-authenticator.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright 2021, 2022 IBM Corp. All Rights Reserved.
+ * Copyright 2021, 202e 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.
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContainerAuthenticator = void 0;
 var authenticator_1 = require("./authenticator");
-var token_managers_1 = require("../token-managers");
+var container_token_manager_1 = require("../token-managers/container-token-manager");
 var iam_request_based_authenticator_1 = require("./iam-request-based-authenticator");
 /**
  * The ContainerAuthenticator will read a compute resource token from the file system
@@ -71,7 +71,7 @@ var ContainerAuthenticator = /** @class */ (function (_super) {
         // the param names are shared between the authenticator and the token
         // manager so we can just pass along the options object
         // the token manager will also handle the validation of required options
-        _this.tokenManager = new token_managers_1.ContainerTokenManager(options);
+        _this.tokenManager = new container_token_manager_1.ContainerTokenManager(options);
         _this.crTokenFilename = options.crTokenFilename;
         _this.iamProfileName = options.iamProfileName;
         _this.iamProfileId = options.iamProfileId;

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IamTokenManager } from '../token-managers';
+import { IamTokenManager } from '../token-managers/iam-token-manager';
 import { IamRequestOptions, IamRequestBasedAuthenticator } from './iam-request-based-authenticator';
 /** Configuration options for IAM authentication. */
 export interface Options extends IamRequestOptions {

package/auth/authenticators/iam-authenticator.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IamAuthenticator = void 0;
 var authenticator_1 = require("./authenticator");
-var token_managers_1 = require("../token-managers");
-var utils_1 = require("../utils");
+var iam_token_manager_1 = require("../token-managers/iam-token-manager");
+var helpers_1 = require("../utils/helpers");
 var iam_request_based_authenticator_1 = require("./iam-request-based-authenticator");
 /**
  * The IamAuthenticator will use the user-supplied `apikey`
@@ -70,11 +70,11 @@ var IamAuthenticator = /** @class */ (function (_super) {
     function IamAuthenticator(options) {
         var _this = _super.call(this, options) || this;
         _this.requiredOptions = ['apikey'];
-        (0, utils_1.validateInput)(options, _this.requiredOptions);
+        (0, helpers_1.validateInput)(options, _this.requiredOptions);
         _this.apikey = options.apikey;
         // the param names are shared between the authenticator and the token
         // manager so we can just pass along the options object
-        _this.tokenManager = new token_managers_1.IamTokenManager(options);
+        _this.tokenManager = new iam_token_manager_1.IamTokenManager(options);
         return _this;
     }
     /**

package/auth/authenticators/iam-request-based-authenticator.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 202e.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IamRequestBasedTokenManager } from '../token-managers';
+import { IamRequestBasedTokenManager } from '../token-managers/iam-request-based-token-manager';
 import { BaseOptions, TokenRequestBasedAuthenticator } from './token-request-based-authenticator';
 /** Configuration options for IAM Request based authentication. */
 export interface IamRequestOptions extends BaseOptions {

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 202e.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IamRequestBasedAuthenticator = void 0;
-var token_managers_1 = require("../token-managers");
+var iam_request_based_token_manager_1 = require("../token-managers/iam-request-based-token-manager");
 var token_request_based_authenticator_1 = require("./token-request-based-authenticator");
 /**
  * The IamRequestBasedAuthenticator provides shared configuration and functionality
@@ -66,7 +66,7 @@ var IamRequestBasedAuthenticator = /** @class */ (function (_super) {
         _this.clientId = options.clientId;
         _this.clientSecret = options.clientSecret;
         _this.scope = options.scope;
-        _this.tokenManager = new token_managers_1.IamRequestBasedTokenManager(options);
+        _this.tokenManager = new iam_request_based_token_manager_1.IamRequestBasedTokenManager(options);
         return _this;
     }
     /**

package/auth/authenticators/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2021.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
  * authentication type is implemented as an Authenticator for consumption by a service.
  *
  * classes:
- *   AuthenticatorInterface: Implement this class to provide custom authentication schemes to services.
+ *   AuthenticatorInterface: Implement this interface to provide custom authentication schemes to services.
  *   Authenticator: Extend this class to provide custom authentication schemes to services.
  *   BasicAuthenticator: Authenticator for passing supplied basic authentication information to service endpoint.
  *   BearerTokenAuthenticator: Authenticator for passing supplied bearer token to service endpoint.

package/auth/authenticators/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2021.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/auth/authenticators/token-request-based-authenticator.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 /// <reference types="node" />
 import { OutgoingHttpHeaders } from 'http';
-import { JwtTokenManager } from '../token-managers';
+import { JwtTokenManager } from '../token-managers/jwt-token-manager';
 import { Authenticator } from './authenticator';
 import { AuthenticateOptions } from './authenticator-interface';
 /** Configuration options for token-based authentication. */

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenRequestBasedAuthenticator = void 0;
 var extend_1 = __importDefault(require("extend"));
-var token_managers_1 = require("../token-managers");
+var jwt_token_manager_1 = require("../token-managers/jwt-token-manager");
 var authenticator_1 = require("./authenticator");
 /**
  * Class for common functionality shared by token-request authenticators.
@@ -66,7 +66,7 @@ var TokenRequestBasedAuthenticator = /** @class */ (function (_super) {
         _this.url = options.url;
         // default to empty object
         _this.headers = options.headers || {};
-        _this.tokenManager = new token_managers_1.JwtTokenManager(options);
+        _this.tokenManager = new jwt_token_manager_1.JwtTokenManager(options);
         return _this;
     }
     /**

package/auth/authenticators/vpc-instance-authenticator.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2021, 2022.
+ * (C) Copyright IBM Corp. 2021, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { VpcInstanceTokenManager } from '../token-managers';
+import { VpcInstanceTokenManager } from '../token-managers/vpc-instance-token-manager';
 import { BaseOptions, TokenRequestBasedAuthenticator } from './token-request-based-authenticator';
 /** Configuration options for VpcInstance authentication. */
 export interface Options extends BaseOptions {

package/auth/authenticators/vpc-instance-authenticator.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2021, 2022.
+ * (C) Copyright IBM Corp. 2021, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VpcInstanceAuthenticator = void 0;
 var authenticator_1 = require("./authenticator");
-var token_managers_1 = require("../token-managers");
+var vpc_instance_token_manager_1 = require("../token-managers/vpc-instance-token-manager");
 var token_request_based_authenticator_1 = require("./token-request-based-authenticator");
 /**
  * The VpcInstanceAuthenticator implements an authentication scheme in which it retrieves an "instance identity token"
@@ -73,7 +73,7 @@ var VpcInstanceAuthenticator = /** @class */ (function (_super) {
         // the param names are shared between the authenticator and the token
         // manager so we can just pass along the options object.
         // also, the token manager will handle input validation
-        _this.tokenManager = new token_managers_1.VpcInstanceTokenManager(options);
+        _this.tokenManager = new vpc_instance_token_manager_1.VpcInstanceTokenManager(options);
         return _this;
     }
     /**

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021, 2022 IBM Corp. All Rights Reserved.
+ * Copyright 2021, 2023 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.
@@ -69,5 +69,15 @@ export declare class ContainerTokenManager extends IamRequestBasedTokenManager {
      * Request an IAM token using a compute resource token.
      */
     protected requestToken(): Promise<any>;
+    /**
+     * Retrieves the CR token from a file using this search order:
+     * 1. User-specified filename (if specified)
+     * 2. Default file #1 (/var/run/secrets/tokens/vault-token)
+     * 3. Default file #2 (/var/run/secrets/tokens/sa-token)
+     * First one found wins.
+     *
+     * @returns the CR token value as a string
+     */
+    protected getCrToken(): string;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright 2021, 2022 IBM Corp. All Rights Reserved.
+ * Copyright 2021, 2023 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.
@@ -65,15 +65,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContainerTokenManager = void 0;
-var logger_1 = __importDefault(require("../../lib/logger"));
-var utils_1 = require("../utils");
+var helpers_1 = require("../utils/helpers");
+var file_reading_helpers_1 = require("../utils/file-reading-helpers");
 var iam_request_based_token_manager_1 = require("./iam-request-based-token-manager");
-var DEFAULT_CR_TOKEN_FILEPATH = '/var/run/secrets/tokens/vault-token';
+var DEFAULT_CR_TOKEN_FILEPATH1 = '/var/run/secrets/tokens/vault-token';
+var DEFAULT_CR_TOKEN_FILEPATH2 = '/var/run/secrets/tokens/sa-token';
 /**
  * The ContainerTokenManager retrieves a compute resource token from a file on the container. This token
  * is used to perform the necessary interactions with the IAM token service to obtain and store a suitable
@@ -106,10 +104,12 @@ var ContainerTokenManager = /** @class */ (function (_super) {
         // all parameters are optional
         options = options || {};
         _this = _super.call(this, options) || this;
-        if (!(0, utils_1.atLeastOne)(options.iamProfileId, options.iamProfileName)) {
+        if (!(0, helpers_1.atLeastOne)(options.iamProfileId, options.iamProfileName)) {
             throw new Error('At least one of `iamProfileName` or `iamProfileId` must be specified.');
         }
-        _this.crTokenFilename = options.crTokenFilename || DEFAULT_CR_TOKEN_FILEPATH;
+        if (options.crTokenFilename) {
+            _this.crTokenFilename = options.crTokenFilename;
+        }
         if (options.iamProfileName) {
             _this.iamProfileName = options.iamProfileName;
         }
@@ -146,10 +146,8 @@ var ContainerTokenManager = /** @class */ (function (_super) {
      */
     ContainerTokenManager.prototype.requestToken = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var crToken;
             return __generator(this, function (_a) {
-                crToken = getCrToken(this.crTokenFilename);
-                this.formData.cr_token = crToken;
+                this.formData.cr_token = this.getCrToken();
                 // these member variables can be reset, set them in the form data right
                 // before making the request to ensure they're up to date
                 if (this.iamProfileName) {
@@ -162,11 +160,37 @@ var ContainerTokenManager = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Retrieves the CR token from a file using this search order:
+     * 1. User-specified filename (if specified)
+     * 2. Default file #1 (/var/run/secrets/tokens/vault-token)
+     * 3. Default file #2 (/var/run/secrets/tokens/sa-token)
+     * First one found wins.
+     *
+     * @returns the CR token value as a string
+     */
+    ContainerTokenManager.prototype.getCrToken = function () {
+        try {
+            var crToken = null;
+            if (this.crTokenFilename) {
+                // If the user specified a filename, then try to read from that.
+                crToken = (0, file_reading_helpers_1.readCrTokenFile)(this.crTokenFilename);
+            }
+            else {
+                // If no filename was specified, then try our two default filenames.
+                try {
+                    crToken = (0, file_reading_helpers_1.readCrTokenFile)(DEFAULT_CR_TOKEN_FILEPATH1);
+                }
+                catch (err) {
+                    crToken = (0, file_reading_helpers_1.readCrTokenFile)(DEFAULT_CR_TOKEN_FILEPATH2);
+                }
+            }
+            return crToken;
+        }
+        catch (err) {
+            throw new Error("Error reading CR token file: ".concat(err.toString()));
+        }
+    };
     return ContainerTokenManager;
 }(iam_request_based_token_manager_1.IamRequestBasedTokenManager));
 exports.ContainerTokenManager = ContainerTokenManager;
-function getCrToken(filename) {
-    logger_1.default.debug("Attempting to read CR token from file: ".concat(filename));
-    // moving the actual read to another file to isolate usage of node-only packages like `fs`
-    return (0, utils_1.readCrTokenFile)(filename);
-}

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cp4dTokenManager = void 0;
 var extend_1 = __importDefault(require("extend"));
-var utils_1 = require("../utils");
+var helpers_1 = require("../utils/helpers");
 var jwt_token_manager_1 = require("./jwt-token-manager");
 /**
  * Token Manager of CloudPak for data.
@@ -67,7 +67,7 @@ var Cp4dTokenManager = /** @class */ (function (_super) {
         if ((!options.password && !options.apikey) || (options.password && options.apikey)) {
             throw new Error('Exactly one of `apikey` or `password` must be specified.');
         }
-        (0, utils_1.validateInput)(options, _this.requiredOptions);
+        (0, helpers_1.validateInput)(options, _this.requiredOptions);
         var tokenApiPath = '/v1/authorize';
         // do not append the path if user already has
         if (_this.url && !_this.url.endsWith(tokenApiPath)) {

package/auth/token-managers/iam-request-based-token-manager.d.ts

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IamRequestBasedTokenManager = void 0;
 var extend_1 = __importDefault(require("extend"));
 var logger_1 = __importDefault(require("../../lib/logger"));
-var utils_1 = require("../utils");
+var helpers_1 = require("../utils/helpers");
 var jwt_token_manager_1 = require("./jwt-token-manager");
 var CLIENT_ID_SECRET_WARNING = 'Warning: Client ID and Secret must BOTH be given, or the header will not be included.';
 var DEFAULT_IAM_URL = 'https://iam.cloud.ibm.com';
@@ -74,7 +74,7 @@ var IamRequestBasedTokenManager = /** @class */ (function (_super) {
         options = options || {};
         _this = _super.call(this, options) || this;
         // Canonicalize the URL by removing the operation path if it was specified by the user.
-        _this.url = _this.url ? (0, utils_1.removeSuffix)(_this.url, OPERATION_PATH) : DEFAULT_IAM_URL;
+        _this.url = _this.url ? (0, helpers_1.removeSuffix)(_this.url, OPERATION_PATH) : DEFAULT_IAM_URL;
         if (options.clientId) {
             _this.clientId = options.clientId;
         }
@@ -84,7 +84,7 @@ var IamRequestBasedTokenManager = /** @class */ (function (_super) {
         if (options.scope) {
             _this.scope = options.scope;
         }
-        if ((0, utils_1.onlyOne)(options.clientId, options.clientSecret)) {
+        if ((0, helpers_1.onlyOne)(options.clientId, options.clientSecret)) {
             // tslint:disable-next-line
             logger_1.default.warn(CLIENT_ID_SECRET_WARNING);
         }
@@ -114,7 +114,7 @@ var IamRequestBasedTokenManager = /** @class */ (function (_super) {
     IamRequestBasedTokenManager.prototype.setClientIdAndSecret = function (clientId, clientSecret) {
         this.clientId = clientId;
         this.clientSecret = clientSecret;
-        if ((0, utils_1.onlyOne)(clientId, clientSecret)) {
+        if ((0, helpers_1.onlyOne)(clientId, clientSecret)) {
             // tslint:disable-next-line
             logger_1.default.warn(CLIENT_ID_SECRET_WARNING);
         }
@@ -152,7 +152,7 @@ var IamRequestBasedTokenManager = /** @class */ (function (_super) {
         };
         // If both the clientId and secret were specified by the user, then use them.
         if (this.clientId && this.clientSecret) {
-            requiredHeaders.Authorization = (0, utils_1.computeBasicAuthHeader)(this.clientId, this.clientSecret);
+            requiredHeaders.Authorization = (0, helpers_1.computeBasicAuthHeader)(this.clientId, this.clientSecret);
         }
         if (this.scope) {
             this.formData.scope = this.scope;

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2019, 2022.
+ * (C) Copyright IBM Corp. 2019, 2023.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IamTokenManager = void 0;
-var utils_1 = require("../utils");
+var helpers_1 = require("../utils/helpers");
 var iam_request_based_token_manager_1 = require("./iam-request-based-token-manager");
 /**
  * The IAMTokenManager takes an api key and performs the necessary interactions with
@@ -62,7 +62,7 @@ var IamTokenManager = /** @class */ (function (_super) {
     function IamTokenManager(options) {
         var _this = _super.call(this, options) || this;
         _this.requiredOptions = ['apikey'];
-        (0, utils_1.validateInput)(options, _this.requiredOptions);
+        (0, helpers_1.validateInput)(options, _this.requiredOptions);
         _this.apikey = options.apikey;
         // construct form data for the apikey use case of iam token management
         _this.formData.apikey = _this.apikey;