diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt index 449f45deac0..272647a565c 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt @@ -65,8 +65,7 @@ abstract class AWSHTTPProtocolCustomizations : DefaultHTTPProtocolCustomizations serviceConfig: ServiceConfig ): HttpProtocolServiceClient { writer.addImport(AWSSwiftDependency.AWS_CLIENT_RUNTIME.target, false, "FileBasedConfig") - val clientProperties = getClientProperties() - return AWSHttpProtocolServiceClient(ctx, writer, clientProperties, serviceConfig) + return AWSHttpProtocolServiceClient(ctx, writer, serviceConfig) } override val messageDecoderSymbol: Symbol = AWSClientRuntimeTypes.AWSEventStream.AWSMessageDecoder diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt index 61f7a45d4bc..8b27e14171d 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt @@ -12,7 +12,6 @@ import software.amazon.smithy.swift.codegen.ClientRuntimeTypes import software.amazon.smithy.swift.codegen.SwiftWriter import software.amazon.smithy.swift.codegen.config.ConfigProperty import software.amazon.smithy.swift.codegen.config.DefaultProvider -import software.amazon.smithy.swift.codegen.integration.ClientProperty import software.amazon.smithy.swift.codegen.integration.HttpProtocolServiceClient import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator import software.amazon.smithy.swift.codegen.integration.ServiceConfig @@ -22,9 +21,8 @@ import software.amazon.smithy.swift.codegen.utils.toUpperCamelCase class AWSHttpProtocolServiceClient( private val ctx: ProtocolGenerator.GenerationContext, private val writer: SwiftWriter, - properties: List, private val serviceConfig: ServiceConfig -) : HttpProtocolServiceClient(ctx, writer, properties, serviceConfig) { +) : HttpProtocolServiceClient(ctx, writer, serviceConfig) { override fun renderConvenienceInitFunctions(serviceSymbol: Symbol) { writer.openBlock("public convenience init(region: Swift.String) throws {", "}") { writer.write("let config = try ${serviceConfig.typeName}(region: region)") diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGenerator.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGenerator.kt index e644662b35e..f324857c3e7 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGenerator.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGenerator.kt @@ -98,12 +98,6 @@ class PresignerGenerator : SwiftIntegration { ) } val operationStackName = "operation" - for (prop in protocolGenerator.customizations.getClientProperties()) { - prop.addImportsAndDependencies(writer) - prop.renderInstantiation(writer) - prop.renderConfiguration(writer) - } - val generator = MiddlewareExecutionGenerator( protocolGeneratorContext, writer, @@ -117,11 +111,7 @@ class PresignerGenerator : SwiftIntegration { } if (protocolGeneratorContext.settings.useInterceptors) { - writer.write( - """ - return try await op.presignRequest(input: input) - """.trimIndent() - ) + writer.write("return try await op.presignRequest(input: input)") } else { val requestBuilderName = "presignedRequestBuilder" val builtRequestName = "builtRequest" diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/presignable/PresignableUrlIntegration.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/presignable/PresignableUrlIntegration.kt index 3692a5fdb94..bdc96f1419a 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/presignable/PresignableUrlIntegration.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/presignable/PresignableUrlIntegration.kt @@ -126,12 +126,6 @@ class PresignableUrlIntegration(private val presignedOperations: Map { - return listOf() - } - override fun customRenderBodyComparison(test: HttpRequestTestCase): ((SwiftWriter, HttpRequestTestCase, Symbol, Shape, String, String) -> Unit)? { return this::renderFormURLBodyComparison }