fix: db-shema-manager e2e test fix working around stack deletion issue (#336)

* fix db schema manager e2e tests

Co-authored-by: Florian Chazal <[email protected]>

Author: flochaz

core/.projen/tasks.json

@@ -191,22 +191,20 @@ const gradleBuildTask = project.addTask('gradle-build', {
   description: './gradlew shadowJar all folders in lib that has requirements.txt',
 });
 
-for (const dirPath of findAllGradleLambdaDir('src')) {
+for (const gradlePath of findAllGradleLambdaDir('src')) {
   console.log('loop over gradle dir');
-  // Assume that all folders with 'requirements.txt' have been copied to lib
-  // by the task 'copy-resources'
-  const dirPathInLib = dirname(dirPath.replace('src', 'lib'));
-  const gradleCmd = `cd ${dirPathInLib} && ./gradlew shadowJar && cp build/libs/*.jar ./ 2> /dev/null`;
+  const dirPath = dirname(gradlePath);
+  const gradleCmd = `cd ${dirPath} && ./gradlew shadowJar && cp build/libs/*.jar ./ 2> /dev/null`;
 
   gradleBuildTask.exec(gradleCmd);
 }
 
 /**
  * Run `copy-resources` and `pip-install` as part of compile
  */
+project.compileTask.exec('npx projen gradle-build');
 project.compileTask.exec('npx projen copy-resources');
 project.compileTask.exec('npx projen pip-install');
-project.compileTask.exec('npx projen gradle-build');
 
 /**
  * Find all directory that has a Python package.

core/.projenrc.js

@@ -170,7 +170,9 @@ export class FlywayRunner extends cdk.Construct {
         assetHash: (migrationFilesDeployment.node.findChild('Asset1') as Asset).assetHash,
       },
     });
-
+    for(const subnet of props.vpc.privateSubnets) {
+      flywayLambda.node.addDependency(subnet);
+    }
     flywayCustomResourceProvider.node.addDependency(migrationFilesDeployment);
   }
 }

core/src/db-schema-manager/flyway-runner.ts

@@ -9,4 +9,7 @@ gradle-app.setting
 !gradle-wrapper.jar
 
 # Cache of project
-.gradletasknamecache
+.gradletasknamecache
+
+
+flyway-all.jar

core/src/db-schema-manager/resources/flyway-lambda/.gitignore

@@ -32,16 +32,16 @@ const cluster = new redshift.Cluster(stack, 'Redshift', {
   defaultDatabaseName: dbName,
 });
 
-const tokenizedValue = new cdk.CfnOutput(stack, "tokenizedValue", {
-  value: "second_table"
-})
+const tokenizedValue = new cdk.CfnOutput(stack, 'tokenizedValue', {
+  value: 'second_table',
+});
 
 const runner = new FlywayRunner(stack, 'testMigration', {
   migrationScriptsFolderAbsolutePath: path.join(__dirname, './resources/sql'),
   cluster: cluster,
   vpc: vpc,
   databaseName: dbName,
-  replaceDictionary: {TABLE_NAME: tokenizedValue.value},
+  replaceDictionary: { TABLE_NAME: tokenizedValue.value },
 });
 
 new cdk.CfnOutput(stack, 'schemaVersion', {
@@ -50,7 +50,7 @@ new cdk.CfnOutput(stack, 'schemaVersion', {
 });
 
 describe('deploy succeed', () => {
-  it.skip('can be deploy succcessfully', async () => {
+  it('can be deploy succcessfully', async () => {
     // GIVEN
     const stackArtifact = integTestApp.synth().getStackByName(stack.stackName);
 
@@ -77,7 +77,18 @@ afterAll(async () => {
   });
   const cloudFormation = new CloudFormationDeployments({ sdkProvider });
 
-  await cloudFormation.destroyStack({
-    stack: stackArtifact,
-  });
-});
+  let retryCount = 1;
+  while (retryCount >= 0) {
+    try {
+      await cloudFormation.destroyStack({
+        stack: stackArtifact,
+      });
+    } catch (e) {
+      console.error(`Fail to delete stack retrying`);
+      if(retryCount == 0) {
+        throw e;
+      }
+    }
+    retryCount--;
+  }
+}, 9000000);