[BREAKING] Move @aws-cdk/resources classes into L2 packages
#264
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| #!/bin/bash | ||
|
There was a problem hiding this comment. Use hyphens in file names |
||
| set -euo pipefail | ||
|
|
||
| VERSION=$(node -e 'console.log(require("./lerna.json").version);') | ||
|
|
||
| for S in $(node -e 'console.log(require("./packages/@aws-cdk/cloudformation-resource-spec").namespaces.join("\n"));'); do | ||
| P=$(tr 'A-Z' 'a-z' <<< "${S/AWS::/@aws-cdk/}") | ||
| PB=$(basename ${P}) | ||
| if [ ! -d packages/${P} ]; then | ||
| echo "⏳ Creating package ${P} for scope ${S}..." | ||
| mkdir -p packages/${P}/test | ||
| mkdir -p packages/${P}/lib | ||
| echo '*.js' >> packages/${P}/.gitignore | ||
|
There was a problem hiding this comment. Can you please use HEREDOCs instead? Will be wayyyy more readable... There was a problem hiding this comment. (I find the fact that HEREDOCs require you to break indentation very disturbing, BTW). There was a problem hiding this comment. I know. Me too, but they are still way better than this 😜 |
||
| echo '*.js.map' >> packages/${P}/.gitignore | ||
| echo '*.d.ts' >> packages/${P}/.gitignore | ||
| echo 'tsconfig.json' >> packages/${P}/.gitignore | ||
| echo 'tslint.json' >> packages/${P}/.gitignore | ||
| echo 'node_modules' >> packages/${P}/.gitignore | ||
| echo 'cfn' >> packages/${P}/.gitignore | ||
| echo 'dist' >> packages/${P}/.gitignore | ||
|
|
||
| echo "# Don't include original .ts files when doing \`npm pack\`" >> packages/${P}/.npmignore | ||
| echo '*.ts' >> packages/${P}/.npmignore | ||
| echo '!*.d.ts' >> packages/${P}/.npmignore | ||
| echo 'coverage' >> packages/${P}/.npmignore | ||
| echo '.nyc_output' >> packages/${P}/.npmignore | ||
| echo '*.tgz' >> packages/${P}/.npmignore | ||
|
|
||
| echo '{' >> packages/${P}/package.json | ||
| echo " \"name\": \"${P}\"," >> packages/${P}/package.json | ||
| echo " \"version\": \"${VERSION}\"," >> packages/${P}/package.json | ||
| echo " \"description\": \"The CDK Construct Library for ${S}\"," >> packages/${P}/package.json | ||
| echo " \"main\": \"lib/index.js\"," >> packages/${P}/package.json | ||
| echo " \"types\": \"lib/index.d.ts\"," >> packages/${P}/package.json | ||
| echo " \"jsii\": {" >> packages/${P}/package.json | ||
| echo " \"outdir\": \"dist\"," >> packages/${P}/package.json | ||
| echo " \"bundledDependencies\": []," >> packages/${P}/package.json | ||
| echo " \"names\": {" >> packages/${P}/package.json | ||
| echo " \"java\": \"com.amazonaws.cdk.${PB}\"," >> packages/${P}/package.json | ||
| echo " \"dotnet\": \"${S/AWS::/Aws.Cdk.}\"" >> packages/${P}/package.json | ||
| echo " }" >> packages/${P}/package.json | ||
| echo " }," >> packages/${P}/package.json | ||
| echo " \"repository\": {" >> packages/${P}/package.json | ||
| echo " \"type\": \"git\"," >> packages/${P}/package.json | ||
| echo " \"url\": \"git://github.com/awslabs/aws-cdk\"" >> packages/${P}/package.json | ||
| echo " }," >> packages/${P}/package.json | ||
| echo " \"scripts\": {" >> packages/${P}/package.json | ||
| echo " \"build\": \"cfn2ts --scope=${S} && jsii && tslint -p . && pkglint\"," >> packages/${P}/package.json | ||
| echo " \"watch\": \"jsii -w\"," >> packages/${P}/package.json | ||
| echo " \"lint\": \"jsii && tslint -p . --force\"," >> packages/${P}/package.json | ||
| echo " \"test\": \"nodeunit test/test.*.js && cdk-integ-assert\"," >> packages/${P}/package.json | ||
| echo " \"integ\": \"cdk-integ\"," >> packages/${P}/package.json | ||
| echo " \"pkglint\": \"pkglint -f\"" >> packages/${P}/package.json | ||
| echo " }," >> packages/${P}/package.json | ||
| echo " \"keywords\": [" >> packages/${P}/package.json | ||
| echo " \"aws\"," >> packages/${P}/package.json | ||
| echo " \"cdk\"," >> packages/${P}/package.json | ||
| echo " \"constructs\"," >> packages/${P}/package.json | ||
| echo " \"${PB}\"" >> packages/${P}/package.json | ||
| echo " ]," >> packages/${P}/package.json | ||
| echo " \"author\": {" >> packages/${P}/package.json | ||
| echo " \"name\": \"Amazon Web Services\"," >> packages/${P}/package.json | ||
| echo " \"url\": \"https://aws.amazon.com\"" >> packages/${P}/package.json | ||
| echo " }," >> packages/${P}/package.json | ||
| echo " \"license\": \"LicenseRef-LICENSE\"," >> packages/${P}/package.json | ||
| echo " \"devDependencies\": {" >> packages/${P}/package.json | ||
| echo " \"@aws-cdk/assert\": \"^${VERSION}\"," >> packages/${P}/package.json | ||
| echo " \"cfn2ts\": \"^${VERSION}\"," >> packages/${P}/package.json | ||
| echo " \"pkglint\": \"^${VERSION}\"" >> packages/${P}/package.json | ||
| echo " }," >> packages/${P}/package.json | ||
| echo " \"dependencies\": {" >> packages/${P}/package.json | ||
| echo " \"@aws-cdk/core\": \"^${VERSION}\"," >> packages/${P}/package.json | ||
| echo " \"@aws-cdk/runtime\": \"^${VERSION}\"" >> packages/${P}/package.json | ||
| echo " }" >> packages/${P}/package.json | ||
| echo '}' >> packages/${P}/package.json | ||
|
|
||
| echo "// The L1 Library for ${S}:" >> packages/${P}/lib/index.ts | ||
| echo "export * from '../cfn/${PB}';" >> packages/${P}/lib/index.ts | ||
|
|
||
| echo "import { Test, testCase } from 'nodeunit';" >> packages/${P}/test/test.${PB}.ts | ||
| echo "" >> packages/${P}/test/test.${PB}.ts | ||
| echo "exports = testCase({" >> packages/${P}/test/test.${PB}.ts | ||
| echo " notTested(test: Test) {" >> packages/${P}/test/test.${PB}.ts | ||
| echo " test.ok(true, 'No tests are specified for this package.');" >> packages/${P}/test/test.${PB}.ts | ||
| echo " test.done();" >> packages/${P}/test/test.${PB}.ts | ||
| echo " }" >> packages/${P}/test/test.${PB}.ts | ||
| echo "});" >> packages/${P}/test/test.${PB}.ts | ||
|
|
||
| echo "⌛️ Bootstrapping & building ${P}" | ||
| lerna bootstrap --scope=${P} | ||
| lerna run build --scope=${P} | ||
|
|
||
| git add packages/${P} | ||
|
|
||
| echo "✅ Have fun with your new package ${P}" | ||
| fi | ||
| done | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| import { Construct } from '@aws-cdk/core'; | ||
| import { KeyAttributeType, Table } from '@aws-cdk/dynamodb'; | ||
|
|
||
| export class DynamoPostsTable extends Construct { | ||
| constructor(parent: Construct, name: string) { | ||
| super(parent, name); | ||
|
|
||
| const table = new Table(this, 'Table', { | ||
| readCapacity: 5, writeCapacity: 5 | ||
| }); | ||
|
|
||
| table.addPartitionKey('Alias', KeyAttributeType.String); | ||
| table.addSortKey('Timestamp', KeyAttributeType.String); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,6 @@ tsconfig.json | |
| tslint.json | ||
| *.js.map | ||
| *.d.ts | ||
| node_modules | ||
| cfn | ||
| dist | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| export * from './certificate'; | ||
| export * from './certificate-ref'; | ||
|
|
||
| // The L1 library for AWS::CertificateManager: | ||
|
There was a problem hiding this comment. Let's use the terminology |
||
| export * from '../cfn/certificatemanager'; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| *.js | ||
| *.js.map | ||
| *.d.ts | ||
| tsconfig.json | ||
| tslint.json | ||
| node_modules | ||
| cfn | ||
| dist |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // The L1 Library for AWS::ApiGateway: | ||
| export * from '../cfn/apigateway'; | ||
|
There was a problem hiding this comment. I think the generated code should go under There was a problem hiding this comment. Also, make sure cfn2ts creates a README file under the generated directory that says that it is generated and from which spec date There was a problem hiding this comment. That information is already included in the generated file itself... Do we really need it repeated? |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this build symlinks?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope,
lerna bootstrapwill have done that at theinstall.shstep. I can duplicate the bootstrap command, though if you feel it's better... It's incredibly cheap to run.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should automatically run
./install.shisnode_modulesdoesn't exist.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already do (L4-6 in
build.sh).