Skip integrations that are not relevant for non-AWS services

This is an initial version to get a working version of generated code
that compiles without manual edits in smithy-typescript-ssdk-demo. I
expect to make updates to this logic.

Author: gosar

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

@@ -44,6 +44,8 @@
 /**
  * Configure clients with AWS auth configurations and plugin.
  */
+// TODO: Should this check for the presence of SigV4 trait instead of assuming the AWS service supports it?
+// TODO: Think about AWS Auth supported for only some operations and not all, when not AWS service
 public final class AddAwsAuthPlugin implements TypeScriptIntegration {
 
     @Override
@@ -54,7 +56,7 @@ public void addConfigInterfaceFields(
         TypeScriptWriter writer
     ) {
         ServiceShape service = settings.getService(model);
-        if (!areAllOptionalAuthOperations(model, service)) {
+        if (isAwsService(service) && !areAllOptionalAuthOperations(model, service)) {
             writer.addImport("Credentials", "__Credentials", TypeScriptDependency.AWS_SDK_TYPES.packageName);
             writer.writeDocs("Default credentials provider; Not available in browser runtime.")
                 .write("credentialDefaultProvider?: (input: any) => __Provider<__Credentials>;\n");
@@ -66,16 +68,17 @@ public List<RuntimeClientPlugin> getClientPlugins() {
         return ListUtils.of(
             RuntimeClientPlugin.builder()
                     .withConventions(AwsDependency.MIDDLEWARE_SIGNING.dependency, "AwsAuth", HAS_CONFIG)
-                    .servicePredicate((m, s) -> !areAllOptionalAuthOperations(m, s))
+                    .servicePredicate((m, s) -> isAwsService(s) && !areAllOptionalAuthOperations(m, s))
                     .build(),
             RuntimeClientPlugin.builder()
                     .withConventions(AwsDependency.MIDDLEWARE_SIGNING.dependency, "AwsAuth", HAS_MIDDLEWARE)
                     // See operationUsesAwsAuth() below for AwsAuth Middleware customizations.
                     .servicePredicate(
-                        (m, s) -> !testServiceId(s, "STS") && !hasOptionalAuthOperation(m, s)
+                        (m, s) -> isAwsService(s) && !testServiceId(s, "STS") && !hasOptionalAuthOperation(m, s)
                     ).build(),
             RuntimeClientPlugin.builder()
                     .withConventions(AwsDependency.MIDDLEWARE_SIGNING.dependency, "AwsAuth", HAS_MIDDLEWARE)
+                    // TODO: Does isAwsService need to be checked here again?
                     .operationPredicate(AddAwsAuthPlugin::operationUsesAwsAuth)
                     .build()
         );
@@ -89,7 +92,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
         LanguageTarget target
     ) {
         ServiceShape service = settings.getService(model);
-        if (areAllOptionalAuthOperations(model, service)) {
+        if (!isAwsService(service) || areAllOptionalAuthOperations(model, service)) {
             return Collections.emptyMap();
         }
         switch (target) {
@@ -119,6 +122,10 @@ private static boolean testServiceId(Shape serviceShape, String expectedId) {
         return serviceShape.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse("").equals(expectedId);
     }
 
+    private static boolean isAwsService(Shape serviceShape) {
+        return serviceShape.getTrait(ServiceTrait.class).isPresent();
+    }
+
     private static boolean operationUsesAwsAuth(Model model, ServiceShape service, OperationShape operation) {
         // STS doesn't need auth for AssumeRoleWithWebIdentity, AssumeRoleWithSAML.
         // Remove when optionalAuth model update is published in 0533102932.

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

@@ -82,10 +82,12 @@ public void addConfigInterfaceFields(
         writer.addImport("Provider", "__Provider", TypeScriptDependency.AWS_SDK_TYPES.packageName);
         writer.addImport("Logger", "__Logger", TypeScriptDependency.AWS_SDK_TYPES.packageName);
 
-        writer.writeDocs("Unique service identifier.\n@internal")
-                .write("serviceId?: string;\n");
-        writer.writeDocs("The AWS region to which this client will send requests")
-                .write("region?: string | __Provider<string>;\n");
+        if (isAwsService(settings, model)) {
+            writer.writeDocs("Unique service identifier.\n@internal")
+                    .write("serviceId?: string;\n");
+            writer.writeDocs("The AWS region to which this client will send requests")
+                    .write("region?: string | __Provider<string>;\n");
+        }
         writer.writeDocs("Value for how many times a request will be made at most in case of retry.")
                 .write("maxAttempts?: number | __Provider<number>;\n");
         writer.writeDocs("Optional logger for logging debug/info/warn/error.")
@@ -114,11 +116,12 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                         + "trait was found on " + service.getId());
             }
         }
-        runtimeConfigs.putAll(getDefaultConfig(target));
+        runtimeConfigs.putAll(getDefaultConfig(target, isAwsService(settings, model)));
         return runtimeConfigs;
     }
 
-    private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget target) {
+    private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget target, boolean isAwsService) {
+        Map<String, Consumer<TypeScriptWriter>> defaultConfigs = new HashMap();
         switch (target) {
             case SHARED:
                 return MapUtils.of(
@@ -128,42 +131,51 @@ private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget
                         }
                 );
             case BROWSER:
-                return MapUtils.of(
-                        "region", writer -> {
-                            writer.addDependency(TypeScriptDependency.INVALID_DEPENDENCY);
-                            writer.addImport("invalidProvider", "invalidProvider",
-                                    TypeScriptDependency.INVALID_DEPENDENCY.packageName);
-                            writer.write("region: invalidProvider(\"Region is missing\"),");
-                        },
-                        "maxAttempts", writer -> {
-                            writer.addDependency(TypeScriptDependency.MIDDLEWARE_RETRY);
-                            writer.addImport("DEFAULT_MAX_ATTEMPTS", "DEFAULT_MAX_ATTEMPTS",
-                                    TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
-                            writer.write("maxAttempts: DEFAULT_MAX_ATTEMPTS,");
-                        }
-                );
+                if (isAwsService) {
+                    defaultConfigs.put("region", writer -> {
+                        writer.addDependency(TypeScriptDependency.INVALID_DEPENDENCY);
+                        writer.addImport("invalidProvider", "invalidProvider",
+                                TypeScriptDependency.INVALID_DEPENDENCY.packageName);
+                        writer.write("region: invalidProvider(\"Region is missing\"),");
+                    });
+                }
+                defaultConfigs.put("maxAttempts", writer -> {
+                    writer.addDependency(TypeScriptDependency.MIDDLEWARE_RETRY);
+                    writer.addImport("DEFAULT_MAX_ATTEMPTS", "DEFAULT_MAX_ATTEMPTS",
+                            TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
+                    writer.write("maxAttempts: DEFAULT_MAX_ATTEMPTS,");
+                });
+                return defaultConfigs;
             case NODE:
-                return MapUtils.of(
-                        "region", writer -> {
-                            writer.addDependency(AwsDependency.NODE_CONFIG_PROVIDER);
-                            writer.addImport("loadConfig", "loadNodeConfig",
-                                    AwsDependency.NODE_CONFIG_PROVIDER.packageName);
-                            writer.addDependency(TypeScriptDependency.CONFIG_RESOLVER);
-                            writer.addImport("NODE_REGION_CONFIG_OPTIONS", "NODE_REGION_CONFIG_OPTIONS",
-                                    TypeScriptDependency.CONFIG_RESOLVER.packageName);
-                            writer.addImport("NODE_REGION_CONFIG_FILE_OPTIONS", "NODE_REGION_CONFIG_FILE_OPTIONS",
-                                    TypeScriptDependency.CONFIG_RESOLVER.packageName);
-                            writer.write(
+                if (isAwsService) {
+                    defaultConfigs.put("region", writer -> {
+                        writer.addDependency(AwsDependency.NODE_CONFIG_PROVIDER);
+                        writer.addImport("loadConfig", "loadNodeConfig",
+                                AwsDependency.NODE_CONFIG_PROVIDER.packageName);
+                        writer.addDependency(TypeScriptDependency.CONFIG_RESOLVER);
+                        writer.addImport("NODE_REGION_CONFIG_OPTIONS", "NODE_REGION_CONFIG_OPTIONS",
+                                TypeScriptDependency.CONFIG_RESOLVER.packageName);
+                        writer.addImport("NODE_REGION_CONFIG_FILE_OPTIONS", "NODE_REGION_CONFIG_FILE_OPTIONS",
+                                TypeScriptDependency.CONFIG_RESOLVER.packageName);
+                        writer.write(
                                 "region: loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),");
-                        },
-                        "maxAttempts", writer -> {
-                            writer.addImport("NODE_MAX_ATTEMPT_CONFIG_OPTIONS", "NODE_MAX_ATTEMPT_CONFIG_OPTIONS",
-                                TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
-                            writer.write("maxAttempts: loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),");
-                        }
-                );
+                    });
+                }
+                defaultConfigs.put("maxAttempts", writer -> {
+                    writer.addDependency(AwsDependency.NODE_CONFIG_PROVIDER);
+                    writer.addImport("loadConfig", "loadNodeConfig",
+                            AwsDependency.NODE_CONFIG_PROVIDER.packageName);
+                    writer.addImport("NODE_MAX_ATTEMPT_CONFIG_OPTIONS", "NODE_MAX_ATTEMPT_CONFIG_OPTIONS",
+                        TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
+                    writer.write("maxAttempts: loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),");
+                });
+                return defaultConfigs;
             default:
                 return Collections.emptyMap();
         }
     }
+
+    private static boolean isAwsService(TypeScriptSettings settings, Model model) {
+        return settings.getService(model).getTrait(ServiceTrait.class).isPresent();
+    }
 }

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

@@ -44,6 +44,7 @@ public List<RuntimeClientPlugin> getClientPlugins() {
         return ListUtils.of(
                 RuntimeClientPlugin.builder()
                         .withConventions(TypeScriptDependency.CONFIG_RESOLVER.dependency, "Region", HAS_CONFIG)
+                        .servicePredicate((m, s) -> testAwsService(s))
                         .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions(TypeScriptDependency.CONFIG_RESOLVER.dependency, "Endpoints", HAS_CONFIG)
@@ -130,4 +131,8 @@ private static boolean testInputContainsMember(
     private static boolean testServiceId(Shape serviceShape, String expectedId) {
         return serviceShape.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse("").equals(expectedId);
     }
+
+    private static boolean testAwsService(Shape serviceShape) {
+        return serviceShape.getTrait(ServiceTrait.class).isPresent();
+    }
 }

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

@@ -19,8 +19,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+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.typescript.codegen.LanguageTarget;
 import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
@@ -33,12 +35,15 @@
 /**
  * Add client plubins and configs to support injecting user agent.
  */
+// TODO: Looks to add this back for non-AWS service clients, by fixing the dependency on ClientSharedValues.serviceId
 public class AddUserAgentDependency implements TypeScriptIntegration {
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
         return ListUtils.of(
                 RuntimeClientPlugin.builder()
-                        .withConventions(AwsDependency.MIDDLEWARE_USER_AGENT.dependency, "UserAgent").build());
+                        .withConventions(AwsDependency.MIDDLEWARE_USER_AGENT.dependency, "UserAgent")
+                        .servicePredicate((m, s) -> isAwsService(s))
+                        .build());
     }
 
     @Override
@@ -48,11 +53,13 @@ public void addConfigInterfaceFields(
             SymbolProvider symbolProvider,
             TypeScriptWriter writer
     ) {
-        writer.addImport("Provider", "Provider", TypeScriptDependency.AWS_SDK_TYPES.packageName);
-        writer.addImport("UserAgent", "__UserAgent", TypeScriptDependency.AWS_SDK_TYPES.packageName);
-        writer.writeDocs("The provider populating default tracking information to be sent with `user-agent`, "
-                + "`x-amz-user-agent` header\n@internal");
-        writer.write("defaultUserAgentProvider?: Provider<__UserAgent>;\n");
+        if (isAwsService(settings, model)) {
+            writer.addImport("Provider", "Provider", TypeScriptDependency.AWS_SDK_TYPES.packageName);
+            writer.addImport("UserAgent", "__UserAgent", TypeScriptDependency.AWS_SDK_TYPES.packageName);
+            writer.writeDocs("The provider populating default tracking information to be sent with `user-agent`, "
+                    + "`x-amz-user-agent` header\n@internal");
+            writer.write("defaultUserAgentProvider?: Provider<__UserAgent>;\n");
+        }
     }
 
     @Override
@@ -62,6 +69,9 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
         SymbolProvider symbolProvider,
         LanguageTarget target
     ) {
+        if (!isAwsService(settings, model)) {
+            return Collections.emptyMap();
+        }
         switch (target) {
             case NODE:
                 return MapUtils.of(
@@ -89,4 +99,12 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                 return Collections.emptyMap();
         }
     }
+
+    private static boolean isAwsService(TypeScriptSettings settings, Model model) {
+        return isAwsService(settings.getService(model));
+    }
+
+    private static boolean isAwsService(ServiceShape serviceShape) {
+        return serviceShape.getTrait(ServiceTrait.class).isPresent();
+    }
 }

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

@@ -19,6 +19,7 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import software.amazon.smithy.aws.traits.ServiceTrait;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.typescript.codegen.LanguageTarget;
@@ -39,7 +40,7 @@ public void writeAdditionalFiles(
             SymbolProvider symbolProvider,
             BiConsumer<String, Consumer<TypeScriptWriter>> writerFactory
     ) {
-        if (!settings.generateClient()) {
+        if (!settings.generateClient() || !isAwsService(settings, model)) {
             return;
         }
 
@@ -55,7 +56,7 @@ public void addConfigInterfaceFields(
             SymbolProvider symbolProvider,
             TypeScriptWriter writer
     ) {
-        if (!settings.generateClient()) {
+        if (!settings.generateClient() || !isAwsService(settings, model)) {
             return;
         }
 
@@ -71,7 +72,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
             SymbolProvider symbolProvider,
             LanguageTarget target
     ) {
-        if (!settings.generateClient()) {
+        if (!settings.generateClient() || !isAwsService(settings, model)) {
             return Collections.emptyMap();
         }
 
@@ -85,4 +86,8 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                 return Collections.emptyMap();
         }
     }
+
+    private static boolean isAwsService(TypeScriptSettings settings, Model model) {
+        return settings.getService(model).getTrait(ServiceTrait.class).isPresent();
+    }
 }

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

@@ -56,7 +56,8 @@ public void writeAdditionalFiles(
             writer.write(resource);
         });
 
-        if (!settings.generateClient()) {
+        // TODO: May need to generate a different/modified README.md for these cases
+        if (!settings.generateClient() || !isAwsService(settings, model)) {
             return;
         }
 
@@ -89,4 +90,8 @@ public void writeAdditionalFiles(
             writer.write(resource);
         });
     }
+
+    private static boolean isAwsService(TypeScriptSettings settings, Model model) {
+        return settings.getService(model).getTrait(ServiceTrait.class).isPresent();
+    }
 }

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

@@ -44,6 +44,7 @@ public SymbolProvider decorateSymbolProvider(
                 return symbol;
             }
 
+            // TODO: Should this WARNING be avoided somehow if client is not for an AWS service?
             // If the SDK service ID trait is present, use that, otherwise fall back to
             // the default naming strategy for the service.
             return shape.getTrait(ServiceTrait.class)