diff --git a/packages/middleware-sdk-s3/src/s3-expires-middleware.e2e.spec.ts b/packages/middleware-sdk-s3/src/s3-expires-middleware.e2e.spec.ts index ff45d623bfea..d53bff25ad14 100644 --- a/packages/middleware-sdk-s3/src/s3-expires-middleware.e2e.spec.ts +++ b/packages/middleware-sdk-s3/src/s3-expires-middleware.e2e.spec.ts @@ -18,17 +18,24 @@ describe("S3 Expires e2e test", () => { let callerID = null as unknown as GetCallerIdentityCommandOutput; let Bucket: string; - // random element limited to 2 letters to avoid concurrent IO, and - // to limit bucket count to 676 if there is failure to delete them. - const alphabet = "abcdefghijklmnopqrstuvwxyz"; - const randId = alphabet[(Math.random() * alphabet.length) | 0] + alphabet[(Math.random() * alphabet.length) | 0]; + const alphabet = "abcdefghijklmnopqrstuvwxyz0123456789"; + const char = () => alphabet[(Math.random() * alphabet.length) | 0]; + const randId = char() + char() + char() + char() + (Date.now() % 1000); beforeAll(async () => { callerID = await stsClient.getCallerIdentity({}); - Bucket = `${callerID.Account}-${randId}-s3-expires`; - await s3.createBucket({ - Bucket, - }); + Bucket = `${callerID.Account}-s3-expires-${randId}`; + + await s3 + .createBucket({ + Bucket, + }) + .catch((e) => { + if (e.name === "BucketAlreadyOwnedByYou") { + return; + } + throw e; + }); }); afterAll(async () => {