Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-roos committed Jul 27, 2023
1 parent 7c67929 commit b9d61e3
Show file tree
Hide file tree
Showing 20 changed files with 2,171 additions and 702 deletions.
90 changes: 46 additions & 44 deletions demos-pipeline/examples/bin/demos-pipeline.ts
Original file line number Diff line number Diff line change
@@ -1,85 +1,87 @@
#!/usr/bin/env node
import * as cdk from 'aws-cdk-lib';
import { DemoPipelineStack, DeviceKind } from 'aws4embeddedlinux-cdk-lib';
import { BuildImageDataStack } from 'aws4embeddedlinux-cdk-lib';
import { BuildImagePipelineStack, ImageKind } from 'aws4embeddedlinux-cdk-lib';
import { BuildImageRepoStack } from 'aws4embeddedlinux-cdk-lib';
import { PipelineNetworkStack } from 'aws4embeddedlinux-cdk-lib';
import * as cdk from "aws-cdk-lib";
import { DemoPipelineStack, DeviceKind } from "aws4embeddedlinux-cdk-lib";
import { BuildImageDataStack } from "aws4embeddedlinux-cdk-lib";
import { BuildImagePipelineStack, ImageKind } from "aws4embeddedlinux-cdk-lib";
import { BuildImageRepoStack } from "aws4embeddedlinux-cdk-lib";
import { PipelineNetworkStack } from "aws4embeddedlinux-cdk-lib";

const app = new cdk.App();

/**
* User Data
*/
const env = {
account: process.env.CDK_DEFAULT_ACCOUNT,
region: process.env.CDK_DEFAULT_REGION,
account: process.env.CDK_DEFAULT_ACCOUNT,
region: process.env.CDK_DEFAULT_REGION,
};

const githubRepository = {
org: process.env.GH_ORG ?? 'aws4embeddedlinux',
repo: process.env.GH_REPO ?? 'meta-aws-demos',
branch: process.env.GH_BRANCH ?? 'master-next',
org: process.env.GH_ORG ?? "aws4embeddedlinux",
repo: process.env.GH_REPO ?? "meta-aws-demos",
branch: process.env.GH_BRANCH ?? "master-next",
};

/**
* Use these default props to enable termination protection and tag related AWS
* Resources for tracking purposes.
*/
const defaultProps: cdk.StackProps = {
tags: { PURPOSE: 'META-AWS-BUILD' },
terminationProtection: false,
env,
tags: { PURPOSE: "META-AWS-BUILD" },
terminationProtection: false,
env,
};

/**
* Set up the Stacks that create our Build Host.
*/
const buildImageData = new BuildImageDataStack(app, 'BuildImageData', {
...defaultProps,
bucketName: `build-image-data-${env.account}-${env.region}`,
const buildImageData = new BuildImageDataStack(app, "BuildImageData", {
...defaultProps,
bucketName: `build-image-data-${env.account}-${env.region}`,
});

const buildImageRepo = new BuildImageRepoStack(app, 'BuildImageRepo', { ...defaultProps });
const buildImageRepo = new BuildImageRepoStack(app, "BuildImageRepo", {
...defaultProps,
});

new BuildImagePipelineStack(app, 'BuildImagePipeline', {
...defaultProps,
dataBucket: buildImageData.bucket,
repository: buildImageRepo.repository,
imageKind: ImageKind.Ubuntu22_04,
new BuildImagePipelineStack(app, "BuildImagePipeline", {
...defaultProps,
dataBucket: buildImageData.bucket,
repository: buildImageRepo.repository,
imageKind: ImageKind.Ubuntu22_04,
});

/**
* Set up networking to allow us to securely attach EFS to our CodeBuild instances.
*/
const vpc = new PipelineNetworkStack(app, 'DemoPipelineNetwork', {
...defaultProps,
const vpc = new PipelineNetworkStack(app, "DemoPipelineNetwork", {
...defaultProps,
});

/**
* Create a Qemu Pipeline based on meta-aws-demos.
*/
new DemoPipelineStack(app, 'QemuDemoPipeline', {
...defaultProps,
githubOrg: githubRepository.org,
githubRepo: githubRepository.repo,
githubBranch: githubRepository.branch,
imageRepo: buildImageRepo.repository,
imageTag: ImageKind.Ubuntu22_04,
device: DeviceKind.Qemu,
vpc: vpc.vpc,
new DemoPipelineStack(app, "QemuDemoPipeline", {
...defaultProps,
githubOrg: githubRepository.org,
githubRepo: githubRepository.repo,
githubBranch: githubRepository.branch,
imageRepo: buildImageRepo.repository,
imageTag: ImageKind.Ubuntu22_04,
device: DeviceKind.Qemu,
vpc: vpc.vpc,
});

/**
* Create a Qemu Pipeline based on meta-aws-demos.
*/
new DemoPipelineStack(app, 'AglNxpPipeline', {
...defaultProps,
githubOrg: githubRepository.org,
githubRepo: githubRepository.repo,
githubBranch: githubRepository.branch,
imageRepo: buildImageRepo.repository,
imageTag: ImageKind.Ubuntu22_04,
device: DeviceKind.AglNxpGoldbox,
vpc: vpc.vpc,
});
new DemoPipelineStack(app, "AglNxpPipeline", {
...defaultProps,
githubOrg: githubRepository.org,
githubRepo: githubRepository.repo,
githubBranch: githubRepository.branch,
imageRepo: buildImageRepo.repository,
imageTag: ImageKind.Ubuntu22_04,
device: DeviceKind.AglNxpGoldbox,
vpc: vpc.vpc,
});
9 changes: 2 additions & 7 deletions demos-pipeline/examples/cdk.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"app": "npx ts-node --prefer-ts-exts bin/demos-pipeline.ts",
"watch": {
"include": [
"**"
],
"include": ["**"],
"exclude": [
"README.md",
"cdk*.json",
Expand All @@ -19,10 +17,7 @@
"context": {
"@aws-cdk-lib/aws-lambda:recognizeLayerVersion": true,
"@aws-cdk-lib/core:checkSecretUsage": true,
"@aws-cdk-lib/core:target-partitions": [
"aws",
"aws-cn"
],
"@aws-cdk-lib/core:target-partitions": ["aws", "aws-cn"],
"@aws-cdk-lib-containers/ecs-service-extensions:enableDefaultLogDriver": true,
"@aws-cdk-lib/aws-ec2:uniqueImdsv2TemplateName": true,
"@aws-cdk-lib/aws-ecs:arnFormatIncludesClusterName": true,
Expand Down
10 changes: 5 additions & 5 deletions demos-pipeline/examples/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
testEnvironment: 'node',
roots: ['<rootDir>/test'],
testMatch: ['**/*.test.ts'],
testEnvironment: "node",
roots: ["<rootDir>/test"],
testMatch: ["**/*.test.ts"],
transform: {
'^.+\\.tsx?$': 'ts-jest'
}
"^.+\\.tsx?$": "ts-jest",
},
};
53 changes: 22 additions & 31 deletions demos-pipeline/examples/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions demos-pipeline/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"demos-pipeline": "bin/demos-pipeline.js"
},
"scripts": {
"zip-data": "if [ -f dist/assets/build-image/data.zip ]; then rm -rf dist/assets/build-image; fi && mkdir -p dist/assets/build-image ; cd ../lib/assets/build-image && zip -q -o ../../../examples/dist/assets/build-image/data.zip -r *",
"clean": "rm -rf dist && rm -rf cdk.out",
"prebuild": "npm run zip-data",
"clean": "tsc --build --clean && rm -rf dist && rm -rf cdk.out",
"build": "tsc",
"watch": "tsc -w",
"test": "jest",
Expand All @@ -31,11 +29,11 @@
"ts-node": "^10.9.1",
"typedoc": "^0.24.8",
"typescript": "~5.0.4"
},
"dependencies": {
"aws4embeddedlinux-cdk-lib": "file:../lib/lib",
"aws-cdk-lib": "2.86.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
},
"dependencies": {
"aws4embeddedlinux-cdk-lib": "file:../lib/lib",
"aws-cdk-lib": "2.86.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
}
16 changes: 16 additions & 0 deletions demos-pipeline/examples/test/demo-pipeline.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// import * as cdk from 'aws-cdk-lib';
// import { Template } from 'aws-cdk-lib/assertions';
// import * as DemosPipeline from '../lib/demos-pipeline-stack';

// example test. To run these tests, uncomment this file along with the
// example resource in lib/demos-pipeline-stack.ts
test("SQS Queue Created", () => {
// const app = new cdk.App();
// // WHEN
// const stack = new DemosPipeline.DemosPipelineStack(app, 'MyTestStack');
// // THEN
// const template = Template.fromStack(stack);
// template.hasResourceProperties('AWS::SQS::Queue', {
// VisibilityTimeout: 300
// });
});
14 changes: 3 additions & 11 deletions demos-pipeline/examples/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"compilerOptions": {
"target": "ES2020",
"module": "commonjs",
"lib": [
"es2020",
"dom"
],
"lib": ["es2020", "dom"],
"declaration": true,
"strict": true,
"noImplicitAny": true,
Expand All @@ -20,12 +17,7 @@
"inlineSources": true,
"experimentalDecorators": true,
"strictPropertyInitialization": false,
"typeRoots": [
"./node_modules/@types"
]
"typeRoots": ["./node_modules/@types"]
},
"exclude": [
"node_modules",
"cdk.out"
]
"exclude": ["node_modules", "cdk.out"]
}
10 changes: 5 additions & 5 deletions demos-pipeline/lib/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
testEnvironment: 'node',
roots: ['<rootDir>/test'],
testMatch: ['**/*.test.ts'],
testEnvironment: "node",
roots: ["<rootDir>/test"],
testMatch: ["**/*.test.ts"],
transform: {
'^.+\\.tsx?$': 'ts-jest'
}
"^.+\\.tsx?$": "ts-jest",
},
};
Loading

0 comments on commit b9d61e3

Please sign in to comment.