fix: Make operations correctly model service errors (#581)

* Plug service errors into pre-existing error code-gen for initializers, deserializers, struct, body, and codable conformance of nested members

---------

Co-authored-by: Sichan Yoo <[email protected]>
Co-authored-by: Josh Elkins <[email protected]>

Author: 3 people

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpBindingProtocolGenerator.kt

@@ -322,7 +322,16 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             .flatMap { it.errors }
             .map { ctx.model.expectShape(it) }
             .toSet()
-        return operationErrorShapes.filter { shapes -> shapes.members().any { it.isInHttpBody() } }.toMutableSet()
+
+        val serviceErrorShapes = ctx.service.errors.map {
+            ctx.model.expectShape(it)
+        }.toSet()
+
+        return operationErrorShapes.filter { shape ->
+            shape.members().any { it.isInHttpBody() }
+        }.toMutableSet() + serviceErrorShapes.filter { shape ->
+            shape.members().any { it.isInHttpBody() }
+        }.toMutableSet()
     }
 
     private fun resolveShapesNeedingCodableConformance(ctx: ProtocolGenerator.GenerationContext): Set<Shape> {
@@ -342,6 +351,12 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             .filter { it.isStructureShape || it.isUnionShape || it is CollectionShape || it.isMapShape }
             .toSet()
 
+        val topLevelServiceErrorMembers = ctx.service.errors
+            .flatMap { ctx.model.expectShape(it).members() }
+            .map { ctx.model.expectShape(it.target) }
+            .filter { it.isStructureShape || it.isUnionShape || it is CollectionShape || it.isMapShape }
+            .toSet()
+
         val topLevelInputMembers = getHttpBindingOperations(ctx).flatMap {
             val inputShape = ctx.model.expectShape(it.input.get())
             inputShape.members()
@@ -350,7 +365,11 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             .filter { it.isStructureShape || it.isUnionShape || it is CollectionShape || it.isMapShape }
             .toSet()
 
-        val allTopLevelMembers = topLevelOutputMembers.union(topLevelErrorMembers).union(topLevelInputMembers)
+        val allTopLevelMembers =
+            topLevelOutputMembers
+                .union(topLevelErrorMembers)
+                .union(topLevelServiceErrorMembers)
+                .union(topLevelInputMembers)
 
         val nestedTypes = walkNestedShapesRequiringSerde(ctx, allTopLevelMembers)
         return nestedTypes

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/HttpResponseBindingErrorGeneratable.kt

@@ -10,5 +10,6 @@ import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
 
 interface HttpResponseBindingErrorGeneratable {
-    fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, unknownServiceErrorSymbol: Symbol)
+    fun renderServiceError(ctx: ProtocolGenerator.GenerationContext)
+    fun renderOperationError(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, unknownServiceErrorSymbol: Symbol)
 }

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/HttpResponseGenerator.kt

@@ -33,11 +33,23 @@ class HttpResponseGenerator(
             }
         }
 
+        if (ctx.service.errors.isNotEmpty()) {
+            httpResponseBindingErrorGenerator.renderServiceError(ctx)
+        }
         httpOperations.forEach {
-            httpResponseBindingErrorGenerator.render(ctx, it, unknownServiceErrorSymbol)
+            httpResponseBindingErrorGenerator.renderOperationError(ctx, it, unknownServiceErrorSymbol)
         }
 
-        val modeledErrors = httpOperations.flatMap { it.errors }.map { ctx.model.expectShape(it) as StructureShape }.toSet()
+        val modeledOperationErrors = httpOperations
+            .flatMap { it.errors }
+            .map { ctx.model.expectShape(it) as StructureShape }
+            .toSet()
+
+        val modeledServiceErrors = ctx.service.errors
+            .map { ctx.model.expectShape(it) as StructureShape }
+            .toSet()
+
+        val modeledErrors = modeledOperationErrors + modeledServiceErrors
         modeledErrors.forEach {
             httpResponseBindingErrorInitGenerator(ctx, it, httpBindingResolver, defaultTimestampFormat)
         }

smithy-swift-codegen/src/test/kotlin/mocks/MockHttpResponseBindingErrorGenerator.kt

@@ -13,7 +13,7 @@ import software.amazon.smithy.swift.codegen.integration.httpResponse.HttpRespons
 import software.amazon.smithy.swift.codegen.integration.middlewares.handlers.MiddlewareShapeUtils
 
 class MockHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGeneratable {
-    override fun render(
+    override fun renderOperationError(
         ctx: ProtocolGenerator.GenerationContext,
         op: OperationShape,
         unknownServiceErrorSymbol: Symbol
@@ -34,4 +34,16 @@ class MockHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGeneratabl
             }
         }
     }
+
+    override fun renderServiceError(ctx: ProtocolGenerator.GenerationContext) {
+        /*
+
+        TODO(
+            "Organize test suites of smithy-swift and aws-sdk-swift " +
+                "and see if this class and consumers of this class should be moved to aws-sdk-swift " +
+                "OR AWS protocol tests in aws-sdk-swift should be moved to smithy-swift."
+        )
+
+        */
+    }
 }