Skip to content

fix(codegen): skip variants which only contains tags #3172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2022
Merged

fix(codegen): skip variants which only contains tags #3172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33c2189
chore(codegen): skip empty variants with tags
trivikr Jan 10, 2022
2802a82
chore(codegen): add default hostname while populating service variants
trivikr Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions ...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/EndpointGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,15 @@ private void loadServiceEndpoints() {
&& (config.containsMember("hostname") || config.containsMember("variants"))) {
String region = entry.getKey();
String hostname = config.getStringMemberOrDefault("hostname", partition.hostnameTemplate);
String resolvedHostname = getResolvedHostnameWithDnsSuffix(
getResolvedHostname(hostname, endpointPrefix, region),
dnsSuffix
);
String resolvedHostname = getResolvedHostname(hostname, endpointPrefix, region);

ArrayNode variants = config.getArrayMember("variants").orElse(ArrayNode.fromNodes());
ArrayNode defaultVariant = ArrayNode.fromNodes(getDefaultVariant(resolvedHostname));
ArrayNode variants = getServiceVariants(
config.getArrayMember("variants").orElse(ArrayNode.fromNodes()),
resolvedHostname,
dnsSuffix);

String defaultHostname = getResolvedHostnameWithDnsSuffix(resolvedHostname, dnsSuffix);
ArrayNode defaultVariant = ArrayNode.fromNodes(getDefaultVariant(defaultHostname));

endpoints.put(region,
config
Expand All @@ -113,6 +115,27 @@ private void loadServiceEndpoints() {
}
}

private ArrayNode getServiceVariants(ArrayNode variants, String defaultHostname, String defaultDnsSuffix) {
List<Node> serviceVariants = new ArrayList<Node>();

variants.forEach(variant -> {
ObjectNode variantNode = variant.expectObjectNode();
if (!variantNode.containsMember("hostname") && !variantNode.containsMember("dnsSuffix")) {
// Skip the empty variant which just contains tags.
return;
}
String hostname = variantNode.getStringMemberOrDefault("hostname", defaultHostname);
String dnsSuffix = variantNode.getStringMemberOrDefault("dnsSuffix", defaultDnsSuffix);
String resolvedHostname = getResolvedHostnameWithDnsSuffix(
getResolvedHostname(hostname, endpointPrefix),
dnsSuffix
);
serviceVariants.add(variantNode.withMember("hostname", resolvedHostname).withoutMember("dnsSuffix"));
});

return ArrayNode.fromNodes(serviceVariants);
}

@Override
public void run() {
writeRegionHash();
Expand Down