ibm-cloud-sdk-core 5.1.4 → 5.3.0

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2021, 2024.
+ * (C) Copyright IBM Corp. 2021, 2025.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,6 +80,7 @@ export declare class ContainerTokenManager extends IamRequestBasedTokenManager {
      * 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)
+     * 4. Default file #3 (/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/token)
      * First one found wins.
      *
      * @returns the CR token value as a string

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * (C) Copyright IBM Corp. 2021, 2024.
+ * (C) Copyright IBM Corp. 2021, 2025.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ var build_user_agent_1 = require("../../lib/build-user-agent");
 var iam_request_based_token_manager_1 = require("./iam-request-based-token-manager");
 var DEFAULT_CR_TOKEN_FILEPATH1 = '/var/run/secrets/tokens/vault-token';
 var DEFAULT_CR_TOKEN_FILEPATH2 = '/var/run/secrets/tokens/sa-token';
+var DEFAULT_CR_TOKEN_FILEPATH3 = '/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/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
@@ -135,6 +136,7 @@ var ContainerTokenManager = /** @class */ (function (_super) {
      * 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)
+     * 4. Default file #3 (/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/token)
      * First one found wins.
      *
      * @returns the CR token value as a string
@@ -152,7 +154,12 @@ var ContainerTokenManager = /** @class */ (function (_super) {
                     crToken = (0, file_reading_helpers_1.readCrTokenFile)(DEFAULT_CR_TOKEN_FILEPATH1);
                 }
                 catch (err) {
-                    crToken = (0, file_reading_helpers_1.readCrTokenFile)(DEFAULT_CR_TOKEN_FILEPATH2);
+                    try {
+                        crToken = (0, file_reading_helpers_1.readCrTokenFile)(DEFAULT_CR_TOKEN_FILEPATH2);
+                    }
+                    catch (err1) {
+                        crToken = (0, file_reading_helpers_1.readCrTokenFile)(DEFAULT_CR_TOKEN_FILEPATH3);
+                    }
                 }
             }
             return crToken;

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

@@ -2770,7 +2770,7 @@
             {
               "kind": "Method",
               "canonicalReference": "ibm-cloud-sdk-core!ContainerTokenManager#getCrToken:member(1)",
-              "docComment": "/**\n * 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.\n *\n * @returns the CR token value as a string\n */\n",
+              "docComment": "/**\n * 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) 4. Default file #3 (/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/token) First one found wins.\n *\n * @returns the CR token value as a string\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2021, 2024.
+ * (C) Copyright IBM Corp. 2021, 2025.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,6 +80,7 @@ export declare class ContainerTokenManager extends IamRequestBasedTokenManager {
      * 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)
+     * 4. Default file #3 (/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/token)
      * First one found wins.
      *
      * @returns the CR token value as a string

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

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2021, 2024.
+ * (C) Copyright IBM Corp. 2021, 2025.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import { buildUserAgent } from '../../lib/build-user-agent';
 import { IamRequestBasedTokenManager } from './iam-request-based-token-manager';
 const DEFAULT_CR_TOKEN_FILEPATH1 = '/var/run/secrets/tokens/vault-token';
 const DEFAULT_CR_TOKEN_FILEPATH2 = '/var/run/secrets/tokens/sa-token';
+const DEFAULT_CR_TOKEN_FILEPATH3 = '/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/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
@@ -114,6 +115,7 @@ export class ContainerTokenManager extends IamRequestBasedTokenManager {
      * 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)
+     * 4. Default file #3 (/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/token)
      * First one found wins.
      *
      * @returns the CR token value as a string
@@ -131,7 +133,12 @@ export class ContainerTokenManager extends IamRequestBasedTokenManager {
                     crToken = readCrTokenFile(DEFAULT_CR_TOKEN_FILEPATH1);
                 }
                 catch (err) {
-                    crToken = readCrTokenFile(DEFAULT_CR_TOKEN_FILEPATH2);
+                    try {
+                        crToken = readCrTokenFile(DEFAULT_CR_TOKEN_FILEPATH2);
+                    }
+                    catch (err1) {
+                        crToken = readCrTokenFile(DEFAULT_CR_TOKEN_FILEPATH3);
+                    }
                 }
             }
             return crToken;

package/es/index.d.ts

@@ -16,6 +16,7 @@
 /**
  * @module ibm-cloud-sdk-core
  */
+export * from './lib/axios-types';
 export { BaseService, UserOptions } from './lib/base-service';
 export * from './auth';
 export * from './lib/helper';

package/es/index.js

@@ -16,6 +16,7 @@
 /**
  * @module ibm-cloud-sdk-core
  */
+export * from './lib/axios-types';
 export { BaseService } from './lib/base-service';
 export * from './auth';
 export * from './lib/helper';

package/es/lib/axios-types.d.ts

@@ -0,0 +1,16 @@
+/**
+ * (C) Copyright IBM Corp. 2025.
+ *
+ * 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 { GenericAbortSignal as AbortSignal } from 'axios';

package/es/lib/axios-types.js

@@ -0,0 +1,16 @@
+/**
+ * (C) Copyright IBM Corp. 2025.
+ *
+ * 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 {};

package/es/lib/request-wrapper.js

@@ -192,7 +192,7 @@ export class RequestWrapper {
     sendRequest(parameters) {
         return __awaiter(this, void 0, void 0, function* () {
             const options = extend(true, {}, parameters.defaultOptions, parameters.options);
-            const { path, body, form, formData, qs, method, serviceUrl } = options;
+            const { path, body, form, formData, qs, method, serviceUrl, axiosOptions } = options;
             let { headers, url } = options;
             const multipartForm = new FormData();
             // Form params
@@ -252,16 +252,9 @@ export class RequestWrapper {
             if (this.compressRequestData) {
                 data = yield this.gzipRequestBody(data, headers);
             }
-            const requestParams = {
-                url,
+            const requestParams = Object.assign({ url,
                 method,
-                headers,
-                params: qs,
-                data,
-                raxConfig: this.raxConfig,
-                responseType: options.responseType || 'json',
-                paramsSerializer: { serialize: (params) => stringify(params) },
-            };
+                headers, params: qs, data, raxConfig: this.raxConfig, responseType: options.responseType || 'json', paramsSerializer: { serialize: (params) => stringify(params) } }, axiosOptions);
             return this.axiosInstance(requestParams).then((res) => {
                 // sometimes error responses will still trigger the `then` block - escape that behavior here
                 if (!res) {

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

@@ -1,11 +1,14 @@
 /// <reference types="node" />
 
+import { GenericAbortSignal as AbortSignal_2 } from 'axios';
 import { AxiosInstance } from 'axios';
 import type { CookieJar } from 'tough-cookie';
 import { Debugger } from 'debug';
 import { OutgoingHttpHeaders } from 'http';
 import { Stream } from 'stream';
 
+export { AbortSignal_2 as AbortSignal }
+
 /**
  * Checks for at least one of the given elements being defined.
  *
@@ -544,6 +547,7 @@ export declare class ContainerTokenManager extends IamRequestBasedTokenManager {
      * 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)
+     * 4. Default file #3 (/var/run/secrets/codeengine.cloud.ibm.com/compute-resource-token/token)
      * First one found wins.
      *
      * @returns the CR token value as a string

package/index.d.ts

@@ -16,6 +16,7 @@
 /**
  * @module ibm-cloud-sdk-core
  */
+export * from './lib/axios-types';
 export { BaseService, UserOptions } from './lib/base-service';
 export * from './auth';
 export * from './lib/helper';

package/index.js

@@ -36,6 +36,7 @@ exports.getNewLogger = exports.contentType = exports.qs = exports.BaseService =
 /**
  * @module ibm-cloud-sdk-core
  */
+__exportStar(require("./lib/axios-types"), exports);
 var base_service_1 = require("./lib/base-service");
 Object.defineProperty(exports, "BaseService", { enumerable: true, get: function () { return base_service_1.BaseService; } });
 __exportStar(require("./auth"), exports);

package/lib/axios-types.d.ts

@@ -0,0 +1,16 @@
+/**
+ * (C) Copyright IBM Corp. 2025.
+ *
+ * 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 { GenericAbortSignal as AbortSignal } from 'axios';

package/lib/axios-types.js

@@ -0,0 +1,17 @@
+"use strict";
+/**
+ * (C) Copyright IBM Corp. 2025.
+ *
+ * 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 });

package/lib/request-wrapper.js

@@ -259,13 +259,13 @@ var RequestWrapper = /** @class */ (function () {
      */
     RequestWrapper.prototype.sendRequest = function (parameters) {
         return __awaiter(this, void 0, void 0, function () {
-            var options, path, body, form, formData, qs, method, serviceUrl, headers, url, multipartForm, _i, _a, key, values, _b, values_1, value, fileObj, data, requestParams;
+            var options, path, body, form, formData, qs, method, serviceUrl, axiosOptions, headers, url, multipartForm, _i, _a, key, values, _b, values_1, value, fileObj, data, requestParams;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         options = (0, extend_1.default)(true, {}, 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;
+                        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();
                         if (!formData) return [3 /*break*/, 7];
@@ -338,16 +338,7 @@ var RequestWrapper = /** @class */ (function () {
                         data = _c.sent();
                         _c.label = 9;
                     case 9:
-                        requestParams = {
-                            url: url,
-                            method: method,
-                            headers: headers,
-                            params: qs,
-                            data: data,
-                            raxConfig: this.raxConfig,
-                            responseType: options.responseType || 'json',
-                            paramsSerializer: { serialize: function (params) { return (0, querystring_1.stringify)(params); } },
-                        };
+                        requestParams = __assign({ url: url, method: method, headers: headers, params: qs, data: data, raxConfig: this.raxConfig, responseType: options.responseType || 'json', paramsSerializer: { serialize: function (params) { return (0, querystring_1.stringify)(params); } } }, axiosOptions);
                         return [2 /*return*/, this.axiosInstance(requestParams).then(function (res) {
                                 // sometimes error responses will still trigger the `then` block - escape that behavior here
                                 if (!res) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ibm-cloud-sdk-core",
-    "version": "5.1.4",
+    "version": "5.3.0",
     "description": "Core functionality to support SDKs generated with IBM's OpenAPI SDK Generator.",
     "main": "./index.js",
     "typings": "./es/index.d.ts",