@aws-sdk/credential-provider-ini 3.712.0 → 3.713.0

package/dist-cjs/index.js

@@ -100,28 +100,31 @@ var isCredentialSourceProfile = /* @__PURE__ */ __name((arg, { profile, logger }
   return withProviderProfile;
 }, "isCredentialSourceProfile");
 var resolveAssumeRoleCredentials = /* @__PURE__ */ __name(async (profileName, profiles, options, visitedProfiles = {}) => {
-  var _a, _b;
+  var _a, _b, _c;
   (_a = options.logger) == null ? void 0 : _a.debug("@aws-sdk/credential-provider-ini - resolveAssumeRoleCredentials (STS)");
-  const data = profiles[profileName];
+  const profileData = profiles[profileName];
+  const { source_profile, region } = profileData;
   if (!options.roleAssumer) {
     const { getDefaultRoleAssumer } = await Promise.resolve().then(() => __toESM(require("@aws-sdk/client-sts")));
     options.roleAssumer = getDefaultRoleAssumer(
       {
         ...options.clientConfig,
         credentialProviderLogger: options.logger,
-        parentClientConfig: options == null ? void 0 : options.parentClientConfig
+        parentClientConfig: {
+          ...options == null ? void 0 : options.parentClientConfig,
+          region: region ?? ((_b = options == null ? void 0 : options.parentClientConfig) == null ? void 0 : _b.region)
+        }
       },
       options.clientPlugins
     );
   }
-  const { source_profile } = data;
   if (source_profile && source_profile in visitedProfiles) {
     throw new import_property_provider.CredentialsProviderError(
       `Detected a cycle attempting to resolve credentials for profile ${(0, import_shared_ini_file_loader.getProfileName)(options)}. Profiles visited: ` + Object.keys(visitedProfiles).join(", "),
       { logger: options.logger }
     );
   }
-  (_b = options.logger) == null ? void 0 : _b.debug(
+  (_c = options.logger) == null ? void 0 : _c.debug(
     `@aws-sdk/credential-provider-ini - finding credential resolver using ${source_profile ? `source_profile=[${source_profile}]` : `profile=[${profileName}]`}`
   );
   const sourceCredsProvider = source_profile ? resolveProfileData(
@@ -133,17 +136,17 @@ var resolveAssumeRoleCredentials = /* @__PURE__ */ __name(async (profileName, pr
       [source_profile]: true
     },
     isCredentialSourceWithoutRoleArn(profiles[source_profile] ?? {})
-  ) : (await resolveCredentialSource(data.credential_source, profileName, options.logger)(options))();
-  if (isCredentialSourceWithoutRoleArn(data)) {
+  ) : (await resolveCredentialSource(profileData.credential_source, profileName, options.logger)(options))();
+  if (isCredentialSourceWithoutRoleArn(profileData)) {
     return sourceCredsProvider.then((creds) => (0, import_client.setCredentialFeature)(creds, "CREDENTIALS_PROFILE_SOURCE_PROFILE", "o"));
   } else {
     const params = {
-      RoleArn: data.role_arn,
-      RoleSessionName: data.role_session_name || `aws-sdk-js-${Date.now()}`,
-      ExternalId: data.external_id,
-      DurationSeconds: parseInt(data.duration_seconds || "3600", 10)
+      RoleArn: profileData.role_arn,
+      RoleSessionName: profileData.role_session_name || `aws-sdk-js-${Date.now()}`,
+      ExternalId: profileData.external_id,
+      DurationSeconds: parseInt(profileData.duration_seconds || "3600", 10)
     };
-    const { mfa_serial } = data;
+    const { mfa_serial } = profileData;
     if (mfa_serial) {
       if (!options.mfaCodeProvider) {
         throw new import_property_provider.CredentialsProviderError(
@@ -251,8 +254,17 @@ var resolveProfileData = /* @__PURE__ */ __name(async (profileName, profiles, op
 }, "resolveProfileData");
 
 // src/fromIni.ts
-var fromIni = /* @__PURE__ */ __name((init = {}) => async () => {
+var fromIni = /* @__PURE__ */ __name((_init = {}) => async ({ callerClientConfig } = {}) => {
   var _a;
+  const init = {
+    ..._init
+  };
+  if (callerClientConfig == null ? void 0 : callerClientConfig.region) {
+    init.parentClientConfig = {
+      region: callerClientConfig.region,
+      ..._init.parentClientConfig
+    };
+  }
   (_a = init.logger) == null ? void 0 : _a.debug("@aws-sdk/credential-provider-ini - fromIni");
   const profiles = await (0, import_shared_ini_file_loader.parseKnownFiles)(init);
   return resolveProfileData((0, import_shared_ini_file_loader.getProfileName)(init), profiles, init);

package/dist-es/fromIni.js

@@ -1,6 +1,15 @@
 import { getProfileName, parseKnownFiles } from "@smithy/shared-ini-file-loader";
 import { resolveProfileData } from "./resolveProfileData";
-export const fromIni = (init = {}) => async () => {
+export const fromIni = (_init = {}) => async ({ callerClientConfig } = {}) => {
+    const init = {
+        ..._init,
+    };
+    if (callerClientConfig?.region) {
+        init.parentClientConfig = {
+            region: callerClientConfig.region,
+            ..._init.parentClientConfig,
+        };
+    }
     init.logger?.debug("@aws-sdk/credential-provider-ini - fromIni");
     const profiles = await parseKnownFiles(init);
     return resolveProfileData(getProfileName(init), profiles, init);

package/dist-es/resolveAssumeRoleCredentials.js

@@ -28,16 +28,19 @@ const isCredentialSourceProfile = (arg, { profile, logger }) => {
 };
 export const resolveAssumeRoleCredentials = async (profileName, profiles, options, visitedProfiles = {}) => {
     options.logger?.debug("@aws-sdk/credential-provider-ini - resolveAssumeRoleCredentials (STS)");
-    const data = profiles[profileName];
+    const profileData = profiles[profileName];
+    const { source_profile, region } = profileData;
     if (!options.roleAssumer) {
         const { getDefaultRoleAssumer } = await import("@aws-sdk/client-sts");
         options.roleAssumer = getDefaultRoleAssumer({
             ...options.clientConfig,
             credentialProviderLogger: options.logger,
-            parentClientConfig: options?.parentClientConfig,
+            parentClientConfig: {
+                ...options?.parentClientConfig,
+                region: region ?? options?.parentClientConfig?.region,
+            },
         }, options.clientPlugins);
     }
-    const { source_profile } = data;
     if (source_profile && source_profile in visitedProfiles) {
         throw new CredentialsProviderError(`Detected a cycle attempting to resolve credentials for profile` +
             ` ${getProfileName(options)}. Profiles visited: ` +
@@ -49,18 +52,18 @@ export const resolveAssumeRoleCredentials = async (profileName, profiles, option
             ...visitedProfiles,
             [source_profile]: true,
         }, isCredentialSourceWithoutRoleArn(profiles[source_profile] ?? {}))
-        : (await resolveCredentialSource(data.credential_source, profileName, options.logger)(options))();
-    if (isCredentialSourceWithoutRoleArn(data)) {
+        : (await resolveCredentialSource(profileData.credential_source, profileName, options.logger)(options))();
+    if (isCredentialSourceWithoutRoleArn(profileData)) {
         return sourceCredsProvider.then((creds) => setCredentialFeature(creds, "CREDENTIALS_PROFILE_SOURCE_PROFILE", "o"));
     }
     else {
         const params = {
-            RoleArn: data.role_arn,
-            RoleSessionName: data.role_session_name || `aws-sdk-js-${Date.now()}`,
-            ExternalId: data.external_id,
-            DurationSeconds: parseInt(data.duration_seconds || "3600", 10),
+            RoleArn: profileData.role_arn,
+            RoleSessionName: profileData.role_session_name || `aws-sdk-js-${Date.now()}`,
+            ExternalId: profileData.external_id,
+            DurationSeconds: parseInt(profileData.duration_seconds || "3600", 10),
         };
-        const { mfa_serial } = data;
+        const { mfa_serial } = profileData;
         if (mfa_serial) {
             if (!options.mfaCodeProvider) {
                 throw new CredentialsProviderError(`Profile ${profileName} requires multi-factor authentication, but no MFA code callback was provided.`, { logger: options.logger, tryNextLink: false });

package/dist-types/fromIni.d.ts

@@ -1,7 +1,8 @@
 import type { AssumeRoleWithWebIdentityParams } from "@aws-sdk/credential-provider-web-identity";
 import type { CredentialProviderOptions } from "@aws-sdk/types";
+import type { RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
 import { SourceProfileInit } from "@smithy/shared-ini-file-loader";
-import type { AwsCredentialIdentity, AwsCredentialIdentityProvider, Pluggable } from "@smithy/types";
+import type { AwsCredentialIdentity, Pluggable } from "@smithy/types";
 import { AssumeRoleParams } from "./resolveAssumeRoleCredentials";
 /**
  * @public
@@ -46,4 +47,4 @@ export interface FromIniInit extends SourceProfileInit, CredentialProviderOption
  * Creates a credential provider that will read from ini files and supports
  * role assumption and multi-factor authentication.
  */
-export declare const fromIni: (init?: FromIniInit) => AwsCredentialIdentityProvider;
+export declare const fromIni: (_init?: FromIniInit) => RuntimeConfigAwsCredentialIdentityProvider;

package/dist-types/ts3.4/fromIni.d.ts

@@ -1,11 +1,8 @@
 import { AssumeRoleWithWebIdentityParams } from "@aws-sdk/credential-provider-web-identity";
 import { CredentialProviderOptions } from "@aws-sdk/types";
+import { RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
 import { SourceProfileInit } from "@smithy/shared-ini-file-loader";
-import {
-  AwsCredentialIdentity,
-  AwsCredentialIdentityProvider,
-  Pluggable,
-} from "@smithy/types";
+import { AwsCredentialIdentity, Pluggable } from "@smithy/types";
 import { AssumeRoleParams } from "./resolveAssumeRoleCredentials";
 export interface FromIniInit
   extends SourceProfileInit,
@@ -22,5 +19,5 @@ export interface FromIniInit
   clientPlugins?: Pluggable<any, any>[];
 }
 export declare const fromIni: (
-  init?: FromIniInit
-) => AwsCredentialIdentityProvider;
+  _init?: FromIniInit
+) => RuntimeConfigAwsCredentialIdentityProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-ini",
-  "version": "3.712.0",
+  "version": "3.713.0",
   "description": "AWS credential provider that sources credentials from ~/.aws/credentials and ~/.aws/config",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -13,7 +13,9 @@
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
     "test": "yarn g:vitest run",
-    "test:watch": "yarn g:vitest watch"
+    "test:watch": "yarn g:vitest watch",
+    "test:integration": "yarn g:vitest run -c vitest.config.integ.ts",
+    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.ts"
   },
   "keywords": [
     "aws",
@@ -25,13 +27,13 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "3.709.0",
-    "@aws-sdk/credential-provider-env": "3.709.0",
-    "@aws-sdk/credential-provider-http": "3.709.0",
-    "@aws-sdk/credential-provider-process": "3.709.0",
-    "@aws-sdk/credential-provider-sso": "3.712.0",
-    "@aws-sdk/credential-provider-web-identity": "3.709.0",
-    "@aws-sdk/types": "3.709.0",
+    "@aws-sdk/core": "3.713.0",
+    "@aws-sdk/credential-provider-env": "3.713.0",
+    "@aws-sdk/credential-provider-http": "3.713.0",
+    "@aws-sdk/credential-provider-process": "3.713.0",
+    "@aws-sdk/credential-provider-sso": "3.713.0",
+    "@aws-sdk/credential-provider-web-identity": "3.713.0",
+    "@aws-sdk/types": "3.713.0",
     "@smithy/credential-provider-imds": "^3.2.8",
     "@smithy/property-provider": "^3.1.11",
     "@smithy/shared-ini-file-loader": "^3.1.12",
@@ -47,7 +49,7 @@
     "typescript": "~4.9.5"
   },
   "peerDependencies": {
-    "@aws-sdk/client-sts": "^3.712.0"
+    "@aws-sdk/client-sts": "^3.713.0"
   },
   "types": "./dist-types/index.d.ts",
   "engines": {