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

--------- Co-authored-by: Lucas McDonald <[email protected]>
aws · Sep 20, 2023 · be60f69 · be60f69
1 parent c32e241
commit be60f69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/TestModels/Dependencies/Model/Dependencies.smithy b/TestModels/Dependencies/Model/Dependencies.smithy
@@ -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
 
 @aws.polymorph#localService(
   sdkId: "SimpleDependencies",
@@ -14,7 +15,8 @@ use simple.errors#SimpleErrors
     SimpleResources,
     SimpleConstraints,
     SimpleExtendableResources,
-    SimpleErrors
+    // TODO: Uncomment out as part of https://sim.amazon.com/issues/CrypTool-5231
+    // SimpleErrors
   ]
 )
 service SimpleDependencies {

diff --git a/...y-codegen/src/main/java/software/amazon/polymorph/smithydotnet/TypeConversionCodegen.java b/...y-codegen/src/main/java/software/amazon/polymorph/smithydotnet/TypeConversionCodegen.java
@@ -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) {