Skip to content

Commit 3a2ea49

Browse files
committed
chore(codegen): do not populate deprecated endpoints
1 parent af5b00e commit 3a2ea49

File tree

1 file changed

+5
-4
lines changed
  • codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen

1 file changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,16 @@ private void loadServiceEndpoints() {
9292

9393
for (Map.Entry<String, Node> entry : endpointMap.getStringMap().entrySet()) {
9494
ObjectNode config = entry.getValue().expectObjectNode();
95-
// TODO: Do not populate config if "deprecated" is present, after fully switching to variants.
96-
if (config.containsMember("hostname") || config.containsMember("variants")) {
95+
if (!config.containsMember("deprecated")
96+
&& (config.containsMember("hostname") || config.containsMember("variants"))) {
97+
String region = entry.getKey();
9798
String hostname = config.getStringMemberOrDefault("hostname", partition.hostnameTemplate);
98-
String resolvedHostname = getResolvedHostname(hostname, dnsSuffix, endpointPrefix, entry.getKey());
99+
String resolvedHostname = getResolvedHostname(hostname, dnsSuffix, endpointPrefix, region);
99100

100101
ArrayNode variants = config.getArrayMember("variants").orElse(ArrayNode.fromNodes());
101102
ArrayNode defaultVariant = ArrayNode.fromNodes(getDefaultVariant(resolvedHostname));
102103

103-
endpoints.put(entry.getKey(),
104+
endpoints.put(region,
104105
config
105106
.withMember("hostname", resolvedHostname)
106107
.withMember("variants", defaultVariant.merge(variants)));

0 commit comments

Comments
 (0)