Use waiterState when searching for waitFor calls to replace (#385)

aws · Feb 21, 2023 · 69f2ea7 · 69f2ea7
1 parent 8dcb1fd
commit 69f2ea7
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 3 deletions.
diff --git a/.changeset/neat-wombats-drop.md b/.changeset/neat-wombats-drop.md
@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": patch
+---
+
+Use waiterState when searching for waitFor calls to replace
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-import-equals.input.ts b/src/transforms/v2-to-v3/__fixtures__/waiters/global-import-equals.input.ts
@@ -3,5 +3,6 @@ import AWS = require("aws-sdk");
 const Bucket = "BUCKET_NAME";
 const client = new AWS.S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-import-equals.output.ts b/src/transforms/v2-to-v3/__fixtures__/waiters/global-import-equals.output.ts
@@ -2,12 +2,17 @@ import AWS_S3 = require("@aws-sdk/client-s3");
 
 const {
   S3,
+  waitUntilBucketNotExists,
   waitUntilBucketExists
 } = AWS_S3;
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-import.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-import.input.js
@@ -3,5 +3,6 @@ import AWS from "aws-sdk";
 const Bucket = "BUCKET_NAME";
 const client = new AWS.S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-import.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-import.output.js
@@ -1,8 +1,12 @@
-import { S3, waitUntilBucketExists } from "@aws-sdk/client-s3";
+import { S3, waitUntilBucketNotExists, waitUntilBucketExists } from "@aws-sdk/client-s3";
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-require-property.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-require-property.input.js
@@ -3,5 +3,6 @@ const S3 = require("aws-sdk").S3;
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-require-property.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-require-property.output.js
@@ -1,11 +1,16 @@
 const {
   S3,
+  waitUntilBucketNotExists,
   waitUntilBucketExists
 } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-require.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-require.input.js
@@ -3,5 +3,6 @@ const AWS = require("aws-sdk");
 const Bucket = "BUCKET_NAME";
 const client = new AWS.S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/global-require.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/global-require.output.js
@@ -1,11 +1,16 @@
 const {
   S3,
+  waitUntilBucketNotExists,
   waitUntilBucketExists
 } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-deep.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-deep.input.js
@@ -3,5 +3,6 @@ import S3 from "aws-sdk/clients/s3";
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-deep.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-deep.output.js
@@ -1,8 +1,12 @@
-import { S3, waitUntilBucketExists } from "@aws-sdk/client-s3";
+import { S3, waitUntilBucketNotExists, waitUntilBucketExists } from "@aws-sdk/client-s3";
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-equals.input.ts b/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-equals.input.ts
@@ -3,5 +3,6 @@ import S3 = require("aws-sdk/clients/s3");
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-equals.output.ts b/src/transforms/v2-to-v3/__fixtures__/waiters/service-import-equals.output.ts
@@ -2,12 +2,17 @@ import AWS_S3 = require("@aws-sdk/client-s3");
 
 const {
   S3,
+  waitUntilBucketNotExists,
   waitUntilBucketExists
 } = AWS_S3;
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-import.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-import.input.js
@@ -3,5 +3,6 @@ import { S3 } from "aws-sdk";
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-import.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-import.output.js
@@ -1,8 +1,12 @@
-import { S3, waitUntilBucketExists } from "@aws-sdk/client-s3";
+import { S3, waitUntilBucketNotExists, waitUntilBucketExists } from "@aws-sdk/client-s3";
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-require-deep.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-require-deep.input.js
@@ -3,5 +3,6 @@ const S3 = require("aws-sdk/clients/s3");
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-require-deep.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-require-deep.output.js
@@ -1,11 +1,16 @@
 const {
   S3,
+  waitUntilBucketNotExists,
   waitUntilBucketExists
 } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-require.input.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-require.input.js
@@ -3,5 +3,6 @@ const { S3 } = require("aws-sdk");
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await client.waitFor("bucketNotExists", { Bucket }).promise();
 await client.createBucket({ Bucket }).promise();
 await client.waitFor("bucketExists", { Bucket }).promise();
diff --git a/src/transforms/v2-to-v3/__fixtures__/waiters/service-require.output.js b/src/transforms/v2-to-v3/__fixtures__/waiters/service-require.output.js
@@ -1,11 +1,16 @@
 const {
   S3,
+  waitUntilBucketNotExists,
   waitUntilBucketExists
 } = require("@aws-sdk/client-s3");
 
 const Bucket = "BUCKET_NAME";
 const client = new S3({ region: "REGION" });
 
+await waitUntilBucketNotExists({
+  client,
+  maxWaitTime: 180
+}, { Bucket });
 await client.createBucket({ Bucket });
 await waitUntilBucketExists({
   client,

diff --git a/src/transforms/v2-to-v3/apis/replaceWaiterApi.ts b/src/transforms/v2-to-v3/apis/replaceWaiterApi.ts
@@ -31,6 +31,7 @@ export const replaceWaiterApi = (
             object: v2ClientId,
             property: { type: "Identifier", name: "waitFor" },
           },
+          arguments: [{ value: waiterState }],
         })
         .replaceWith((callExpression) => {
           return j.callExpression(j.identifier(v3WaiterApiName), [