fix: Route 53 TrimHostedZone customization is incomplete

Sources/Core/AWSClientRuntime/Middlewares/Route53TrimHostedZoneMiddleware.swift

@@ -0,0 +1,39 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import ClientRuntime
+
+public struct Route53TrimHostedZoneMiddleware<Input, Output>: ClientRuntime.Middleware {
+    public let id: Swift.String = "Route53TrimHostedZoneMiddleware"
+    private let prefixes = ["/hostedzone/", "hostedzone/", "/hostedzone", "hostedzone"]
+
+    private let hostedZoneIDKeyPath: WritableKeyPath<Input, String?>
+
+    public init(_ hostedZoneIDKeyPath: WritableKeyPath<Input, String?>) {
+        self.hostedZoneIDKeyPath = hostedZoneIDKeyPath
+    }
+
+    public func handle<H>(context: Context,
+                          input: Input,
+                          next: H) async throws -> ClientRuntime.OperationOutput<Output>
+    where H: Handler,
+    Self.MInput == H.Input,
+    Self.MOutput == H.Output,
+    Self.Context == H.Context {
+        guard let hostedZoneId = input[keyPath: hostedZoneIDKeyPath] else {
+            return try await next.handle(context: context, input: input)
+        }
+        var copiedInput = input
+        let stripped = hostedZoneId.stripFirstMatching(prefixes: prefixes)
+        copiedInput[keyPath: hostedZoneIDKeyPath] = stripped
+        return try await next.handle(context: context, input: copiedInput)
+    }
+
+    public typealias MInput = Input
+    public typealias MOutput = ClientRuntime.OperationOutput<Output>
+    public typealias Context = ClientRuntime.HttpContext
+}

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/route53/Route53TrimHostedZone.kt

@@ -20,6 +20,7 @@ class Route53TrimHostedZone : SwiftIntegration {
     override fun enabledForService(model: Model, settings: SwiftSettings): Boolean {
         return model.expectShape<ServiceShape>(settings.service).isRoute53
     }
+
     override fun preprocessModel(model: Model, settings: SwiftSettings): Model {
         return ModelTransformer.create().mapShapes(model) {
             if (isHostId(it)) {
@@ -38,8 +39,7 @@ class Route53TrimHostedZone : SwiftIntegration {
         val inputShape = MiddlewareShapeUtils.inputShape(ctx.model, operationShape)
         val hostedZoneMember = inputShape.members().find { it.hasTrait<TrimHostedZone>() }
         if (hostedZoneMember != null) {
-            StripHostedZoneURLPathMiddleware.renderMiddleware(ctx, operationShape)
-            operationMiddleware.prependMiddleware(operationShape, StripHostedZoneUrlPathMiddlewareRenderable(ctx.model, ctx.symbolProvider))
+            operationMiddleware.prependMiddleware(operationShape, StripHostedZoneURLPathMiddlewareRenderable(ctx.model, ctx.symbolProvider))
         }
     }
 

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/route53/StripHostedZoneUrlPathMiddlewareRenderable.kt → codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/route53/StripHostedZoneURLPathMiddlewareRenderable.kt

@@ -5,12 +5,11 @@ import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.swift.codegen.SwiftWriter
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
-import software.amazon.smithy.swift.codegen.integration.middlewares.handlers.MiddlewareShapeUtils
 import software.amazon.smithy.swift.codegen.middleware.MiddlewarePosition
 import software.amazon.smithy.swift.codegen.middleware.MiddlewareRenderable
 import software.amazon.smithy.swift.codegen.middleware.MiddlewareStep
 
-class StripHostedZoneUrlPathMiddlewareRenderable(
+class StripHostedZoneURLPathMiddlewareRenderable(
     val model: Model,
     val symbolProvider: SymbolProvider
 ) : MiddlewareRenderable {
@@ -21,7 +20,6 @@ class StripHostedZoneUrlPathMiddlewareRenderable(
     override val position = MiddlewarePosition.AFTER
 
     override fun render(ctx: ProtocolGenerator.GenerationContext, writer: SwiftWriter, op: OperationShape, operationStackName: String) {
-        val inputShapeName = MiddlewareShapeUtils.inputSymbol(symbolProvider, model, op).name
-        writer.write("$operationStackName.${middlewareStep.stringValue()}.intercept(position: ${position.stringValue()}, middleware: ${inputShapeName}StripHostedZoneMiddleware())")
+        writer.write("$operationStackName.${middlewareStep.stringValue()}.intercept(position: ${position.stringValue()}, middleware: Route53TrimHostedZoneMiddleware(\\.hostedZoneId))")
     }
 }