Skip to content

fix(codegen): avoid using model.getServiceShapes() for endpoint generation #1642

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 1 commit into from
Jul 7, 2025
Merged

fix(codegen): avoid using model.getServiceShapes() for endpoint generation #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions ...java/software/amazon/smithy/typescript/codegen/endpointsV2/AddDefaultEndpointRuleSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import software.amazon.smithy.codegen.core.SymbolProvider;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.node.Node;
import software.amazon.smithy.model.shapes.ServiceShape;
import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
import software.amazon.smithy.typescript.codegen.CodegenUtils;
import software.amazon.smithy.typescript.codegen.LanguageTarget;
Expand Down Expand Up @@ -109,15 +110,14 @@ public List<RuntimeClientPlugin> getClientPlugins() {
public Model preprocessModel(Model model, TypeScriptSettings settings) {
Model.Builder modelBuilder = model.toBuilder();

model.getServiceShapes().forEach(serviceShape -> {
if (!serviceShape.hasTrait(EndpointRuleSetTrait.class)) {
usesDefaultEndpointRuleset = true;
modelBuilder.removeShape(serviceShape.toShapeId());
modelBuilder.addShape(serviceShape.toBuilder()
.addTrait(DEFAULT_RULESET)
.build());
}
});
ServiceShape serviceShape = settings.getService(model);
if (!serviceShape.hasTrait(EndpointRuleSetTrait.class)) {
usesDefaultEndpointRuleset = true;
modelBuilder.removeShape(serviceShape.toShapeId());
modelBuilder.addShape(serviceShape.toBuilder()
.addTrait(DEFAULT_RULESET)
.build());
}

return modelBuilder.build();
}
Expand Down
2 changes: 1 addition & 1 deletion ...degen/src/main/java/software/amazon/smithy/typescript/codegen/schema/SchemaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ private void writeStructureSchema(StructureShape shape) {
private void writeBaseError() {
String serviceName = CodegenUtils.getServiceName(settings, model, symbolProvider);
String serviceExceptionName = CodegenUtils.getServiceExceptionName(serviceName);
String namespace = model.getServiceShapes().stream().findFirst().get().getId().getNamespace();
String namespace = settings.getService(model).getId().getNamespace();

String exceptionCtorSymbolName = "__" + serviceExceptionName;
writer.addImportSubmodule("error", "error", TypeScriptDependency.SMITHY_CORE, "/schema");
Expand Down