JavaScript (v3): Integration test fixes. (#6853)

* JavaScript (v3): DynamoDB - Fix hanging test in partiql-batch.

* JavaScript (v3): IAM - Adjust timings in iam basics to prevent timeouts.

* JavaScript (v3): SES - Fix integration test issues.

Several issues were found in the SES integration tests:
- Actual emails were being sent (to a bogus email address) instead of throwing the expected errors.
- There was no waiter checking for S3 object deletion, allowing for a bucket deletion to fail.
- An SES quota had been hit, preventing further tests from running.

The first two issues were addressed, which should prevent the third from happening again.

* Revert "Weathertop: Pause JSV3 runs (#6851)"

This reverts commit b3925e3. Integration
tests were paused in order to debug some failures that were causing the
AWS account to be polluted with resources. The tests are cleaned up in
a previous commit and this turns the tests back on.

Author: cpyle0819

javascriptv3/Dockerfile

@@ -1,27 +1,25 @@
 # syntax=docker/dockerfile:1
 FROM node:20
 
-CMD exit 0
+# Update image
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-# # Update image
-# RUN apt-get update && \
-#     apt-get upgrade -y && \
-#     apt-get clean && \
-#     rm -rf /var/lib/apt/lists/*
+# Copy source code
+COPY ./javascriptv3 /javascriptv3
 
-# # Copy source code
-# COPY ./javascriptv3 /javascriptv3
+# Set non-root user
+RUN useradd -m automation && \
+    chown -R automation:automation /javascriptv3
+USER automation:automation
 
-# # Set non-root user
-# RUN useradd -m automation && \
-#     chown -R automation:automation /javascriptv3
-# USER automation:automation
+# Copy resources
+COPY --chown=automation:automation ./resources /resources
+COPY --chown=automation:automation ./python/example_code/glue/flight_etl_job_script.py /python/example_code/glue/flight_etl_job_script.py
+COPY --chown=automation:automation ./workflows /workflows
 
-# # Copy resources
-# COPY --chown=automation:automation ./resources /resources
-# COPY --chown=automation:automation ./python/example_code/glue/flight_etl_job_script.py /python/example_code/glue/flight_etl_job_script.py
-# COPY --chown=automation:automation ./workflows /workflows
-
-# # Set default command
-# # `npm i` needs to be run in the container. Otherwise it causes a dependency issue: https://github.com/evanw/esbuild/issues/1646#issuecomment-1238080595
-# CMD npm i --prefix /javascriptv3 && npm run --prefix /javascriptv3 integration-test
+# Set default command
+# `npm i` needs to be run in the container. Otherwise it causes a dependency issue: https://github.com/evanw/esbuild/issues/1646#issuecomment-1238080595
+CMD npm i --prefix /javascriptv3 && npm run --prefix /javascriptv3 integration-test

javascriptv3/example_code/dynamodb/scenarios/partiql-batch.js

@@ -37,7 +37,7 @@ export const main = async (confirmAll = false) => {
 this table, the scenario cannot continue. Delete it?`,
       { type: "confirm", confirmAll },
     );
-    const deleteTable = await input.handle({});
+    const deleteTable = await input.handle({}, { confirmAll });
     if (deleteTable) {
       await client.send(new DeleteTableCommand({ tableName }));
     } else {

javascriptv3/example_code/iam/scenarios/basic.js

@@ -25,9 +25,9 @@ import { ScenarioInput } from "@aws-doc-sdk-examples/lib/scenario/index.js";
 
 // Set the parameters.
 const iamClient = new IAMClient({});
-const userName = "test_name";
-const policyName = "test_policy";
-const roleName = "test_role";
+const userName = "iam_basic_test_username";
+const policyName = "iam_basic_test_policy";
+const roleName = "iam_basic_test_role";
 
 /**
  * Create a new IAM user. If the user already exists, give
@@ -213,7 +213,7 @@ export const main = async (confirmAll = false) => {
   // List the S3 buckets again.
   // Retry the list buckets operation until it succeeds. AccessDenied might
   // be thrown while the role policy is still stabilizing.
-  await retry({ intervalInMs: 2000, maxRetries: 60 }, () =>
+  await retry({ intervalInMs: 2000, maxRetries: 120 }, () =>
     listBuckets(s3Client),
   );
 

javascriptv3/example_code/iam/vite.config.js

@@ -3,7 +3,7 @@
 
 import { defineConfig } from "vitest/config";
 
-const TEST_TIMEOUT_IN_MINUTES = 5;
+const TEST_TIMEOUT_IN_MINUTES = 30;
 const MS_IN_SECOND = 1000;
 const SECONDS_IN_MINUTE = 60;
 

javascriptv3/example_code/s3/libs/s3Utils.js

@@ -11,6 +11,7 @@ import {
   PutObjectLegalHoldCommand,
   GetObjectRetentionCommand,
   DeleteObjectCommand,
+  waitUntilObjectNotExists,
 } from "@aws-sdk/client-s3";
 import { client as s3Client } from "../client.js";
 
@@ -31,16 +32,23 @@ export function deleteBucket(bucketName) {
 }
 
 export async function emptyBucket(bucketName) {
-  const listObjectsCommand = new ListObjectsCommand({ Bucket: bucketName });
-  const listObjectsResult = await s3Client.send(listObjectsCommand);
+  const listObjectsResult = await s3Client.send(
+    new ListObjectsCommand({ Bucket: bucketName }),
+  );
   const objects = listObjectsResult.Contents;
   const objectIdentifiers = objects.map((o) => ({ Key: o.Key }));
-  const deleteObjectsCommand = new DeleteObjectsCommand({
-    Bucket: bucketName,
-    Delete: { Objects: objectIdentifiers },
-  });
-
-  return s3Client.send(deleteObjectsCommand);
+  await s3Client.send(
+    new DeleteObjectsCommand({
+      Bucket: bucketName,
+      Delete: { Objects: objectIdentifiers },
+    }),
+  );
+  for (const objId of objectIdentifiers) {
+    await waitUntilObjectNotExists(
+      { client: s3Client },
+      { Bucket: bucketName, Key: objId.Key },
+    );
+  }
 }
 
 export function putBucketPolicyAllowPuts(bucketName, sid) {

javascriptv3/example_code/ses/tests/create-receipt-rule.integration.test.js

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { describe, beforeAll, afterAll, it, expect } from "vitest";
+import { describe, beforeAll, afterAll, it } from "vitest";
 
 import {
   RULE_SET_NAME,
@@ -40,7 +40,6 @@ describe("ses_createreceiptrule", () => {
   });
 
   it("should create a receipt rule", async () => {
-    const result = await run();
-    expect(result.$metadata.httpStatusCode).toBe(200);
+    await run();
   });
 });

javascriptv3/example_code/ses/tests/send-bulk-templated-email.integration.test.js

@@ -2,19 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 import { describe, beforeAll, afterAll, it, expect } from "vitest";
 
-import {
-  createIdentity,
-  createTemplate,
-  deleteIdentity,
-  deleteTemplate,
-} from "../src/libs/sesUtils";
-import { run, TEMPLATE_NAME, USERS } from "../src/ses_sendbulktemplatedemail";
+import { createTemplate, deleteTemplate } from "../src/libs/sesUtils";
+import { run, TEMPLATE_NAME } from "../src/ses_sendbulktemplatedemail";
 import { MessageRejected } from "@aws-sdk/client-ses";
 
 describe("ses_sendbulktemplatedemail", () => {
   beforeAll(async () => {
     try {
-      await Promise.all(USERS.map((user) => createIdentity(user.emailAddress)));
       await createTemplate(TEMPLATE_NAME);
     } catch (e) {
       console.error(e);
@@ -23,7 +17,6 @@ describe("ses_sendbulktemplatedemail", () => {
 
   afterAll(async () => {
     try {
-      await Promise.all(USERS.map((user) => deleteIdentity(user.emailAddress)));
       await deleteTemplate(TEMPLATE_NAME);
     } catch (e) {
       console.error(e);

javascriptv3/example_code/ses/tests/send-templated-email.integration.test.js

@@ -2,19 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 import { describe, beforeAll, afterAll, it, expect } from "vitest";
 
-import {
-  createIdentity,
-  createTemplate,
-  deleteIdentity,
-  deleteTemplate,
-} from "../src/libs/sesUtils";
-import { run, TEMPLATE_NAME, USER } from "../src/ses_sendtemplatedemail";
+import { createTemplate, deleteTemplate } from "../src/libs/sesUtils";
+import { run, TEMPLATE_NAME } from "../src/ses_sendtemplatedemail";
 import { MessageRejected } from "@aws-sdk/client-ses";
 
 describe("ses_sendbulktemplatedemail", () => {
   beforeAll(async () => {
     try {
-      await createIdentity(USER.emailAddress);
       await createTemplate(TEMPLATE_NAME);
     } catch (e) {
       console.error(e);
@@ -23,7 +17,6 @@ describe("ses_sendbulktemplatedemail", () => {
 
   afterAll(async () => {
     try {
-      await deleteIdentity(USER.emailAddress);
       await deleteTemplate(TEMPLATE_NAME);
     } catch (e) {
       console.error(e);

javascriptv3/example_code/ses/vite.config.js

@@ -2,9 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 import { defineConfig } from "vitest/config";
 
+const timeout = 3600000; // 1 hour timeout
+
 export default defineConfig({
   test: {
-    testTimeout: 3600000, // 1 hour timeout
+    testTimeout: timeout,
+    hookTimeout: timeout,
     sequence: {
       concurrent: false, // Run tests sequentially
     },