fix(nested-clients): introduce submodules for nested-clients

Author: kuhe

.eslintrc.js

@@ -29,5 +29,8 @@ module.exports = {
     "simple-import-sort/imports": "error",
     "sort-export-all/sort-export-all": "error",
   },
-  ignorePatterns: ["packages/nested-clients/**/protocols/**.ts"],
+  ignorePatterns: [
+    "packages/nested-clients/src/submodules/**/protocols/*.ts",
+    "packages/nested-clients/src/submodules/**/models/*.ts",
+  ],
 };

packages/core/package.json

@@ -9,7 +9,7 @@
     "build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build",
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "lint": "node ./scripts/lint.js",
+    "lint": "node ../../scripts/validation/submodules-linter.js --pkg core",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
     "extract:docs": "api-extractor run --local",
     "test": "yarn g:vitest run",

packages/core/scripts/lint.js

@@ -6,7 +6,7 @@ import { isAssumeRoleProfile, resolveAssumeRoleCredentials } from "./resolveAssu
 import { resolveCredentialSource } from "./resolveCredentialSource";
 import { resolveProfileData } from "./resolveProfileData";
 
-vi.mock("@aws-sdk/nested-clients", () => {
+vi.mock("@aws-sdk/nested-clients/sts", () => {
   return {
     getDefaultRoleAssumer: vi.fn().mockReturnValue(async () => ({})),
   };

packages/credential-provider-ini/src/resolveAssumeRoleCredentials.spec.ts

@@ -111,7 +111,7 @@ export const resolveAssumeRoleCredentials = async (
   const { source_profile, region } = profileData;
 
   if (!options.roleAssumer) {
-    const { getDefaultRoleAssumer } = await import("@aws-sdk/nested-clients");
+    const { getDefaultRoleAssumer } = await import("@aws-sdk/nested-clients/sts");
     options.roleAssumer = getDefaultRoleAssumer(
       {
         ...options.clientConfig,

packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts

@@ -1,4 +1,4 @@
-import { getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients";
+import { getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients/sts";
 import { afterEach, describe, expect, test as it, vi } from "vitest";
 
 import { fromWebToken } from "./fromWebToken";
@@ -16,7 +16,7 @@ const MOCK_CREDS = {
   sessionToken: "sessionToken",
 };
 
-vi.mock("@aws-sdk/nested-clients", () => ({
+vi.mock("@aws-sdk/nested-clients/sts", () => ({
   getDefaultRoleAssumerWithWebIdentity: vi.fn().mockReturnValue(() => {}),
 }));
 

packages/credential-provider-web-identity/src/fromWebToken.spec.ts

@@ -163,7 +163,7 @@ export const fromWebToken =
     let { roleAssumerWithWebIdentity } = init;
 
     if (!roleAssumerWithWebIdentity) {
-      const { getDefaultRoleAssumerWithWebIdentity } = await import("@aws-sdk/nested-clients");
+      const { getDefaultRoleAssumerWithWebIdentity } = await import("@aws-sdk/nested-clients/sts");
       roleAssumerWithWebIdentity = getDefaultRoleAssumerWithWebIdentity(
         {
           ...init.clientConfig,

packages/credential-provider-web-identity/src/fromWebToken.ts

@@ -1,13 +1,13 @@
 import { fromIni as coreProvider } from "@aws-sdk/credential-provider-ini";
-import { getDefaultRoleAssumer, getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients";
+import { getDefaultRoleAssumer, getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients/sts";
 import { beforeEach, describe, expect, test as it, vi } from "vitest";
 
 import { fromIni } from "./fromIni";
 
 const mockRoleAssumer = vi.fn().mockResolvedValue("ROLE_ASSUMER");
 const mockRoleAssumerWithWebIdentity = vi.fn().mockResolvedValue("ROLE_ASSUMER_WITH_WEB_IDENTITY");
 
-vi.mock("@aws-sdk/nested-clients", () => ({
+vi.mock("@aws-sdk/nested-clients/sts", () => ({
   getDefaultRoleAssumer: vi.fn().mockImplementation(() => mockRoleAssumer),
   getDefaultRoleAssumerWithWebIdentity: vi.fn().mockImplementation(() => mockRoleAssumerWithWebIdentity),
 }));

packages/credential-providers/src/fromIni.spec.ts

@@ -1,13 +1,13 @@
 import { defaultProvider } from "@aws-sdk/credential-provider-node";
-import { getDefaultRoleAssumer, getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients";
+import { getDefaultRoleAssumer, getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients/sts";
 import { beforeEach, describe, expect, test as it, vi } from "vitest";
 
 import { fromNodeProviderChain } from "./fromNodeProviderChain";
 
 const mockRoleAssumer = vi.fn().mockResolvedValue("ROLE_ASSUMER");
 const mockRoleAssumerWithWebIdentity = vi.fn().mockResolvedValue("ROLE_ASSUMER_WITH_WEB_IDENTITY");
 
-vi.mock("@aws-sdk/nested-clients", () => ({
+vi.mock("@aws-sdk/nested-clients/sts", () => ({
   getDefaultRoleAssumer: vi.fn().mockImplementation(() => mockRoleAssumer),
   getDefaultRoleAssumerWithWebIdentity: vi.fn().mockImplementation(() => mockRoleAssumerWithWebIdentity),
 }));

packages/credential-providers/src/fromNodeProviderChain.spec.ts

@@ -1,11 +1,11 @@
-import { AssumeRoleCommand, STSClient } from "@aws-sdk/nested-clients";
+import { AssumeRoleCommand, STSClient } from "@aws-sdk/nested-clients/sts";
 import { beforeEach, describe, expect, test as it, vi } from "vitest";
 
 import { fromTemporaryCredentials } from "./fromTemporaryCredentials";
 
 const mockSend = vi.fn();
 const mockUsePlugin = vi.fn();
-vi.mock("@aws-sdk/nested-clients", () => ({
+vi.mock("@aws-sdk/nested-clients/sts", () => ({
   STSClient: vi.fn().mockImplementation((config) => ({
     config,
     send: vi.fn().mockImplementation(async function (command) {