Split unit and integ tests (#192)

* split unit and integ tests

* Fix Flyway runner integ test

* fix build

Co-authored-by: Chazal <chazalf@88665a14a6c3.ant.amazon.com>

Author: flochaz

core/.projen/deps.json

@@ -15,7 +15,6 @@ const project = new AwsCdkConstructLibrary({
   homepage: 'https://aws-samples.github.io/aws-analytics-reference-architecture/',
   copyrightPeriod: `2021-${new Date().getFullYear()}`,
   copyrightOwner: 'Amazon.com, Inc. or its affiliates. All Rights Reserved.',
-
   keywords: [
     'aws',
     'constructs',
@@ -70,8 +69,16 @@ const project = new AwsCdkConstructLibrary({
     '@types/js-yaml',
     '@types/jest',
     'esbuild',
+    'aws-cdk@1.130.0',
+    'jest-runner-groups',
   ],
 
+  jestOptions: {
+    jestConfig: {
+      runner: 'groups',
+    },
+  },
+
   bundledDeps: [
     'js-yaml',
     'uuid',
@@ -95,6 +102,17 @@ const project = new AwsCdkConstructLibrary({
 
 });
 
+project.testTask.reset('jest --group=unit');
+project.testTask.spawn('eslint');
+
+project.addTask('test:unit', {
+  exec: 'jest --group=unit',
+});
+
+project.addTask('test:integ', {
+  exec: 'jest --group=integ',
+});
+
 const testDeploy = project.addTask('test:deploy', {
   exec: 'cdk deploy --app=./lib/integ.default.js',
 });

core/.projen/tasks.json

@@ -743,6 +743,17 @@ new FlywayRunner(scope: Construct, id: string, props: FlywayRunnerProps)
 
 
 
+#### Properties <a name="Properties"></a>
+
+##### `flywayRunner`<sup>Required</sup> <a name="aws-analytics-reference-architecture.FlywayRunner.property.flywayRunner"></a>
+
+```typescript
+public readonly flywayRunner: CustomResource;
+```
+
+- *Type:* [`@aws-cdk/core.CustomResource`](#@aws-cdk/core.CustomResource)
+
+---
 
 
 ### SingletonBucket <a name="aws-analytics-reference-architecture.SingletonBucket"></a>

core/.projenrc.js

@@ -85,6 +85,8 @@ export interface FlywayRunnerProps {
  * ```
  */
 export class FlywayRunner extends cdk.Construct {
+  public readonly flywayRunner: CustomResource;
+
   constructor(scope: cdk.Construct, id: string, props: FlywayRunnerProps) {
     super(scope, id);
 
@@ -138,7 +140,7 @@ export class FlywayRunner extends cdk.Construct {
       vpc: props.vpc,
     });
 
-    new CustomResource(this, 'trigger', {
+    this.flywayRunner =new CustomResource(this, 'trigger', {
       serviceToken: flywayCustomResourceProvider.serviceToken,
       properties: {
         flywayRequest: {

core/API.md

@@ -1,7 +1,7 @@
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.0-rc-1))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=

core/package.json

@@ -35,6 +35,8 @@ public Map handleRequest(CloudFormationCustomResourceEvent event, Context contex
     public Map handleRequest(CloudFormationCustomResourceEvent event, AmazonCloudFormation cloudFormationClient) {
         String physicalResourceId = event.getPhysicalResourceId();
         String requestType = event.getRequestType();
+        HashMap<String, Object> schemaVersion = new HashMap<>();
+        schemaVersion.put("version", "0");
         switch (requestType) {
       /*
         For create requests, attempt to connect to the on-premise Active Directory
@@ -45,7 +47,9 @@ public Map handleRequest(CloudFormationCustomResourceEvent event, AmazonCloudFor
                 DescribeStackResourceResult currentResource = cloudFormationClient.describeStackResource(new DescribeStackResourceRequest().withStackName(event.getStackId()).withLogicalResourceId(event.getLogicalResourceId()));
                 String currentResourceStatus = currentResource.getStackResourceDetail().getResourceStatus();
                 if(!currentResourceStatus.equals("UPDATE_ROLLBACK_IN_PROGRESS")) {
-                    callFlywayService();
+                    Response run = callFlywayService();
+                    schemaVersion.put("version", run.getInfo().getCurrent().getVersion().getVersion());
+
                 }
                 break;
             case "Delete":
@@ -55,8 +59,10 @@ public Map handleRequest(CloudFormationCustomResourceEvent event, AmazonCloudFor
         }
 
         HashMap<String, Object> cfnResponse = new HashMap<>();
+
         cfnResponse.put("PhysicalResourceId", physicalResourceId);
         cfnResponse.put("RequestType", event.getRequestType());
+        cfnResponse.put("Data", schemaVersion);
 
         System.out.println("result: Successfully " + event.getRequestType() + " migrations");
         System.out.println("response: " + cfnResponse);

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

@@ -0,0 +1,77 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+/**
+ * Tests FlywayRunner
+ *
+ * @group integ/redshift/flyway-runner
+ */
+
+import * as path from 'path';
+import * as ec2 from '@aws-cdk/aws-ec2';
+import * as redshift from '@aws-cdk/aws-redshift';
+import * as cdk from '@aws-cdk/core';
+import { SdkProvider } from 'aws-cdk/lib/api/aws-auth';
+import { CloudFormationDeployments } from 'aws-cdk/lib/api/cloudformation-deployments';
+
+import { FlywayRunner } from '../../src/db-schema-manager';
+
+// GIVEN
+const integTestApp = new cdk.App();
+const stack = new cdk.Stack(integTestApp, 'FlywayRunnerE2eTest');
+
+const vpc = new ec2.Vpc(stack, 'Vpc');
+
+const dbName = 'testdb';
+const cluster = new redshift.Cluster(stack, 'Redshift', {
+  removalPolicy: cdk.RemovalPolicy.DESTROY,
+  masterUser: {
+    masterUsername: 'admin',
+  },
+  vpc,
+  defaultDatabaseName: dbName,
+});
+
+const runner = new FlywayRunner(stack, 'testMigration', {
+  migrationScriptsFolderAbsolutePath: path.join(__dirname, './resources/sql'),
+  cluster: cluster,
+  vpc: vpc,
+  databaseName: dbName,
+});
+
+new cdk.CfnOutput(stack, 'schemaVersion', {
+  value: runner.flywayRunner.getAtt('version').toString(),
+  exportName: 'schemaVersion',
+});
+
+describe('deploy succeed', () => {
+  it('can be deploy succcessfully', async () => {
+    // GIVEN
+    const stackArtifact = integTestApp.synth().getStackByName(stack.stackName);
+
+    const sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
+      profile: process.env.AWS_PROFILE,
+    });
+    const cloudFormation = new CloudFormationDeployments({ sdkProvider });
+
+    // WHEN
+    const deployResult = await cloudFormation.deployStack({
+      stack: stackArtifact,
+    });
+
+    // THEN
+    expect(deployResult.outputs.schemaVersion).toEqual('2');
+  }, 9000000);
+});
+
+afterAll(async () => {
+  const stackArtifact = integTestApp.synth().getStackByName(stack.stackName);
+
+  const sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
+    profile: process.env.AWS_PROFILE,
+  });
+  const cloudFormation = new CloudFormationDeployments({ sdkProvider });
+
+  await cloudFormation.destroyStack({
+    stack: stackArtifact,
+  });
+});