chore: replace loadSts/loadSsoOidc with client dynamic imports

The types were being emitted without ts-expect-error
aws · Apr 26, 2024 · 3dee0da · 3dee0da
1 parent 2e0c221
commit 3dee0da
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 32 deletions.
diff --git a/packages/credential-provider-ini/src/fromIni.ts b/packages/credential-provider-ini/src/fromIni.ts
@@ -3,7 +3,6 @@ import type { CredentialProviderOptions } from "@aws-sdk/types";
 import { getProfileName, parseKnownFiles, SourceProfileInit } from "@smithy/shared-ini-file-loader";
 import type { AwsCredentialIdentity, AwsCredentialIdentityProvider, Pluggable } from "@smithy/types";
 
-import type { STSClientConfig } from "./loadSts";
 import { AssumeRoleParams } from "./resolveAssumeRoleCredentials";
 import { resolveProfileData } from "./resolveProfileData";
 
@@ -39,7 +38,7 @@ export interface FromIniInit extends SourceProfileInit, CredentialProviderOption
    */
   roleAssumerWithWebIdentity?: (params: AssumeRoleWithWebIdentityParams) => Promise<AwsCredentialIdentity>;
 
-  clientConfig?: STSClientConfig;
+  clientConfig?: any; // STSClientConfig;
   clientPlugins?: Pluggable<any, any>[];
 }
 

diff --git a/packages/credential-provider-ini/src/loadSts.ts b/packages/credential-provider-ini/src/loadSts.ts
diff --git a/packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts b/packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts
@@ -87,7 +87,8 @@ export const resolveAssumeRoleCredentials = async (
   const data = profiles[profileName];
 
   if (!options.roleAssumer) {
-    const { getDefaultRoleAssumer } = await import("./loadSts");
+    // @ts-expect-error Cannot find module '@aws-sdk/client-sts'
+    const { getDefaultRoleAssumer } = await import("@aws-sdk/client-sts");
     options.roleAssumer = getDefaultRoleAssumer(
       {
         ...options.clientConfig,

diff --git a/packages/credential-provider-web-identity/src/fromWebToken.ts b/packages/credential-provider-web-identity/src/fromWebToken.ts
@@ -1,8 +1,6 @@
 import type { CredentialProviderOptions } from "@aws-sdk/types";
 import type { AwsCredentialIdentity, AwsCredentialIdentityProvider, Pluggable } from "@smithy/types";
 
-import type { STSClientConfig } from "./loadSts";
-
 /**
  * @public
  */
@@ -140,7 +138,7 @@ export interface FromWebTokenInit
   /**
    * @internal
    */
-  clientConfig?: STSClientConfig;
+  clientConfig?: any; // STSClientConfig;
 
   /**
    * @internal
@@ -160,7 +158,8 @@ export const fromWebToken =
     let { roleAssumerWithWebIdentity } = init;
 
     if (!roleAssumerWithWebIdentity) {
-      const { getDefaultRoleAssumerWithWebIdentity } = await import("./loadSts");
+      // @ts-expect-error Cannot find module '@aws-sdk/client-sts'
+      const { getDefaultRoleAssumerWithWebIdentity } = await import("@aws-sdk/client-sts");
       roleAssumerWithWebIdentity = getDefaultRoleAssumerWithWebIdentity(
         {
           ...init.clientConfig,

diff --git a/packages/credential-provider-web-identity/src/loadSts.ts b/packages/credential-provider-web-identity/src/loadSts.ts
diff --git a/packages/credential-providers/package.json b/packages/credential-providers/package.json
@@ -30,6 +30,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity": "*",
     "@aws-sdk/client-sso": "*",
+    "@aws-sdk/client-sts": "*",
     "@aws-sdk/credential-provider-cognito-identity": "*",
     "@aws-sdk/credential-provider-env": "*",
     "@aws-sdk/credential-provider-http": "*",
@@ -52,9 +53,6 @@
     "rimraf": "3.0.2",
     "typescript": "~4.9.5"
   },
-  "peerDependencies": {
-    "@aws-sdk/client-sts": "*"
-  },
   "types": "./dist-types/index.d.ts",
   "engines": {
     "node": ">=14.0.0"

diff --git a/packages/credential-providers/src/loadSts.ts b/packages/credential-providers/src/loadSts.ts
@@ -1,4 +1,3 @@
-// @ts-expect-error Cannot find module '@aws-sdk/client-sts'
 import { AssumeRoleCommand, STSClient } from "@aws-sdk/client-sts";
 
 // This file must be loaded dynamically.

diff --git a/packages/token-providers/src/getNewSsoOidcToken.ts b/packages/token-providers/src/getNewSsoOidcToken.ts
@@ -7,7 +7,8 @@ import { getSsoOidcClient } from "./getSsoOidcClient";
  * @internal
  */
 export const getNewSsoOidcToken = async (ssoToken: SSOToken, ssoRegion: string) => {
-  const { CreateTokenCommand } = await import("./loadSsoOidc");
+  // @ts-expect-error Cannot find module '@aws-sdk/client-sso-oidc'
+  const { CreateTokenCommand } = await import("@aws-sdk/client-sso-oidc");
 
   const ssoOidcClient = await getSsoOidcClient(ssoRegion);
   return ssoOidcClient.send(

diff --git a/packages/token-providers/src/getSsoOidcClient.ts b/packages/token-providers/src/getSsoOidcClient.ts
@@ -6,7 +6,8 @@ const ssoOidcClientsHash: Record<string, any> = {};
  * @internal
  */
 export const getSsoOidcClient = async (ssoRegion: string) => {
-  const { SSOOIDCClient } = await import("./loadSsoOidc");
+  // @ts-expect-error Cannot find module '@aws-sdk/client-sso-oidc'
+  const { SSOOIDCClient } = await import("@aws-sdk/client-sso-oidc");
 
   // return ssoOidsClient if already created.
   if (ssoOidcClientsHash[ssoRegion]) {

diff --git a/packages/token-providers/src/loadSsoOidc.ts b/packages/token-providers/src/loadSsoOidc.ts