chore(core): refactor accountId for submodules

Author: siddsriv

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAccountIdEndpointModeRuntimeConfig.java

@@ -3,102 +3,102 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.typescript.codegen;
+ package software.amazon.smithy.aws.typescript.codegen;
 
-import static software.amazon.smithy.aws.typescript.codegen.AwsTraitsUtils.isAwsService;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.logging.Logger;
-import software.amazon.smithy.aws.traits.ServiceTrait;
-import software.amazon.smithy.codegen.core.SymbolProvider;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.ServiceShape;
-import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
-import software.amazon.smithy.typescript.codegen.endpointsV2.RuleSetParameterFinder;
-import software.amazon.smithy.typescript.codegen.LanguageTarget;
-import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
-import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
-import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
-import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
-import software.amazon.smithy.utils.SmithyInternalApi;
-
-/**
- * Generates accountIdEndpointMode configuration field for service clients that have the eponymous built-in param in the ruleset.
- */
-@SmithyInternalApi
-public final class AddAccountIdEndpointModeRuntimeConfig implements TypeScriptIntegration {
-
-    private static final Logger LOGGER = Logger.getLogger(AddAccountIdEndpointModeRuntimeConfig.class.getName());
-
-    @Override
-    public void addConfigInterfaceFields(
-            TypeScriptSettings settings,
-            Model model,
-            SymbolProvider symbolProvider,
-            TypeScriptWriter writer
-    ) {
-        if (isAwsService(settings, model)) {
-            ServiceShape service = settings.getService(model);
-            EndpointRuleSetTrait endpointRuleSetTrait = service.getTrait(EndpointRuleSetTrait.class);
-            if (endpointRuleSetTrait.isPresent()) {
-                RuleSetParameterFinder ruleSetParameterFinder = new RuleSetParameterFinder(service);
-                if (ruleSetParameterFinder.getBuiltInParams().containsKey("AccountIdEndpointMode")) {
-                    writer.addDependency(AwsDependency.AWS_SDK_CORE);
-                    writer.addImport("AccountIdEndpointMode", "AccountIdEndpointMode", AwsDependency.AWS_SDK_CORE);
-                    writer.writeDocs("Defines if the AWS AccountId will be used for endpoint routing.");
-                    writer.write("accountIdEndpointMode?: AccountIdEndpointMode | __Provider<AccountIdEndpointMode>;\n");
-                }
-            }
-        }
-    }
-        
-
-    @Override
-    public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
-            TypeScriptSettings settings,
-            Model model,
-            SymbolProvider symbolProvider,
-            LanguageTarget target
-        ) {
-            ServiceShape service = settings.getService(model);
-            Map<String, Consumer<TypeScriptWriter>> runtimeConfigs = new HashMap<>();
-            if (isAwsService(settings, model)) {
-                EndpointRuleSetTrait endpointRuleSetTrait = service.getTrait(EndpointRuleSetTrait.class);
-                if (endpointRuleSetTrait.isPresent()) {
-                    RuleSetParameterFinder ruleSetParameterFinder = new RuleSetParameterFinder(service);
-                    if (ruleSetParameterFinder.getBuiltInParams().containsKey("AccountIdEndpointMode")) {
-                        switch (target) {
-                            case BROWSER:
-                                runtimeConfigs.put("accountIdEndpointMode", writer -> {
-                                    writer.addDependency(AwsDependency.AWS_SDK_CORE);
-                                    writer.addImport("DEFAULT_ACCOUNT_ID_ENDPOINT_MODE", "DEFAULT_ACCOUNT_ID_ENDPOINT_MODE",
-                                        AwsDependency.AWS_SDK_CORE);
-                                    writer.write("(() => Promise.resolve(DEFAULT_ACCOUNT_ID_ENDPOINT_MODE))");
-                                });
-                                break;
-                            case NODE:
-                                runtimeConfigs.put("accountIdEndpointMode", writer -> {
-                                    writer.addDependency(TypeScriptDependency.NODE_CONFIG_PROVIDER);
-                                    writer.addImport("loadConfig", "loadNodeConfig",
-                                            TypeScriptDependency.NODE_CONFIG_PROVIDER);
-                                    writer.addDependency(TypeScriptDependency.CONFIG_RESOLVER);
-                                    writer.addImport("NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS", "NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS",
-                                        AwsDependency.AWS_SDK_CORE);
-                                    writer.write(
-                                            "loadNodeConfig(NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS");
-                                });
-                                break;
-                            default:
-                                LOGGER.warning("AccountIdEndpointMode config not supported for target: " + target);
-                                break;
-                            }
-                        }
-                }
-            }
-            return runtimeConfigs;
-        }
-}
+ import static software.amazon.smithy.aws.typescript.codegen.AwsTraitsUtils.isAwsService;
+ 
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.function.Consumer;
+ import java.util.logging.Logger;
+ import software.amazon.smithy.aws.traits.ServiceTrait;
+ import software.amazon.smithy.codegen.core.SymbolProvider;
+ import software.amazon.smithy.model.Model;
+ import software.amazon.smithy.model.shapes.ServiceShape;
+ import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
+ import software.amazon.smithy.typescript.codegen.endpointsV2.RuleSetParameterFinder;
+ import software.amazon.smithy.typescript.codegen.LanguageTarget;
+ import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
+ import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
+ import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
+ import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
+ import software.amazon.smithy.utils.SmithyInternalApi;
+ 
+ /**
+  * Generates accountIdEndpointMode configuration field for service clients that have the eponymous built-in param in the ruleset.
+  */
+ @SmithyInternalApi
+ public final class AddAccountIdEndpointModeRuntimeConfig implements TypeScriptIntegration {
+ 
+     private static final Logger LOGGER = Logger.getLogger(AddAccountIdEndpointModeRuntimeConfig.class.getName());
+ 
+     @Override
+     public void addConfigInterfaceFields(
+         TypeScriptSettings settings,
+         Model model,
+         SymbolProvider symbolProvider,
+         TypeScriptWriter writer
+     ) {
+         if (isAwsService(settings, model)) {
+             ServiceShape service = settings.getService(model);
+             EndpointRuleSetTrait endpointRuleSetTrait = service.getTrait(EndpointRuleSetTrait.class);
+             if (endpointRuleSetTrait.isPresent()) {
+                 RuleSetParameterFinder ruleSetParameterFinder = new RuleSetParameterFinder(service);
+                 if (ruleSetParameterFinder.getBuiltInParams().containsKey("AccountIdEndpointMode")) {
+                     writer.addDependency(AwsDependency.AWS_SDK_CORE);
+                     writer.addImport("AccountIdEndpointMode", "AccountIdEndpointMode", AwsDependency.AWS_SDK_CORE);
+                     writer.writeDocs("Defines if the AWS AccountId will be used for endpoint routing.");
+                     writer.write("accountIdEndpointMode?: AccountIdEndpointMode | __Provider<AccountIdEndpointMode>;\n");
+                 }
+             }
+         }
+     }
+ 
+ 
+     @Override
+     public Map < String, Consumer < TypeScriptWriter >> getRuntimeConfigWriters(
+         TypeScriptSettings settings,
+         Model model,
+         SymbolProvider symbolProvider,
+         LanguageTarget target
+     ) {
+         ServiceShape service = settings.getService(model);
+         Map < String, Consumer < TypeScriptWriter >> runtimeConfigs = new HashMap < > ();
+         if (isAwsService(settings, model)) {
+             EndpointRuleSetTrait endpointRuleSetTrait = service.getTrait(EndpointRuleSetTrait.class);
+             if (endpointRuleSetTrait.isPresent()) {
+                 RuleSetParameterFinder ruleSetParameterFinder = new RuleSetParameterFinder(service);
+                 if (ruleSetParameterFinder.getBuiltInParams().containsKey("AccountIdEndpointMode")) {
+                     switch (target) {
+                         case BROWSER:
+                             runtimeConfigs.put("accountIdEndpointMode", writer - > {
+                                 writer.addDependency(AwsDependency.AWS_SDK_CORE);
+                                 writer.addImport("DEFAULT_ACCOUNT_ID_ENDPOINT_MODE", "DEFAULT_ACCOUNT_ID_ENDPOINT_MODE",
+                                     AwsDependency.AWS_SDK_CORE);
+                                 writer.write("(() => Promise.resolve(DEFAULT_ACCOUNT_ID_ENDPOINT_MODE))");
+                             });
+                             break;
+                         case NODE:
+                             runtimeConfigs.put("accountIdEndpointMode", writer - > {
+                                 writer.addDependency(TypeScriptDependency.NODE_CONFIG_PROVIDER);
+                                 writer.addImport("loadConfig", "loadNodeConfig",
+                                     TypeScriptDependency.NODE_CONFIG_PROVIDER);
+                                 writer.addDependency(TypeScriptDependency.CONFIG_RESOLVER);
+                                 writer.addImport("NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS", "NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS",
+                                     AwsDependency.AWS_SDK_CORE);
+                                 writer.write(
+                                     "loadNodeConfig(NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS");
+                             });
+                             break;
+                         default:
+                             LOGGER.warning("AccountIdEndpointMode config not supported for target: " + target);
+                             break;
+                     }
+                 }
+             }
+         }
+         return runtimeConfigs;
+     }
+ }

packages/core/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@aws-sdk/core",
-  "version": "3.556.0",
+  "version": "3.582.0",
   "description": "Core functions & classes shared by multiple AWS SDK clients",
   "scripts": {
-    "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
+    "build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline core",
     "build:es": "tsc -p tsconfig.es.json",
     "build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build",
@@ -18,22 +18,66 @@
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
+  "exports": {
+    ".": {
+      "node": "./dist-cjs/index.js",
+      "import": "./dist-es/index.js",
+      "require": "./dist-cjs/index.js",
+      "types": "./dist-types/index.d.ts"
+    },
+    "./package.json": {
+      "node": "./package.json",
+      "import": "./package.json",
+      "require": "./package.json"
+    },
+    "./client": {
+      "node": "./dist-cjs/submodules/client/index.js",
+      "import": "./dist-es/submodules/client/index.js",
+      "require": "./dist-cjs/submodules/client/index.js",
+      "types": "./dist-types/submodules/client/index.d.ts"
+    },
+    "./httpAuthSchemes": {
+      "node": "./dist-cjs/submodules/httpAuthSchemes/index.js",
+      "import": "./dist-es/submodules/httpAuthSchemes/index.js",
+      "require": "./dist-cjs/submodules/httpAuthSchemes/index.js",
+      "types": "./dist-types/submodules/httpAuthSchemes/index.d.ts"
+    },
+    "./account-id-endpoint": {
+      "node": "./dist-cjs/submodules/account-id-endpoint/index.js",
+      "import": "./dist-es/submodules/account-id-endpoint/index.js",
+      "require": "./dist-cjs/submodules/account-id-endpoint/index.js",
+      "types": "./dist-types/submodules/account-id-endpoint/index.d.ts"
+    },
+    "./protocols": {
+      "node": "./dist-cjs/submodules/protocols/index.js",
+      "import": "./dist-es/submodules/protocols/index.js",
+      "require": "./dist-cjs/submodules/protocols/index.js",
+      "types": "./dist-types/submodules/protocols/index.d.ts"
+    }
+  },
+  "files": [
+    "dist-*/**",
+    "./client.js",
+    "./httpAuthSchemes.js",
+    "./account-id-endpoint.js",
+    "./protocols.js"
+  ],
   "sideEffects": false,
   "author": {
     "name": "AWS SDK for JavaScript Team",
     "url": "https://aws.amazon.com/javascript/"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@smithy/core": "^1.4.2",
-    "@smithy/protocol-http": "^3.3.0",
-    "@smithy/signature-v4": "^2.3.0",
-    "@smithy/smithy-client": "^2.5.1",
-    "@smithy/types": "^2.12.0",
+    "@smithy/core": "^2.0.1",
+    "@smithy/protocol-http": "^4.0.0",
+    "@smithy/signature-v4": "^3.0.0",
+    "@smithy/smithy-client": "^3.0.1",
+    "@smithy/types": "^3.0.0",
     "fast-xml-parser": "4.2.5",
     "tslib": "^2.6.2",
-    "@smithy/node-config-provider": "^2.3.0",
-    "@smithy/util-middleware": "^2.2.0"
+    "@smithy/node-config-provider": "^3.0.0",
+    "@smithy/util-middleware": "^3.0.0"
   },
   "devDependencies": {
     "@tsconfig/recommended": "1.0.1",
@@ -43,7 +87,7 @@
     "typescript": "~4.9.5"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "typesVersions": {
     "<4.0": {

packages/core/src/submodules/account-id-endpoint/AccountIdEndpointModeConfigResolver.ts

@@ -0,0 +1,56 @@
+import { Provider } from "@smithy/types";
+import { normalizeProvider } from "@smithy/util-middleware";
+
+import {
+  AccountIdEndpointMode,
+  DEFAULT_ACCOUNT_ID_ENDPOINT_MODE,
+  validateAccountIdEndpointMode,
+} from "./AccountIdEndpointModeConstants";
+
+/**
+ * @public
+ */
+export interface AccountIdEndpointModeInputConfig {
+  /**
+   * The account ID endpoint mode to use.
+   */
+  accountIdEndpointMode?: AccountIdEndpointMode | Provider<AccountIdEndpointMode>;
+}
+
+/**
+ * @internal
+ */
+interface PreviouslyResolved {}
+
+/**
+ * @internal
+ */
+export interface AccountIdEndpointModeResolvedConfig {
+  /**
+   * Resolved value for input config {config.accountIdEndpointMode}
+   */
+  accountIdEndpointMode: Provider<AccountIdEndpointMode>;
+}
+
+/**
+ * @internal
+ */
+export const resolveAccountIdEndpointModeConfig = <T>(
+  input: T & AccountIdEndpointModeInputConfig & PreviouslyResolved
+): T & AccountIdEndpointModeResolvedConfig => {
+  return {
+    ...input,
+    accountIdEndpointMode: async () => {
+      const accountIdEndpointModeProvider = normalizeProvider(
+        input.accountIdEndpointMode ?? DEFAULT_ACCOUNT_ID_ENDPOINT_MODE
+      );
+      const accIdMode = await accountIdEndpointModeProvider();
+      if (!validateAccountIdEndpointMode(accIdMode)) {
+        throw new Error(
+          `Invalid value for accountIdEndpointMode: ${accIdMode}. Valid values are: "required", "preferred", "disabled".`
+        );
+      }
+      return accIdMode;
+    },
+  };
+};

packages/core/src/submodules/account-id-endpoint/AccountIdEndpointModeConstants.spec.ts

@@ -0,0 +1,43 @@
+import { validateAccountIdEndpointMode } from "./AccountIdEndpointModeConstants";
+
+describe("validateAccountIdEndpointMode", () => {
+  it('should return true for "disabled"', () => {
+    const result = validateAccountIdEndpointMode("disabled");
+    expect(result).toBe(true);
+  });
+
+  it('should return true for "preferred"', () => {
+    const result = validateAccountIdEndpointMode("preferred");
+    expect(result).toBe(true);
+  });
+
+  it('should return true for "required"', () => {
+    const result = validateAccountIdEndpointMode("required");
+    expect(result).toBe(true);
+  });
+
+  it("should return false for an invalid value", () => {
+    const result = validateAccountIdEndpointMode("invalidValue");
+    expect(result).toBe(false);
+  });
+
+  it("should return false for an empty string", () => {
+    const result = validateAccountIdEndpointMode("");
+    expect(result).toBe(false);
+  });
+
+  it("should return false for a number", () => {
+    const result = validateAccountIdEndpointMode(123);
+    expect(result).toBe(false);
+  });
+
+  it("should return false for null", () => {
+    const result = validateAccountIdEndpointMode(null);
+    expect(result).toBe(false);
+  });
+
+  it("should return false for undefined", () => {
+    const result = validateAccountIdEndpointMode(undefined);
+    expect(result).toBe(false);
+  });
+});