remove retry headers from presigned url ops

awslabs · Jul 15, 2024 · 3b2daf2 · 3b2daf2
1 parent 83e9a24
commit 3b2daf2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/Sources/Services/AWSPolly/Sources/AWSPolly/Models.swift b/Sources/Services/AWSPolly/Sources/AWSPolly/Models.swift
@@ -2587,8 +2587,6 @@ extension SynthesizeSpeechInput {
         let endpointParams = EndpointParams(endpoint: config.endpoint, region: config.region, useDualStack: config.useDualStack ?? false, useFIPS: config.useFIPS ?? false)
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<SynthesizeSpeechOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: $0) }, endpointParams: endpointParams))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<SynthesizeSpeechOutput>())
-        builder.interceptors.add(AWSClientRuntime.AmzSdkInvocationIdMiddleware<SynthesizeSpeechInput, SynthesizeSpeechOutput>())
-        builder.interceptors.add(AWSClientRuntime.AmzSdkRequestMiddleware<SynthesizeSpeechInput, SynthesizeSpeechOutput>(maxRetries: config.retryStrategyOptions.maxRetriesBase))
         builder.serialize(SynthesizeSpeechInputGETQueryItemMiddleware())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "Polly")

diff --git a/Sources/Services/AWSS3/Sources/AWSS3/Models.swift b/Sources/Services/AWSS3/Sources/AWSS3/Models.swift
@@ -21632,8 +21632,6 @@ extension GetObjectInput {
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<GetObjectOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: $0) }, endpointParams: endpointParams))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<GetObjectOutput>())
         builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsResponseMiddleware<GetObjectInput, GetObjectOutput>(validationMode: true))
-        builder.interceptors.add(AWSClientRuntime.AmzSdkInvocationIdMiddleware<GetObjectInput, GetObjectOutput>())
-        builder.interceptors.add(AWSClientRuntime.AmzSdkRequestMiddleware<GetObjectInput, GetObjectOutput>(maxRetries: config.retryStrategyOptions.maxRetriesBase))
         builder.serialize(GetObjectInputGETQueryItemMiddleware())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "S3")
@@ -21777,8 +21775,6 @@ extension PutObjectInput {
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<PutObjectOutput>())
         builder.interceptors.add(AWSClientRuntime.AWSS3ErrorWith200StatusXMLMiddleware<PutObjectInput, PutObjectOutput>())
         builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware<PutObjectInput, PutObjectOutput>(checksumAlgorithm: input.checksumAlgorithm?.rawValue))
-        builder.interceptors.add(AWSClientRuntime.AmzSdkInvocationIdMiddleware<PutObjectInput, PutObjectOutput>())
-        builder.interceptors.add(AWSClientRuntime.AmzSdkRequestMiddleware<PutObjectInput, PutObjectOutput>(maxRetries: config.retryStrategyOptions.maxRetriesBase))
         builder.serialize(PutObjectPresignedURLMiddleware())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "S3")

diff --git a/...re/amazon/smithy/aws/swift/codegen/customization/presignable/PresignableUrlIntegration.kt b/...re/amazon/smithy/aws/swift/codegen/customization/presignable/PresignableUrlIntegration.kt
@@ -5,6 +5,8 @@ import software.amazon.smithy.aws.swift.codegen.PresignableOperation
 import software.amazon.smithy.aws.swift.codegen.SigV4Utils
 import software.amazon.smithy.aws.swift.codegen.customization.InputTypeGETQueryItemMiddleware
 import software.amazon.smithy.aws.swift.codegen.customization.PutObjectPresignedURLMiddleware
+import software.amazon.smithy.aws.swift.codegen.middleware.AmzSdkInvocationIdMiddleware
+import software.amazon.smithy.aws.swift.codegen.middleware.AmzSdkRequestMiddleware
 import software.amazon.smithy.aws.swift.codegen.middleware.InputTypeGETQueryItemMiddlewareRenderable
 import software.amazon.smithy.aws.swift.codegen.middleware.PutObjectPresignedURLMiddlewareRenderable
 import software.amazon.smithy.codegen.core.Symbol
@@ -190,6 +192,9 @@ class PresignableUrlIntegration(private val presignedOperations: Map<String, Set
         operationMiddlewareCopy.removeMiddleware(op, "OperationInputQueryItemMiddleware")
         operationMiddlewareCopy.removeMiddleware(op, "OperationInputHeadersMiddleware")
         operationMiddlewareCopy.removeMiddleware(op, "ContentLengthMiddleware")
+        operationMiddlewareCopy.removeMiddleware(op, AmzSdkRequestMiddleware.NAME)
+        operationMiddlewareCopy.removeMiddleware(op, AmzSdkInvocationIdMiddleware.NAME)
+
         when (op.id.toString()) {
             "com.amazonaws.s3#GetObject", "com.amazonaws.polly#SynthesizeSpeech" -> {
                 operationMiddlewareCopy.removeMiddleware(op, "OperationInputBodyMiddleware")

diff --git a/...otlin/software/amazon/smithy/aws/swift/codegen/middleware/AmzSdkInvocationIdMiddleware.kt b/...otlin/software/amazon/smithy/aws/swift/codegen/middleware/AmzSdkInvocationIdMiddleware.kt
@@ -21,7 +21,11 @@ class AmzSdkInvocationIdMiddleware(
     val model: Model,
     val symbolProvider: SymbolProvider,
 ) : MiddlewareRenderable {
-    override val name: String = "AmzSdkInvocationIdMiddleware"
+    companion object {
+        const val NAME = "AmzSdkInvocationIdMiddleware"
+    }
+
+    override val name: String = NAME
 
     override fun renderMiddlewareInit(
         ctx: ProtocolGenerator.GenerationContext,

diff --git a/...ain/kotlin/software/amazon/smithy/aws/swift/codegen/middleware/AmzSdkRequestMiddleware.kt b/...ain/kotlin/software/amazon/smithy/aws/swift/codegen/middleware/AmzSdkRequestMiddleware.kt
@@ -21,7 +21,11 @@ class AmzSdkRequestMiddleware(
     val model: Model,
     val symbolProvider: SymbolProvider,
 ) : MiddlewareRenderable {
-    override val name: String = "AmzSdkRequestMiddleware"
+    companion object {
+        const val NAME = "AmzSdkRequestMiddleware"
+    }
+
+    override val name: String = NAME
 
     override fun renderMiddlewareInit(
         ctx: ProtocolGenerator.GenerationContext,