Skip to content

Commit da4ad1b

Browse files
authored
fix: Retryer removal (#366)
1 parent 8a3742f commit da4ad1b

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

AWSClientRuntime/Sources/Middlewares/RetrierMiddleware.swift renamed to AWSClientRuntime/Sources/Middlewares/RetryerMiddleware.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
import ClientRuntime
99

10-
public struct RetrierMiddleware<Output: HttpResponseBinding,
10+
public struct RetryerMiddleware<Output: HttpResponseBinding,
1111
OutputError: HttpResponseBinding>: Middleware {
1212

13-
public var id: String = "Retrier"
13+
public var id: String = "Retryer"
1414

15-
let retrier: Retrier
15+
let retryer: SDKRetryer
1616

17-
public init(retrier: Retrier) {
18-
self.retrier = retrier
17+
public init(retryer: SDKRetryer) {
18+
self.retryer = retryer
1919
}
2020

2121
public func handle<H>(context: Context,
@@ -32,7 +32,7 @@ public struct RetrierMiddleware<Output: HttpResponseBinding,
3232
}
3333
do {
3434
let partitionId = "\(context.getServiceName()) - \(region))"
35-
let token = try retrier.acquireToken(partitionId: partitionId)
35+
let token = try retryer.acquireToken(partitionId: partitionId)
3636
return try tryRequest(token: token, partitionId: partitionId, context: context, input: input, next: next)
3737

3838
} catch let err {
@@ -51,22 +51,22 @@ public struct RetrierMiddleware<Output: HttpResponseBinding,
5151
Self.MOutput == H.Output,
5252
Self.Context == H.Context,
5353
Self.MError == H.MiddlewareError {
54-
defer { retrier.releaseToken(token: token)}
54+
defer { retryer.releaseToken(token: token)}
5555

5656
let serviceResponse = next.handle(context: context, input: input)
5757

5858
switch serviceResponse {
5959
case .failure(let error):
60-
if retrier.isErrorRetryable(error: error) {
61-
let errorType = retrier.getErrorType(error: error)
62-
let newToken = try retrier.scheduleRetry(token: token, error: errorType)
60+
if retryer.isErrorRetryable(error: error) {
61+
let errorType = retryer.getErrorType(error: error)
62+
let newToken = try retryer.scheduleRetry(token: token, error: errorType)
6363
// TODO: rewind the stream once streaming is properly implemented
6464
return try tryRequest(token: newToken, partitionId: partitionId, context: context, input: input, next: next)
6565
} else {
6666
return serviceResponse
6767
}
6868
case .success:
69-
retrier.recordSuccess(token: token)
69+
retryer.recordSuccess(token: token)
7070
return serviceResponse
7171
}
7272
}

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSClientRuntimeTypes.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object AWSClientRuntimeTypes {
3636
val AWSUserAgentMetadata = runtimeSymbol("AWSUserAgentMetadata")
3737
val APIMetadata = runtimeSymbol("APIMetadata")
3838
val UserAgentMiddleware = runtimeSymbol("UserAgentMiddleware")
39-
val RetrierMiddleware = runtimeSymbol("RetrierMiddleware")
39+
val RetryerMiddleware = runtimeSymbol("RetryerMiddleware")
4040
val EndpointResolverMiddleware = runtimeSymbol("EndpointResolverMiddleware")
4141
val EndpointResolver = runtimeSymbol("EndpointResolver")
4242
val CredentialsProvider = runtimeSymbol("CredentialsProvider")

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/middleware/RetryMiddleware.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class RetryMiddleware : OperationMiddlewareRenderable {
2929
op: OperationShape,
3030
operationStackName: String
3131
) {
32-
writer.write("$operationStackName.${middlewareStep.stringValue()}.intercept(position: ${position.stringValue()}, middleware: \$N(${middlewareParamsString(ctx, serviceShape, op)}))", AWSClientRuntimeTypes.Core.RetrierMiddleware)
32+
writer.write("$operationStackName.${middlewareStep.stringValue()}.intercept(position: ${position.stringValue()}, middleware: \$N(${middlewareParamsString(ctx, serviceShape, op)}))", AWSClientRuntimeTypes.Core.RetryerMiddleware)
3333
}
3434

3535
override fun middlewareParamsString(
3636
ctx: ProtocolGenerator.GenerationContext,
3737
serviceShape: ServiceShape,
3838
op: OperationShape
3939
): String {
40-
return "retrier: config.retrier"
40+
return "retryer: config.retryer"
4141
}
4242
}

codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/RestJsonProtocolGeneratorTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class RestJsonProtocolGeneratorTests {
114114
public var httpClientEngine: ClientRuntime.HttpClientEngine
115115
public var idempotencyTokenGenerator: ClientRuntime.IdempotencyTokenGenerator
116116
public var logger: ClientRuntime.LogAgent
117-
public var retrier: ClientRuntime.Retrier
117+
public var retryer: ClientRuntime.SDKRetryer
118118
119119
public var credentialsProvider: AWSClientRuntime.CredentialsProvider
120120
public var endpointResolver: AWSClientRuntime.EndpointResolver
@@ -147,7 +147,7 @@ class RestJsonProtocolGeneratorTests {
147147
self.httpClientEngine = runtimeConfig.httpClientEngine
148148
self.idempotencyTokenGenerator = runtimeConfig.idempotencyTokenGenerator
149149
self.logger = runtimeConfig.logger
150-
self.retrier = runtimeConfig.retrier
150+
self.retryer = runtimeConfig.retryer
151151
}
152152
153153
public convenience init(

0 commit comments

Comments
 (0)