refactor(rt): upstream HttpClientEngine interface changes (#608)

* refactor(rt): upstream HttpClientEngine interface changes * replace default retry middleware with AWS specific component that sets retry headers * add max attempts to retry header
smithy-lang · May 20, 2022 · 7f350c6 · 7f350c6
1 parent 7b8fbae
commit 7f350c6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...y-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsDefaultRetryIntegration.kt b/...y-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsDefaultRetryIntegration.kt
@@ -6,7 +6,6 @@
 package aws.sdk.kotlin.codegen
 
 import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
@@ -15,8 +14,8 @@ import software.amazon.smithy.kotlin.codegen.retries.StandardRetryMiddleware
 import software.amazon.smithy.model.shapes.OperationShape
 
 /**
- * Adds AWS-specific retry wrappers around operation invocations. This replaces
- * [StandardRetryPolicy][aws.smithy.kotlin.runtime.retries.impl] with
+ * Replace the [StandardRetryMiddleware] with AWS specific retry middleware (AwsRetryMiddleware)
+ * as well as replace the [StandardRetryPolicy][aws.smithy.kotlin.runtime.retries.impl] with
  * [AwsDefaultRetryPolicy][aws.sdk.kotlin.runtime.http.retries].
  */
 class AwsDefaultRetryIntegration : KotlinIntegration {
@@ -26,12 +25,14 @@ class AwsDefaultRetryIntegration : KotlinIntegration {
     ): List<ProtocolMiddleware> = resolved.replace(middleware) { it is StandardRetryMiddleware }
 
     private val middleware = object : ProtocolMiddleware {
-        override val name: String = RuntimeTypes.Http.Middlware.Retry.name
+        override val name: String = AwsRuntimeTypes.Http.Middleware.AwsRetryMiddleware.name
 
         override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
-            writer.addImport(RuntimeTypes.Http.Middlware.Retry)
-            writer.addImport(AwsRuntimeTypes.Http.Retries.AwsDefaultRetryPolicy)
-            writer.write("op.install(#T(config.retryStrategy, AwsDefaultRetryPolicy))", RuntimeTypes.Http.Middlware.Retry)
+            writer.write(
+                "op.install(#T(config.retryStrategy, #T))",
+                AwsRuntimeTypes.Http.Middleware.AwsRetryMiddleware,
+                AwsRuntimeTypes.Http.Retries.AwsDefaultRetryPolicy
+            )
         }
     }
 }
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt
@@ -55,6 +55,9 @@ object AwsRuntimeTypes {
         object Retries {
             val AwsDefaultRetryPolicy = runtimeSymbol("AwsDefaultRetryPolicy", AwsKotlinDependency.AWS_HTTP, "retries")
         }
+        object Middleware {
+            val AwsRetryMiddleware = runtimeSymbol("AwsRetryMiddleware", AwsKotlinDependency.AWS_HTTP, "middleware")
+        }
     }
 
     object JsonProtocols {