feat(middleware-retry): use retry strategy v2

Author: srchase

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddClientRuntimeConfig.java

@@ -107,15 +107,15 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
             case BROWSER:
                 return MapUtils.of(
                         "maxAttempts", writer -> {
-                            writer.addDependency(TypeScriptDependency.MIDDLEWARE_RETRY);
+                            writer.addDependency(TypeScriptDependency.UTIL_RETRY);
                             writer.addImport("DEFAULT_MAX_ATTEMPTS", "DEFAULT_MAX_ATTEMPTS",
-                                    TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
+                                    TypeScriptDependency.UTIL_RETRY.packageName);
                             writer.write("DEFAULT_MAX_ATTEMPTS");
                         },
                         "retryMode", writer -> {
-                            writer.addDependency(TypeScriptDependency.MIDDLEWARE_RETRY);
+                            writer.addDependency(TypeScriptDependency.UTIL_RETRY);
                             writer.addImport("DEFAULT_RETRY_MODE", "DEFAULT_RETRY_MODE",
-                                    TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
+                                    TypeScriptDependency.UTIL_RETRY.packageName);
                             writer.write(
                                     "(async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE)");
                         },
@@ -150,7 +150,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                             writer.addImport("NODE_RETRY_MODE_CONFIG_OPTIONS", "NODE_RETRY_MODE_CONFIG_OPTIONS",
                                     TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
                             writer.addImport("DEFAULT_RETRY_MODE", "DEFAULT_RETRY_MODE",
-                                    TypeScriptDependency.MIDDLEWARE_RETRY.packageName);
+                                    TypeScriptDependency.UTIL_RETRY.packageName);
                             writer.openBlock("loadNodeConfig({", "})", () -> {
                                 writer.write("...NODE_RETRY_MODE_CONFIG_OPTIONS,");
                                 writer.write("default: async () => "

codegen/smithy-aws-typescript-codegen/src/test/java/software/amazon/smithy/aws/typescript/codegen/AddClientRuntimeConfigTest.java

@@ -40,6 +40,8 @@ public void awsClient() {
                 containsString(TypeScriptDependency.CONFIG_RESOLVER.packageName));
         assertThat(manifest.getFileString("package.json").get(),
                 containsString(TypeScriptDependency.MIDDLEWARE_RETRY.packageName));
+        assertThat(manifest.getFileString("package.json").get(),
+                containsString(TypeScriptDependency.UTIL_RETRY.packageName));
 
         // Check config interface fields
         assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("maxAttempts?:"));

packages/middleware-retry/src/AdaptiveRetryStrategy.spec.ts

@@ -1,11 +1,11 @@
+import { DefaultRateLimiter, RateLimiter, RETRY_MODES } from "@aws-sdk/util-retry";
+
 import { AdaptiveRetryStrategy } from "./AdaptiveRetryStrategy";
-import { RETRY_MODES } from "./config";
-import { DefaultRateLimiter } from "./DefaultRateLimiter";
 import { StandardRetryStrategy } from "./StandardRetryStrategy";
-import { RateLimiter, RetryQuota } from "./types";
+import { RetryQuota } from "./types";
 
 jest.mock("./StandardRetryStrategy");
-jest.mock("./DefaultRateLimiter");
+jest.mock("@aws-sdk/util-retry");
 
 describe(AdaptiveRetryStrategy.name, () => {
   const maxAttemptsProvider = jest.fn();

packages/middleware-retry/src/AdaptiveRetryStrategy.ts

@@ -1,9 +1,7 @@
 import { FinalizeHandler, FinalizeHandlerArguments, MetadataBearer, Provider } from "@aws-sdk/types";
+import { DefaultRateLimiter, RateLimiter, RETRY_MODES } from "@aws-sdk/util-retry";
 
-import { RETRY_MODES } from "./config";
-import { DefaultRateLimiter } from "./DefaultRateLimiter";
 import { StandardRetryStrategy, StandardRetryStrategyOptions } from "./StandardRetryStrategy";
-import { RateLimiter } from "./types";
 
 /**
  * Strategy options to be passed to AdaptiveRetryStrategy
@@ -12,6 +10,9 @@ export interface AdaptiveRetryStrategyOptions extends StandardRetryStrategyOptio
   rateLimiter?: RateLimiter;
 }
 
+/**
+ * @deprected use AdaptiveRetryStrategy from @aws-sdk/util-retry
+ */
 export class AdaptiveRetryStrategy extends StandardRetryStrategy {
   private rateLimiter: RateLimiter;
 

packages/middleware-retry/src/DefaultRateLimiter.spec.ts

@@ -1,9 +1,14 @@
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 import { isThrottlingError } from "@aws-sdk/service-error-classification";
+import {
+  DEFAULT_MAX_ATTEMPTS,
+  DEFAULT_RETRY_DELAY_BASE,
+  INITIAL_RETRY_TOKENS,
+  RETRY_MODES,
+  THROTTLING_RETRY_DELAY_BASE,
+} from "@aws-sdk/util-retry";
 import { v4 } from "uuid";
 
-import { DEFAULT_MAX_ATTEMPTS, RETRY_MODES } from "./config";
-import { DEFAULT_RETRY_DELAY_BASE, INITIAL_RETRY_TOKENS, THROTTLING_RETRY_DELAY_BASE } from "./constants";
 import { getDefaultRetryQuota } from "./defaultRetryQuota";
 import { defaultDelayDecider } from "./delayDecider";
 import { defaultRetryDecider } from "./retryDecider";

packages/middleware-retry/src/DefaultRateLimiter.ts

@@ -2,16 +2,17 @@ import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 import { isThrottlingError } from "@aws-sdk/service-error-classification";
 import { SdkError } from "@aws-sdk/types";
 import { FinalizeHandler, FinalizeHandlerArguments, MetadataBearer, Provider, RetryStrategy } from "@aws-sdk/types";
-import { v4 } from "uuid";
-
-import { DEFAULT_MAX_ATTEMPTS, RETRY_MODES } from "./config";
 import {
+  DEFAULT_MAX_ATTEMPTS,
   DEFAULT_RETRY_DELAY_BASE,
   INITIAL_RETRY_TOKENS,
   INVOCATION_ID_HEADER,
   REQUEST_HEADER,
+  RETRY_MODES,
   THROTTLING_RETRY_DELAY_BASE,
-} from "./constants";
+} from "@aws-sdk/util-retry";
+import { v4 } from "uuid";
+
 import { getDefaultRetryQuota } from "./defaultRetryQuota";
 import { defaultDelayDecider } from "./delayDecider";
 import { defaultRetryDecider } from "./retryDecider";
@@ -26,6 +27,9 @@ export interface StandardRetryStrategyOptions {
   retryQuota?: RetryQuota;
 }
 
+/**
+ * @deprected use StandardRetryStrategy from @aws-sdk/util-retry
+ */
 export class StandardRetryStrategy implements RetryStrategy {
   private retryDecider: RetryDecider;
   private delayDecider: DelayDecider;