Skip to content

Commit d809298

Browse files
committed
chore(codegen): populate default variant as first variant
1 parent 4962f21 commit d809298

File tree

1 file changed

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

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void loadServiceEndpoints() {
105105
ArrayNode defaultVariant = ArrayNode.fromNodes(getDefaultVariant(resolvedHostname));
106106

107107
// Add resolved hostname as the default variant.
108-
config = config.withMember("variants", variants.merge(defaultVariant));
108+
config = config.withMember("variants", defaultVariant.merge(variants));
109109
endpoints.put(entry.getKey(), config);
110110
}
111111
}
@@ -264,6 +264,7 @@ Set<String> getAllRegions() {
264264
ArrayNode getVariants() {
265265
List<Node> allVariants = new ArrayList<Node>();
266266

267+
allVariants.add(getDefaultVariant(hostnameTemplate));
267268
if (defaults.containsMember("variants")) {
268269
ArrayNode variants = defaults.expectArrayMember("variants");
269270
variants.forEach(variant -> {
@@ -274,7 +275,6 @@ ArrayNode getVariants() {
274275
allVariants.add(variantNode.withMember("hostname", resolvedHostname).withoutMember("dnsSuffix"));
275276
});
276277
}
277-
allVariants.add(getDefaultVariant(hostnameTemplate));
278278

279279
return ArrayNode.fromNodes(allVariants);
280280
}

0 commit comments

Comments
 (0)