Skip to content
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

Jump to bottom

feat(smithydotnet): add dependency error from localservice trait #288

Merged
merged 8 commits into from
Sep 20, 2023
Merged

feat(smithydotnet): add dependency error from localservice trait #288

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e083872
fix: add dependency error from localservice trait
josecorella Sep 1, 2023
59fe713
feat(smithydotnet): add dependency error from localservice trait
josecorella Sep 1, 2023
13bdb5d
remove unused dependncy in smithy model
josecorella Sep 20, 2023
9c875f9
comment out not remove
josecorella Sep 20, 2023
0f11a83
add context
josecorella Sep 20, 2023
708c248
Update TestModels/Dependencies/Model/Dependencies.smithy
josecorella Sep 20, 2023
cdf570b
Update TestModels/Dependencies/Model/Dependencies.smithy
josecorella Sep 20, 2023
79da266
fix
josecorella Sep 20, 2023
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
7 changes: 5 additions & 2 deletions TestModels/Dependencies/Model/Dependencies.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ namespace simple.dependencies
use simple.resources#SimpleResources
use simple.constraints#SimpleConstraints
use simple.extendable.resources#SimpleExtendableResources
use simple.errors#SimpleErrors
// TODO: Uncomment out as part of https://sim.amazon.com/issues/CrypTool-5231
//use simple.errors#SimpleErrors
josecorella marked this conversation as resolved.
Show resolved Hide resolved

@aws.polymorph#localService(
sdkId: "SimpleDependencies",
Expand All @@ -14,7 +15,9 @@ use simple.errors#SimpleErrors
SimpleResources,
SimpleConstraints,
SimpleExtendableResources,
SimpleErrors
// for reference on why this is commented out and next steps see: https://sim.amazon.com/issues/CrypTool-5231
// TODO: Uncomment out as part of https://sim.amazon.com/issues/CrypTool-5231
//use simple.errors#SimpleErrors
josecorella marked this conversation as resolved.
Show resolved Hide resolved
]
)
service SimpleDependencies {
Expand Down
11 changes: 11 additions & 0 deletions ...y-codegen/src/main/java/software/amazon/polymorph/smithydotnet/TypeConversionCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,17 @@ protected TokenTree errorFromDanyBody(final TreeSet<StructureShape> errorShapes)
Set<String> dependentNamespaces = ModelUtils.findAllDependentNamespaces(
new HashSet<ShapeId>(Collections.singleton(localServiceTrait.getConfigId())), model);

if (localServiceTrait.getDependencies() != null) {
localServiceTrait.getDependencies().stream()
.map(model::expectShape)
.map(Shape::asServiceShape)
.filter(Optional::isPresent)
.map(Optional::get)
.forEach( serviceShape ->
dependentNamespaces.add(serviceShape.getId().getNamespace())
);
}

if (dependentNamespaces.size() > 0) {
Set<TokenTree> cases = new HashSet<>();
for (String dependentNamespace : dependentNamespaces) {
Expand Down
Loading