JavaScript (v3): Glue - Make clean up more robust. (#6829)

deleteDatabase wasn't being handled, leaving the test open to crashing before clean up was done. This handles that error. There was also a potential for objects in the S3 Bucket to not be fully deleted before trying to delete the bucket. I suspect this was causing issues leading to N stacks being created every run and not being torn down.

Author: cpyle0819

javascriptv3/example_code/glue/package.json

@@ -1,26 +1,25 @@
 {
  "name": "@aws-doc-sdk-examples/glue",
- "version": "1.0.0",
+ "version": "1.0.1",
  "description": "AWS SDK for JavaScript (v3) examples for AWS Glue",
  "type": "module",
- "author": "corepyle@amazon.com",
+ "author": "Corey Pyle <corepyle@amazon.com>",
  "license": "Apache-2.0",
  "scripts": {
  "test": "vitest run **/*.unit.test.js",
  "integration-test": "vitest run **/*.integration.test.js --reporter=junit --outputFile=test_results/$npm_package_name.junit.xml"
  },
  "dependencies": {
- "@aws-doc-sdk-examples/lib": "^1.0.0",
- "@aws-sdk/client-glue": "^3.425.0",
+ "@aws-doc-sdk-examples/lib": "^1.0.1",
+ "@aws-sdk/client-glue": "^3.645.0",
  "chalk": "^5.3.0",
- "dotenv": "^16.3.1",
- "inquirer": "^9.2.11",
- "open": "^9.1.0"
+ "dotenv": "^16.4.5",
+ "inquirer": "^10.2.0",
+ "open": "^10.1.0"
  },
  "devDependencies": {
- "@aws-sdk/client-cloudformation": "^3.204.0",
- "@aws-sdk/client-s3": "^3.204.0",
- "@vitest/coverage-c8": "^0.25.0",
- "vitest": "^1.6.0"
+ "@aws-sdk/client-cloudformation": "^3.645.0",
+ "@aws-sdk/client-s3": "^3.645.0",
+ "vitest": "^2.0.5"
  }
 }

javascriptv3/example_code/glue/tests/glue-actions.integration.test.js

@@ -16,6 +16,7 @@ import {
  ListObjectsCommand,
  PutObjectCommand,
  S3Client,
+ waitUntilObjectNotExists,
 } from "@aws-sdk/client-s3";
 
 import { dirnameFromMetaUrl } from "@aws-doc-sdk-examples/lib/utils/util-fs.js";
@@ -42,7 +43,7 @@ config();
 
 const dirname = dirnameFromMetaUrl(import.meta.url);
 const cdkAppPath = `${dirname}../../../../resources/cdk/glue_role_bucket/setup.yaml`;
-const stackName = `glue-test-stack-${Date.now()}`;
+const stackName = `glue-test-stack`;
 const fiveMinutesInMs = 5 * 60 * 1000; // 5 Minutes
 const fiveMinutesInSeconds = fiveMinutesInMs / 1000;
 
@@ -83,9 +84,10 @@ const emptyS3Bucket = async (bucketName) => {
  const { Contents } = await client.send(listCommand);
 
  await Promise.all(
- Contents.map(({ Key }) =>
- client.send(new DeleteObjectCommand({ Bucket: bucketName, Key })),
- ),
+ Contents.map(async ({ Key }) => {
+ await client.send(new DeleteObjectCommand({ Bucket: bucketName, Key }));
+ await waitUntilObjectNotExists({ client }, { Bucket: bucketName, Key });
+ }),
  );
 };
 
@@ -113,18 +115,14 @@ describe("actions", () => {
  }, fiveMinutesInMs);
 
  afterAll(async () => {
- try {
- await emptyS3Bucket(bucketName).catch(console.error);
- await deleteTable("doc-example-database", "doc-example-csv").catch(
- console.error,
- );
- await deleteDatabase("doc-example-database");
- await deleteCrawler("s3-flight-data-crawler").catch(console.error);
- await deleteJob("flight_etl_job").catch(console.error);
- await deleteStack().catch(console.error);
- } catch (err) {
- console.error(err);
- }
+ await emptyS3Bucket(bucketName).catch(console.error);
+ await deleteTable("doc-example-database", "doc-example-csv").catch(
+ console.error,
+ );
+ await deleteDatabase("doc-example-database").catch(console.error);
+ await deleteCrawler("s3-flight-data-crawler").catch(console.error);
+ await deleteJob("flight_etl_job").catch(console.error);
+ await deleteStack().catch(console.error);
  }, fiveMinutesInMs);
 
  const addPythonScriptToBucket = async () => {
@@ -207,20 +205,16 @@ describe("actions", () => {
  expect(JobRuns[0].JobName).toBe("flight_etl_job");
  };
 
- it(
- "should run",
- async () => {
- await addPythonScriptToBucket();
- await testCreateCrawler();
- await testCreateJob(bucketName, roleName);
- await testListJobs();
- await testStartCrawler();
- await testGetDatabases();
- await testGetDatabase();
- await testGetTables();
- await testStartJobRun(bucketName);
- await testGetJobRuns();
- },
- { timeout: fiveMinutesInMs * 5 },
- );
+ it("should run", { timeout: fiveMinutesInMs * 5 }, async () => {
+ await addPythonScriptToBucket();
+ await testCreateCrawler();
+ await testCreateJob(bucketName, roleName);
+ await testListJobs();
+ await testStartCrawler();
+ await testGetDatabases();
+ await testGetDatabase();
+ await testGetTables();
+ await testStartJobRun(bucketName);
+ await testGetJobRuns();
+ });
 });

javascriptv3/example_code/glue/vite.config.js

@@ -7,8 +7,5 @@ export default defineConfig({
  test: {
  restoreMocks: true,
  cache: false,
- coverage: {
- reporter: ["text", "html"],
- },
  },
 });