Skip to content

Commit 2f0b8ca

Browse files
committed
chore(codegen): consolidate user-agent customization to a codegen plugin
1 parent 472d969 commit 2f0b8ca

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ public List<RuntimeClientPlugin> getClientPlugins() {
7272
RuntimeClientPlugin.builder()
7373
.withConventions(TypeScriptDependency.MIDDLEWARE_RETRY.dependency, "Retry")
7474
.build(),
75-
RuntimeClientPlugin.builder()
76-
.withConventions(TypeScriptDependency.MIDDLEWARE_USER_AGENT.dependency, "UserAgent")
77-
.build(),
7875
RuntimeClientPlugin.builder()
7976
.withConventions(TypeScriptDependency.MIDDLEWARE_CONTENT_LENGTH.dependency, "ContentLength",
8077
HAS_MIDDLEWARE)
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package software.amazon.smithy.aws.typescript.codegen;
1717

1818
import java.util.Collections;
19+
import java.util.List;
1920
import java.util.Map;
2021
import java.util.function.Consumer;
2122

@@ -25,13 +26,21 @@
2526
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
2627
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
2728
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
29+
import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
2830
import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
31+
import software.amazon.smithy.utils.ListUtils;
2932
import software.amazon.smithy.utils.MapUtils;
3033

3134
/**
32-
* Adds default user agent to AWS clients.
35+
* Add client plubins and configs to support injecting user agent.
3336
*/
34-
public final class AddDefaultUserAgentConfig implements TypeScriptIntegration {
37+
public class AddUserAgentDependency implements TypeScriptIntegration {
38+
@Override
39+
public List<RuntimeClientPlugin> getClientPlugins() {
40+
return ListUtils.of(
41+
RuntimeClientPlugin.builder()
42+
.withConventions(AwsDependency.MIDDLEWARE_USER_AGENT.dependency, "UserAgent").build());
43+
}
3544

3645
@Override
3746
public void addConfigInterfaceFields(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public enum AwsDependency implements SymbolDependencyContainer {
6262
RETRY_CONFIG_PROVIDER(NORMAL_DEPENDENCY, "@aws-sdk/retry-config-provider", "^1.0.0-rc.1"),
6363
NODE_CONFIG_PROVIDER(NORMAL_DEPENDENCY, "@aws-sdk/node-config-provider", "^1.0.0-rc.1"),
6464
MIDDLEWARE_LOGGER(NORMAL_DEPENDENCY, "@aws-sdk/middleware-logger", "^1.0.0-rc.1"),
65+
MIDDLEWARE_USER_AGENT("dependencies", "@aws-sdk/middleware-user-agent", "1.0.0-rc.1"),
6566
AWS_SDK_UTIL_USER_AGENT_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/util-user-agent-browser", "1.0.0-rc.1"),
6667
AWS_SDK_UTIL_USER_AGENT_NODE(NORMAL_DEPENDENCY, "@aws-sdk/util-user-agent-node", "1.0.0-rc.1");
6768

codegen/smithy-aws-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ software.amazon.smithy.aws.typescript.codegen.AddS3ControlDependency
1212
software.amazon.smithy.aws.typescript.codegen.AddEventStreamHandlingDependency
1313
software.amazon.smithy.aws.typescript.codegen.AddHttp2Dependency
1414
software.amazon.smithy.aws.typescript.codegen.AddTranscribeStreamingDependency
15-
software.amazon.smithy.aws.typescript.codegen.AddDefaultUserAgentConfig
15+
software.amazon.smithy.aws.typescript.codegen.AddUserAgentDependency

0 commit comments

Comments
 (0)