Skip to content

Commit f1fe6dc

Browse files
trivikrtrivikr
authored
chore(codegen): use TypeScriptDependency in addImport calls (#5607)
1 parent e54099b commit f1fe6dc

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
125125
writer.addDependency(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY);
126126
writer.addImport("NODE_ENDPOINT_DISCOVERY_CONFIG_OPTIONS",
127127
"NODE_ENDPOINT_DISCOVERY_CONFIG_OPTIONS",
128-
AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.packageName);
128+
AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY);
129129
writer.write("loadNodeConfig(NODE_ENDPOINT_DISCOVERY_CONFIG_OPTIONS)");
130130
}
131131
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(TypeScrip
4444
return MapUtils.of("signerConstructor", writer -> {
4545
writer.addDependency(AwsDependency.SIGNATURE_V4_MULTIREGION)
4646
.addImport("SignatureV4MultiRegion", "SignatureV4MultiRegion",
47-
AwsDependency.SIGNATURE_V4_MULTIREGION.packageName)
47+
AwsDependency.SIGNATURE_V4_MULTIREGION)
4848
.write("SignatureV4MultiRegion");
4949
});
5050
default:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
148148
},
149149
"sha1", writer -> {
150150
writer.addDependency(AwsDependency.AWS_CRYPTO_SHA1_BROWSER);
151-
writer.addImport("Sha1",
152-
"Sha1", AwsDependency.AWS_CRYPTO_SHA1_BROWSER.packageName);
151+
writer.addImport("Sha1", "Sha1", AwsDependency.AWS_CRYPTO_SHA1_BROWSER);
153152
writer.write("Sha1");
154153
}
155154
);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,29 +146,29 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
146146
}, "signerConstructor", writer -> {
147147
writer.addDependency(AwsDependency.SIGNATURE_V4_MULTIREGION)
148148
.addImport("SignatureV4MultiRegion", "SignatureV4MultiRegion",
149-
AwsDependency.SIGNATURE_V4_MULTIREGION.packageName)
149+
AwsDependency.SIGNATURE_V4_MULTIREGION)
150150
.write("SignatureV4MultiRegion");
151151
});
152152
case NODE:
153153
return MapUtils.of(
154154
"useArnRegion", writer -> {
155155
writer.addDependency(TypeScriptDependency.NODE_CONFIG_PROVIDER)
156156
.addImport("loadConfig", "loadNodeConfig",
157-
TypeScriptDependency.NODE_CONFIG_PROVIDER.packageName)
157+
TypeScriptDependency.NODE_CONFIG_PROVIDER)
158158
.addDependency(AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE)
159159
.addImport("NODE_USE_ARN_REGION_CONFIG_OPTIONS", "NODE_USE_ARN_REGION_CONFIG_OPTIONS",
160-
AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE.packageName)
160+
AwsDependency.BUCKET_ENDPOINT_MIDDLEWARE)
161161
.write("loadNodeConfig(NODE_USE_ARN_REGION_CONFIG_OPTIONS)");
162162
},
163163
"disableS3ExpressSessionAuth", writer -> {
164164
writer.addDependency(TypeScriptDependency.NODE_CONFIG_PROVIDER)
165165
.addImport("loadConfig", "loadNodeConfig",
166-
TypeScriptDependency.NODE_CONFIG_PROVIDER.packageName)
166+
TypeScriptDependency.NODE_CONFIG_PROVIDER)
167167
.addDependency(AwsDependency.S3_MIDDLEWARE)
168168
.addImport(
169169
"NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS",
170170
"NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS",
171-
AwsDependency.S3_MIDDLEWARE.packageName
171+
AwsDependency.S3_MIDDLEWARE
172172
)
173173
.write("loadNodeConfig(NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS)");
174174
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
6565
"eventStreamPayloadHandlerProvider", writer -> {
6666
writer.addDependency(AwsDependency.TRANSCRIBE_STREAMING_MIDDLEWARE);
6767
writer.addImport("eventStreamPayloadHandler", "eventStreamPayloadHandler",
68-
AwsDependency.TRANSCRIBE_STREAMING_MIDDLEWARE.packageName);
68+
AwsDependency.TRANSCRIBE_STREAMING_MIDDLEWARE);
6969
writer.write("(() => eventStreamPayloadHandler)");
7070
});
7171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
7272
"defaultUserAgentProvider", writer -> {
7373
writer.addDependency(AwsDependency.AWS_SDK_UTIL_USER_AGENT_NODE.dependency);
7474
writer.addImport("defaultUserAgent", "defaultUserAgent",
75-
AwsDependency.AWS_SDK_UTIL_USER_AGENT_NODE.packageName);
75+
AwsDependency.AWS_SDK_UTIL_USER_AGENT_NODE);
7676
writer.addIgnoredDefaultImport("packageInfo", "./package.json",
7777
"package.json will be imported from dist folders");
7878
writeDefaultUserAgentProvider(writer, settings, model);
@@ -83,7 +83,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
8383
"defaultUserAgentProvider", writer -> {
8484
writer.addDependency(AwsDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER.dependency);
8585
writer.addImport("defaultUserAgent", "defaultUserAgent",
86-
AwsDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER.packageName);
86+
AwsDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER);
8787
writer.addIgnoredDefaultImport("packageInfo", "./package.json",
8888
"package.json will be imported from dist folders");
8989
writeDefaultUserAgentProvider(writer, settings, model);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
8585
"eventStreamPayloadHandlerProvider", writer -> {
8686
writer.addDependency(AwsDependency.MIDDLEWARE_WEBSOCKET);
8787
writer.addImport("eventStreamPayloadHandlerProvider", "eventStreamPayloadHandlerProvider",
88-
AwsDependency.MIDDLEWARE_WEBSOCKET.packageName);
88+
AwsDependency.MIDDLEWARE_WEBSOCKET);
8989
writer.write("eventStreamPayloadHandlerProvider");
9090
},
9191
"requestHandler", writer -> {
9292
writer.addImport("FetchHttpHandler", "HttpRequestHandler",
93-
TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER.packageName);
93+
TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER);
9494
writer.addDependency(TypeScriptDependency.AWS_SDK_FETCH_HTTP_HANDLER);
9595
writer.addImport("WebSocketFetchHandler", "WebSocketRequestHandler",
96-
AwsDependency.MIDDLEWARE_WEBSOCKET.packageName);
96+
AwsDependency.MIDDLEWARE_WEBSOCKET);
9797
writer.addDependency(AwsDependency.MIDDLEWARE_WEBSOCKET);
9898
writer.write("new WebSocketRequestHandler(defaultConfigProvider, "
9999
+ "new HttpRequestHandler(defaultConfigProvider))");

0 commit comments

Comments
 (0)