Skip to content

Commit 88eba3b

Browse files
authored
Test/expand integ test (#12)
* fixed the tests * removed es lint to accomodate cdk as dev dependency * remove integration test with beta
1 parent 0777136 commit 88eba3b

File tree

15 files changed

+361
-2515
lines changed

15 files changed

+361
-2515
lines changed

.DS_Store

-6 KB
Binary file not shown.

.gitattributes

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release-beta.yml

Lines changed: 0 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release.yml

Lines changed: 0 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.gitignore

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.npmignore

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projen/deps.json

Lines changed: 4 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projen/tasks.json

Lines changed: 1 addition & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.js

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const project = new AwsCdkConstructLibrary({
1010
packageName: '@aws-amplify/cdk-exported-backend',
1111
cdkVersion: '1.127.0',
1212
defaultReleaseBranch: 'release',
13-
name: 'export-backend',
13+
name: 'exported-backend',
1414
bundledDeps: dependencies,
1515
deps: dependencies,
1616
devDeps: [
@@ -21,17 +21,18 @@ const project = new AwsCdkConstructLibrary({
2121
'@types/node',
2222
'@types/uuid',
2323
'yaml',
24+
'@aws-cdk/core',
2425
],
2526
authorOrganization: true,
2627
repositoryUrl: 'https://github.com/aws-amplify/amplify-cli-export-construct.git',
2728
packageManager: NodePackageManager.NPM,
28-
publishToNuget: {
29-
dotNetNamespace: 'Amazon.Amplify.CDK',
30-
packageId: 'Exportedbackend',
31-
},
29+
// publishToNuget: {
30+
// dotNetNamespace: 'Amazon.Amplify.CDK',
31+
// packageId: 'Exportedbackend',
32+
// },
3233
publishToPypi: {
33-
distName: 'aws-amplify.cdk.Exported-backend',
34-
module: 'aws-amplify.cdk.Exported_backend',
34+
distName: 'aws-amplify.cdk.exported-backend',
35+
module: 'aws_amplify.cdk.exported_backend',
3536
},
3637
publishToMaven: {
3738
javaPackage: 'com.amplifyframework.cdk.exportedbackend',
@@ -45,7 +46,6 @@ const project = new AwsCdkConstructLibrary({
4546
docgen: true,
4647
npmDistTag: 'latest',
4748
cdkDependencies: [
48-
'@aws-cdk/core',
4949
'@aws-cdk/aws-apigateway',
5050
'@aws-cdk/aws-appsync',
5151
'@aws-cdk/aws-cloudformation',
@@ -61,6 +61,7 @@ const project = new AwsCdkConstructLibrary({
6161
'integ-test/amplify-e2e-core',
6262
'integ-test/amplify-headless-interface',
6363
],
64+
eslint: false,
6465
license: 'Apache-2.0',
6566
licensed: true,
6667
excludeTypescript: ['integ-test/*'],
@@ -74,26 +75,12 @@ const project = new AwsCdkConstructLibrary({
7475
testdir: 'test',
7576
mutableBuild: false,
7677
cdkAssert: true,
77-
// tsconfig: {
78-
// compilerOptions: {
79-
// esModuleInterop: true,
80-
// strictPropertyInitialization: false,
81-
// },
82-
// },
83-
// cdkDependencies: undefined, /* Which AWS CDK modules (those that start with "@aws-cdk/") does this library require when consumed? */
84-
// cdkTestDependencies: undefined, /* AWS CDK modules required for testing. */
85-
// deps: [], /* Runtime dependencies of this module. */
86-
// description: undefined, /* The description is just a string that helps people understand the purpose of the package. */
87-
// devDeps: [], /* Build dependencies for this module. */
88-
// packageName: undefined, /* The "name" in package.json. */
89-
// release: undefined, /* Add release management to this project. */
9078
});
9179
const unitTest = project.tasks.tryFind('test');
9280
unitTest.reset();
9381
unitTest.exec('rm -fr lib/');
9482
unitTest.exec('tsc --noEmit --project tsconfig.jest.json');
9583
unitTest.exec('jest ./test/*');
96-
unitTest.exec('eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools .projenrc.js');
9784
project.release.addBranch('beta', {
9885
tagPrefix: 'beta',
9986
majorVersion: '0',
@@ -123,14 +110,14 @@ const integrationTestJob = {
123110
},
124111
{
125112
name: 'Install Amplify CLI',
126-
run: 'npm i @aws-amplify/[email protected]ext11.0\nnpm i -g @aws-amplify/[email protected]ext11.0\nwhich amplify\namplify_path=$(which amplify)\necho "AMPLIFY_PATH=$amplify_path" >> $GITHUB_ENV\necho ${{ env.AMPLIFY_PATH }}\n',
113+
run: 'npm i @aws-amplify/[email protected]ext12.0\nnpm i -g @aws-amplify/[email protected]ext12.0\nwhich amplify\namplify_path=$(which amplify)\necho "AMPLIFY_PATH=$amplify_path" >> $GITHUB_ENV\necho ${{ env.AMPLIFY_PATH }}\n',
127114
},
128115
{
129116
name: 'Checkout',
130117
uses: 'actions/checkout@v2',
131118
with: {
132119
repository: 'aws-amplify/amplify-cli',
133-
ref: 'extOverrides2',
120+
ref: 'extOverrides3',
134121
path: 'amplify-cli',
135122
},
136123
},
@@ -184,8 +171,8 @@ fs.writeFileSync('./.github/workflows/integration-test.yml', stringify({
184171
},
185172
}));
186173

187-
const publishJobs = project.release.publisher.jobs;
188-
Object.keys(project.release.publisher.jobs).forEach((r) => {
189-
publishJobs[r].needs = ['integration_tests'];
190-
});
174+
// const publishJobs = project.release.publisher.jobs;
175+
// Object.keys(project.release.publisher.jobs).forEach((r) => {
176+
// publishJobs[r].needs = ['integration_tests'];
177+
// });
191178
project.synth();

0 commit comments

Comments
 (0)