@aws-sdk/token-providers 3.1045.0 → 3.1046.0

package/dist-cjs/index.js

@@ -2,18 +2,17 @@
 
 var client = require('@aws-sdk/core/client');
 var httpAuthSchemes = require('@aws-sdk/core/httpAuthSchemes');
-var propertyProvider = require('@smithy/property-provider');
-var sharedIniFileLoader = require('@smithy/shared-ini-file-loader');
+var config = require('@smithy/core/config');
 var node_fs = require('node:fs');
 
 const fromEnvSigningName = ({ logger, signingName } = {}) => async () => {
     logger?.debug?.("@aws-sdk/token-providers - fromEnvSigningName");
     if (!signingName) {
-        throw new propertyProvider.TokenProviderError("Please pass 'signingName' to compute environment variable key", { logger });
+        throw new config.TokenProviderError("Please pass 'signingName' to compute environment variable key", { logger });
     }
     const bearerTokenKey = httpAuthSchemes.getBearerTokenEnvKey(signingName);
     if (!(bearerTokenKey in process.env)) {
-        throw new propertyProvider.TokenProviderError(`Token not present in '${bearerTokenKey}' environment variable`, { logger });
+        throw new config.TokenProviderError(`Token not present in '${bearerTokenKey}' environment variable`, { logger });
     }
     const token = { token: process.env[bearerTokenKey] };
     client.setTokenFeature(token, "BEARER_SERVICE_ENV_VARS", "3");
@@ -47,19 +46,19 @@ const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}, callerClientCo
 
 const validateTokenExpiry = (token) => {
     if (token.expiration && token.expiration.getTime() < Date.now()) {
-        throw new propertyProvider.TokenProviderError(`Token is expired. ${REFRESH_MESSAGE}`, false);
+        throw new config.TokenProviderError(`Token is expired. ${REFRESH_MESSAGE}`, false);
     }
 };
 
 const validateTokenKey = (key, value, forRefresh = false) => {
     if (typeof value === "undefined") {
-        throw new propertyProvider.TokenProviderError(`Value not present for '${key}' in SSO Token${forRefresh ? ". Cannot refresh" : ""}. ${REFRESH_MESSAGE}`, false);
+        throw new config.TokenProviderError(`Value not present for '${key}' in SSO Token${forRefresh ? ". Cannot refresh" : ""}. ${REFRESH_MESSAGE}`, false);
     }
 };
 
 const { writeFile } = node_fs.promises;
 const writeSSOTokenToFile = (id, ssoToken) => {
-    const tokenFilepath = sharedIniFileLoader.getSSOTokenFilepath(id);
+    const tokenFilepath = config.getSSOTokenFilepath(id);
     const tokenString = JSON.stringify(ssoToken, null, 2);
     return writeFile(tokenFilepath, tokenString);
 };
@@ -67,36 +66,36 @@ const writeSSOTokenToFile = (id, ssoToken) => {
 const lastRefreshAttemptTime = new Date(0);
 const fromSso = (init = {}) => async ({ callerClientConfig } = {}) => {
     init.logger?.debug("@aws-sdk/token-providers - fromSso");
-    const profiles = await sharedIniFileLoader.parseKnownFiles(init);
-    const profileName = sharedIniFileLoader.getProfileName({
+    const profiles = await config.parseKnownFiles(init);
+    const profileName = config.getProfileName({
         profile: init.profile ?? callerClientConfig?.profile,
     });
     const profile = profiles[profileName];
     if (!profile) {
-        throw new propertyProvider.TokenProviderError(`Profile '${profileName}' could not be found in shared credentials file.`, false);
+        throw new config.TokenProviderError(`Profile '${profileName}' could not be found in shared credentials file.`, false);
     }
     else if (!profile["sso_session"]) {
-        throw new propertyProvider.TokenProviderError(`Profile '${profileName}' is missing required property 'sso_session'.`);
+        throw new config.TokenProviderError(`Profile '${profileName}' is missing required property 'sso_session'.`);
     }
     const ssoSessionName = profile["sso_session"];
-    const ssoSessions = await sharedIniFileLoader.loadSsoSessionData(init);
+    const ssoSessions = await config.loadSsoSessionData(init);
     const ssoSession = ssoSessions[ssoSessionName];
     if (!ssoSession) {
-        throw new propertyProvider.TokenProviderError(`Sso session '${ssoSessionName}' could not be found in shared credentials file.`, false);
+        throw new config.TokenProviderError(`Sso session '${ssoSessionName}' could not be found in shared credentials file.`, false);
     }
     for (const ssoSessionRequiredKey of ["sso_start_url", "sso_region"]) {
         if (!ssoSession[ssoSessionRequiredKey]) {
-            throw new propertyProvider.TokenProviderError(`Sso session '${ssoSessionName}' is missing required property '${ssoSessionRequiredKey}'.`, false);
+            throw new config.TokenProviderError(`Sso session '${ssoSessionName}' is missing required property '${ssoSessionRequiredKey}'.`, false);
         }
     }
     ssoSession["sso_start_url"];
     const ssoRegion = ssoSession["sso_region"];
     let ssoToken;
     try {
-        ssoToken = await sharedIniFileLoader.getSSOTokenFromFile(ssoSessionName);
+        ssoToken = await config.getSSOTokenFromFile(ssoSessionName);
     }
     catch (e) {
-        throw new propertyProvider.TokenProviderError(`The SSO session token associated with profile=${profileName} was not found or is invalid. ${REFRESH_MESSAGE}`, false);
+        throw new config.TokenProviderError(`The SSO session token associated with profile=${profileName} was not found or is invalid. ${REFRESH_MESSAGE}`, false);
     }
     validateTokenKey("accessToken", ssoToken.accessToken);
     validateTokenKey("expiresAt", ssoToken.expiresAt);
@@ -142,13 +141,13 @@ const fromSso = (init = {}) => async ({ callerClientConfig } = {}) => {
 const fromStatic = ({ token, logger }) => async () => {
     logger?.debug("@aws-sdk/token-providers - fromStatic");
     if (!token || !token.token) {
-        throw new propertyProvider.TokenProviderError(`Please pass a valid token to fromStatic`, false);
+        throw new config.TokenProviderError(`Please pass a valid token to fromStatic`, false);
     }
     return token;
 };
 
-const nodeProvider = (init = {}) => propertyProvider.memoize(propertyProvider.chain(fromSso(init), async () => {
-    throw new propertyProvider.TokenProviderError("Could not load token from any providers", false);
+const nodeProvider = (init = {}) => config.memoize(config.chain(fromSso(init), async () => {
+    throw new config.TokenProviderError("Could not load token from any providers", false);
 }), (token) => token.expiration !== undefined && token.expiration.getTime() - Date.now() < 300000, (token) => token.expiration !== undefined);
 
 exports.fromEnvSigningName = fromEnvSigningName;

package/dist-es/fromEnvSigningName.js

@@ -1,6 +1,6 @@
 import { setTokenFeature } from "@aws-sdk/core/client";
 import { getBearerTokenEnvKey } from "@aws-sdk/core/httpAuthSchemes";
-import { TokenProviderError } from "@smithy/property-provider";
+import { TokenProviderError } from "@smithy/core/config";
 export const fromEnvSigningName = ({ logger, signingName } = {}) => async () => {
     logger?.debug?.("@aws-sdk/token-providers - fromEnvSigningName");
     if (!signingName) {

package/dist-es/fromSso.js

@@ -1,5 +1,4 @@
-import { TokenProviderError } from "@smithy/property-provider";
-import { getProfileName, getSSOTokenFromFile, loadSsoSessionData, parseKnownFiles, } from "@smithy/shared-ini-file-loader";
+import { getProfileName, getSSOTokenFromFile, loadSsoSessionData, parseKnownFiles, TokenProviderError, } from "@smithy/core/config";
 import { EXPIRE_WINDOW_MS, REFRESH_MESSAGE } from "./constants";
 import { getNewSsoOidcToken } from "./getNewSsoOidcToken";
 import { validateTokenExpiry } from "./validateTokenExpiry";

package/dist-es/fromStatic.js

@@ -1,4 +1,4 @@
-import { TokenProviderError } from "@smithy/property-provider";
+import { TokenProviderError } from "@smithy/core/config";
 export const fromStatic = ({ token, logger }) => async () => {
     logger?.debug("@aws-sdk/token-providers - fromStatic");
     if (!token || !token.token) {

package/dist-es/nodeProvider.js

@@ -1,4 +1,4 @@
-import { chain, memoize, TokenProviderError } from "@smithy/property-provider";
+import { chain, memoize, TokenProviderError } from "@smithy/core/config";
 import { fromSso } from "./fromSso";
 export const nodeProvider = (init = {}) => memoize(chain(fromSso(init), async () => {
     throw new TokenProviderError("Could not load token from any providers", false);

package/dist-es/validateTokenExpiry.js

@@ -1,4 +1,4 @@
-import { TokenProviderError } from "@smithy/property-provider";
+import { TokenProviderError } from "@smithy/core/config";
 import { REFRESH_MESSAGE } from "./constants";
 export const validateTokenExpiry = (token) => {
     if (token.expiration && token.expiration.getTime() < Date.now()) {

package/dist-es/validateTokenKey.js

@@ -1,4 +1,4 @@
-import { TokenProviderError } from "@smithy/property-provider";
+import { TokenProviderError } from "@smithy/core/config";
 import { REFRESH_MESSAGE } from "./constants";
 export const validateTokenKey = (key, value, forRefresh = false) => {
     if (typeof value === "undefined") {

package/dist-es/writeSSOTokenToFile.js

@@ -1,4 +1,4 @@
-import { getSSOTokenFilepath } from "@smithy/shared-ini-file-loader";
+import { getSSOTokenFilepath } from "@smithy/core/config";
 import { promises as fsPromises } from "node:fs";
 const { writeFile } = fsPromises;
 export const writeSSOTokenToFile = (id, ssoToken) => {

package/dist-types/fromSso.d.ts

@@ -1,5 +1,5 @@
 import type { CredentialProviderOptions, RuntimeConfigIdentityProvider, TokenIdentity } from "@aws-sdk/types";
-import type { SourceProfileInit } from "@smithy/shared-ini-file-loader";
+import type { SourceProfileInit } from "@smithy/core/config";
 export interface FromSsoInit extends SourceProfileInit, CredentialProviderOptions {
     /**
      * @see SSOOIDCClientConfig in \@aws-sdk/client-sso-oidc.

package/dist-types/getNewSsoOidcToken.d.ts

@@ -1,5 +1,5 @@
 import type { AwsIdentityProperties } from "@aws-sdk/types";
-import type { SSOToken } from "@smithy/shared-ini-file-loader";
+import type { SSOToken } from "@smithy/core/config";
 import type { FromSsoInit } from "./fromSso";
 /**
  * Returns a new SSO OIDC token from SSOOIDC::createToken() API call.

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

@@ -3,7 +3,7 @@ import {
   RuntimeConfigIdentityProvider,
   TokenIdentity,
 } from "@aws-sdk/types";
-import { SourceProfileInit } from "@smithy/shared-ini-file-loader";
+import { SourceProfileInit } from "@smithy/core/config";
 export interface FromSsoInit
   extends SourceProfileInit,
     CredentialProviderOptions {

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

@@ -1,5 +1,5 @@
 import { AwsIdentityProperties } from "@aws-sdk/types";
-import { SSOToken } from "@smithy/shared-ini-file-loader";
+import { SSOToken } from "@smithy/core/config";
 import { FromSsoInit } from "./fromSso";
 export declare const getNewSsoOidcToken: (
   ssoToken: SSOToken,

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

@@ -1,4 +1,4 @@
-import { SSOToken } from "@smithy/shared-ini-file-loader";
+import { SSOToken } from "@smithy/core/config";
 export declare const writeSSOTokenToFile: (
   id: string,
   ssoToken: SSOToken

package/dist-types/writeSSOTokenToFile.d.ts

@@ -1,4 +1,4 @@
-import type { SSOToken } from "@smithy/shared-ini-file-loader";
+import type { SSOToken } from "@smithy/core/config";
 /**
  * Writes SSO token to file based on filepath computed from ssoStartUrl or session name.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/token-providers",
-  "version": "3.1045.0",
+  "version": "3.1046.0",
   "description": "A collection of token providers",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -29,11 +29,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "^3.974.8",
-    "@aws-sdk/nested-clients": "^3.997.6",
+    "@aws-sdk/core": "^3.974.9",
+    "@aws-sdk/nested-clients": "^3.997.7",
     "@aws-sdk/types": "^3.973.8",
-    "@smithy/property-provider": "^4.2.14",
-    "@smithy/shared-ini-file-loader": "^4.4.9",
+    "@smithy/core": "^3.24.1",
     "@smithy/types": "^4.14.1",
     "tslib": "^2.6.2"
   },