Merge pull request #676 from aws-samples/fix-e2e-tests

test: use AwsCdkCli for deployments

Author: lmouhib

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-      CI: "true"
+      CI: 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -22,8 +22,10 @@ jobs:
         with:
           distribution: 'zulu' # OpenJDK
           java-version: '11'
+      - name: make shims writable for pip force-reinstall
+        run: sudo chmod 777 -R /opt/pyenv/shims
       - name: force cryptography version
-        run: pip install --force-reinstall "cryptography==38.0.4"      
+        run: pip install --force-reinstall "cryptography==38.0.4"
       - name: Install dependencies
         run: cd core && yarn install --check-files --frozen-lockfile
       - name: Set git identity
@@ -43,7 +45,8 @@ jobs:
           HEAD:$REF'
       - if: steps.git_diff.outputs.has_changes
         name: Update status check (if changed)
-        run: gh api -X POST /repos/$FULL_NAME/check-runs -F name="build" -F head_sha="$(git rev-parse HEAD)" -F
+        run:
+          gh api -X POST /repos/$FULL_NAME/check-runs -F name="build" -F head_sha="$(git rev-parse HEAD)" -F
           status="completed" -F conclusion="success"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

core/.projen/deps.json

@@ -5,7 +5,6 @@ const { basename, join, dirname, relative } = require('path');
 const fs = require('fs');
 const glob = require('glob');
 
-
 const { awscdk } = require('projen');
 
 const CDK_VERSION = '2.84.0';
@@ -18,12 +17,7 @@ const project = new awscdk.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',
-    'cdk',
-    'analytics',
-  ],
+  keywords: ['aws', 'constructs', 'cdk', 'analytics'],
 
   cdkVersion: CDK_VERSION,
   jsiiVersion: '~5.0.0',
@@ -60,7 +54,6 @@ const project = new awscdk.AwsCdkConstructLibrary({
     'aws-cdk-lib',
     `aws-cdk@${CDK_VERSION}`,
     `cdk-assets@${CDK_VERSION}`,
-    `@aws-cdk/cx-api@${CDK_VERSION}`,
     `@aws-cdk/cloudformation-diff@${CDK_VERSION}`,
     'jest-runner-groups',
     'promptly',
@@ -69,8 +62,9 @@ const project = new awscdk.AwsCdkConstructLibrary({
     '@types/[email protected]',
     `@aws-cdk/aws-redshift-alpha@${CDK_VERSION}-alpha.0`,
     `@aws-cdk/aws-glue-alpha@${CDK_VERSION}-alpha.0`,
+    `@aws-cdk/cli-lib-alpha@${CDK_VERSION}-alpha.0`,
     '@aws-cdk/lambda-layer-kubectl-v22',
-    '@aws-cdk/lambda-layer-kubectl-v25'
+    '@aws-cdk/lambda-layer-kubectl-v25',
   ],
 
   peerDeps: [
@@ -84,13 +78,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
     },
   },
 
-  bundledDeps: [
-    'js-yaml',
-    'uuid',
-    'aws-sdk',
-    '@exodus/schemasafe',
-    'simple-base',
-  ],
+  bundledDeps: ['js-yaml', 'uuid', 'aws-sdk', '@exodus/schemasafe', 'simple-base'],
 
   python: {
     distName: 'aws_analytics_reference_architecture',
@@ -106,7 +94,6 @@ const project = new awscdk.AwsCdkConstructLibrary({
   },
 
   stability: 'experimental',
-
 });
 
 project.testTask.reset('jest --group=unit');
@@ -137,7 +124,6 @@ project.addTask('test:destroy', {
   exec: 'cdk destroy --app=./lib/integ.default.js',
 });
 
-
 project.addDevDeps('glob');
 
 /**
@@ -204,7 +190,6 @@ project.compileTask.exec('npx projen pip-install');
  * @returns Array of directory paths
  */
 function findAllPythonLambdaDir(rootDir) {
-
   return glob.sync(`${rootDir}/**/requirements.txt`).map((pathWithReq) => {
     return pathWithReq;
   });

core/.projen/tasks.json

@@ -2,22 +2,22 @@
 // SPDX-License-Identifier: MIT-0
 
 /**
-* Tests AraBucket
-*
-* @group integ/ara-bucket
-*/
+ * Tests AraBucket
+ *
+ * @group integ/ara-bucket
+ */
 
 import * as cdk from 'aws-cdk-lib';
-import { deployStack, destroyStack } from './utils';
+import { TestStack } from './utils/TestStack';
 
 import { AraBucket } from '../../src/ara-bucket';
 
 jest.setTimeout(100000);
 // GIVEN
-const integTestApp = new cdk.App();
-const stack = new cdk.Stack(integTestApp, 'AraBucketE2eTest');
+const testStack = new TestStack('AraBucketE2eTest');
+const { stack } = testStack;
 
-const araBucket = AraBucket.getOrCreate(stack, { 
+const araBucket = AraBucket.getOrCreate(stack, {
   bucketName: 'my-ara-bucket',
   serverAccessLogsPrefix: 'test',
 });
@@ -30,13 +30,13 @@ new cdk.CfnOutput(stack, 'BucketName', {
 describe('deploy succeed', () => {
   it('can be deploy succcessfully', async () => {
     // GIVEN
-    const deployResult = await deployStack(integTestApp, stack);
+    const deployResult = await testStack.deploy();
 
     // THEN
-    expect(deployResult.outputs.BucketName).toContain('my-ara-bucket-');
+    expect(deployResult.BucketName).toContain('my-ara-bucket-');
   }, 9000000);
 });
 
 afterAll(async () => {
-  await destroyStack(integTestApp, stack);
+  await testStack.destroy();
 });

core/.projenrc.js

@@ -2,23 +2,25 @@
 // SPDX-License-Identifier: MIT-0
 
 /**
-* Tests AthenaDemoSetup
-*
-* @group integ/athena-demo-setup
-*/
+ * Tests AthenaDemoSetup
+ *
+ * @group integ/athena-demo-setup
+ */
 
 import * as cdk from 'aws-cdk-lib';
-import { deployStack, destroyStack } from './utils';
+import { TestStack } from './utils/TestStack';
 
 import { AthenaDemoSetup } from '../../src/athena-demo-setup';
 
 jest.setTimeout(100000);
 // GIVEN
-const integTestApp = new cdk.App();
-const stack = new cdk.Stack(integTestApp, 'AthenaDemoSetupE2eTest');
+const testStack = new TestStack('AthenaDemoSetupE2eTest');
+const { stack } = testStack;
 
 const athenaSetup = new AthenaDemoSetup(stack, 'AthenaSetup', {});
-const athenaSetup2 = new AthenaDemoSetup(stack, 'AthenaSetup2', {workgroupName: 'custom'});
+const athenaSetup2 = new AthenaDemoSetup(stack, 'AthenaSetup2', {
+  workgroupName: 'custom',
+});
 
 new cdk.CfnOutput(stack, 'ResultsBucketName', {
   value: athenaSetup.resultBucket.bucketName,
@@ -42,18 +44,16 @@ new cdk.CfnOutput(stack, 'ResultsBucketName2', {
 
 describe('deploy succeed', () => {
   it('can be deploy succcessfully', async () => {
-    const deployResult = await deployStack(integTestApp, stack);
+    const deployResult = await testStack.deploy();
 
-    
     // THEN
-    expect(deployResult.outputs.AthenaWorkgroupName).toEqual('demo');
-    expect(deployResult.outputs.AthenaWorkgroupName2).toEqual('custom');
-    expect(deployResult.outputs.ResultsBucketName).toContain('demo-athena-logs');
-    expect(deployResult.outputs.ResultsBucketName2).toContain('custom-athena-logs');
-
+    expect(deployResult.AthenaWorkgroupName).toEqual('demo');
+    expect(deployResult.AthenaWorkgroupName2).toEqual('custom');
+    expect(deployResult.ResultsBucketName).toContain('demo-athena-logs');
+    expect(deployResult.ResultsBucketName2).toContain('custom-athena-logs');
   }, 9000000);
 });
 
 afterAll(async () => {
-  await destroyStack(integTestApp, stack);
+  await testStack.destroy();
 });