chore(codegen): add dependencies required by default credential provi…

…ders
aws · May 2, 2024 · cc96557 · cc96557
1 parent 003de3f
commit cc96557
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git a/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java b/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java
@@ -212,6 +212,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                             .addImport("defaultProvider", "credentialDefaultProvider",
                                 AwsDependency.CREDENTIAL_PROVIDER_NODE)
                             .write("credentialDefaultProvider");
+                        AwsCredentialProviderUtils.addAwsCredentialProviderDependencies(service, writer);
                     }
                 );
             default:

diff --git a/...c/main/java/software/amazon/smithy/aws/typescript/codegen/AwsCredentialProviderUtils.java b/...c/main/java/software/amazon/smithy/aws/typescript/codegen/AwsCredentialProviderUtils.java
@@ -0,0 +1,33 @@
+package software.amazon.smithy.aws.typescript.codegen;
+
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
+import software.amazon.smithy.utils.SmithyInternalApi;
+
+/**
+ * Utility methods related to AWS traits.
+ */
+@SmithyInternalApi
+public final class AwsCredentialProviderUtils {
+
+    private AwsCredentialProviderUtils() {}
+
+    /**
+     * Adds dependencies required by the default credential provider.
+     * The dependencies are skipped in first party credential providers to avoid circular dependency issue.
+     *
+     * @param service
+     * @param writer
+     */
+    public static void addAwsCredentialProviderDependencies(ServiceShape service, TypeScriptWriter writer) {
+        if (!service.getId().equals(ShapeId.from("com.amazonaws.ssooidc#AWSSSOOIDCService"))) {
+            // SSO OIDC client is required in Sso credential provider
+            writer.addDependency(AwsDependency.SSO_OIDC_CLIENT);
+        }
+        if (!service.getId().equals(ShapeId.from("com.amazonaws.sts#AWSSecurityTokenServiceV20110615"))) {
+            // STS client is required in Ini and WebIdentity credential providers
+            writer.addDependency(AwsDependency.STS_CLIENT);
+        }
+    }
+}
diff --git a/...pt-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java b/...pt-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java
@@ -67,6 +67,7 @@ public enum AwsDependency implements Dependency {
     TRANSCRIBE_STREAMING_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-transcribe-streaming"),
     STS_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-sts"),
     STS_CLIENT(NORMAL_DEPENDENCY, "@aws-sdk/client-sts"),
+    SSO_OIDC_CLIENT(NORMAL_DEPENDENCY, "@aws-sdk/client-sso-oidc"),
     MIDDLEWARE_LOGGER(NORMAL_DEPENDENCY, "@aws-sdk/middleware-logger"),
     MIDDLEWARE_USER_AGENT("dependencies", "@aws-sdk/middleware-user-agent"),
     AWS_SDK_UTIL_USER_AGENT_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/util-user-agent-browser"),

diff --git a/.../amazon/smithy/aws/typescript/codegen/auth/http/integration/AddSTSAuthCustomizations.java b/.../amazon/smithy/aws/typescript/codegen/auth/http/integration/AddSTSAuthCustomizations.java
@@ -14,6 +14,7 @@
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 import software.amazon.smithy.aws.traits.auth.SigV4Trait;
+import software.amazon.smithy.aws.typescript.codegen.AwsCredentialProviderUtils;
 import software.amazon.smithy.aws.typescript.codegen.AwsDependency;
 import software.amazon.smithy.aws.typescript.codegen.AwsTraitsUtils;
 import software.amazon.smithy.codegen.core.Symbol;
@@ -114,6 +115,8 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                             .addImport("defaultProvider", "credentialDefaultProvider",
                                 AwsDependency.CREDENTIAL_PROVIDER_NODE)
                             .write("credentialDefaultProvider");
+                        AwsCredentialProviderUtils.addAwsCredentialProviderDependencies(
+                            settings.getService(model), writer);
                     }
                 );
             default:

diff --git a/.../amazon/smithy/aws/typescript/codegen/auth/http/integration/AwsSdkCustomizeSigV4Auth.java b/.../amazon/smithy/aws/typescript/codegen/auth/http/integration/AwsSdkCustomizeSigV4Auth.java
@@ -14,6 +14,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import software.amazon.smithy.aws.traits.auth.SigV4Trait;
+import software.amazon.smithy.aws.typescript.codegen.AwsCredentialProviderUtils;
 import software.amazon.smithy.aws.typescript.codegen.AwsDependency;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
@@ -115,6 +116,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                                 .addImport("defaultProvider", "credentialDefaultProvider",
                                     AwsDependency.CREDENTIAL_PROVIDER_NODE)
                                 .write("credentialDefaultProvider");
+                            AwsCredentialProviderUtils.addAwsCredentialProviderDependencies(service, writer);
                         }
                     );
                 }