Skip to content

Commit e0aa67a

Browse files
committed
chore(codegen): remove checks for hostname and variants
1 parent 866a0ea commit e0aa67a

File tree

1 file changed

+15
-21
lines changed
  • codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen

1 file changed

+15
-21
lines changed

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

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -178,29 +178,23 @@ private void writeEndpointProviderFunction() {
178178
}
179179

180180
private void writeEndpointSpecificResolver(String region, ObjectNode resolved) {
181-
if (resolved.containsMember("variants")
182-
|| resolved.containsMember("hostname")
183-
|| resolved.containsMember("credentialScope")) {
184-
writer.openBlock("$S: {", "},", region, () -> {
185-
// TODO: Remove population of hostname after switching to variants.
186-
if (resolved.containsMember("hostname")) {
187-
String hostname = resolved.expectStringMember("hostname").getValue();
188-
writer.write("hostname: $S,", hostname);
189-
}
190-
if (resolved.containsMember("variants")) {
191-
ArrayNode variants = resolved.expectArrayMember("variants");
192-
writer.write("variants: $L,", ArrayNode.prettyPrintJson(variants));
193-
}
194-
resolved.getObjectMember("credentialScope").ifPresent(scope -> {
195-
scope.getStringMember("region").ifPresent(signingRegion -> {
196-
writer.write("signingRegion: $S,", signingRegion);
197-
});
198-
scope.getStringMember("service").ifPresent(signingService -> {
199-
writer.write("signingService: $S,", signingService);
200-
});
181+
writer.openBlock("$S: {", "},", region, () -> {
182+
// TODO: Remove population of hostname after switching to variants.
183+
String hostname = resolved.expectStringMember("hostname").getValue();
184+
writer.write("hostname: $S,", hostname);
185+
186+
ArrayNode variants = resolved.expectArrayMember("variants");
187+
writer.write("variants: $L,", ArrayNode.prettyPrintJson(variants));
188+
189+
resolved.getObjectMember("credentialScope").ifPresent(scope -> {
190+
scope.getStringMember("region").ifPresent(signingRegion -> {
191+
writer.write("signingRegion: $S,", signingRegion);
192+
});
193+
scope.getStringMember("service").ifPresent(signingService -> {
194+
writer.write("signingService: $S,", signingService);
201195
});
202196
});
203-
}
197+
});
204198
}
205199

206200
private ObjectNode getDefaultVariant(String hostname) {

0 commit comments

Comments
 (0)