Upgrade jsii (support statics) (aws#90)

Update jsii distribution to jsii-0.4.0-pre+6248947 following
added support for static methods and properties (aws/jsii#26).

Minor fixes required to adhere to jsii support for
static methods and properties:

Rename RESOURCE_TYPE_NAME and RESOURCE_PROPERTIES
of the property registry to camelCase.

Return `any` in Resource.attribute decoration
since jsii doesn't support lambda functions.

Add tslint.json to .gitigonre since now it is created
by jsii (if it doesn't already exist).

To maintain traceability with the official jsii build
used, we now check in the bundle zip file instead of
the tarballs and expand them in ./install.sh to `./.local-npm` 
(which is not checked-in)

.gitignore

@@ -5,3 +5,4 @@ lerna-debug.log
 dist
 pack
 .BUILD_COMPLETED
+.local-npm

README.md

@@ -159,8 +159,8 @@ npm run pkglint
 
 ### Updating jsii
 
-Run `./pack.sh` in the jsii repository and copy the tarballs to `./local-npm`.
-Make sure all tarballs are defined in the root `package.json`.
+Download an official jsii zip bundle and replace the file under `./vendor`.
+Any added dependencies, they will need to be added to the root `package.json`.
 
 # Language Support
 

build.sh

@@ -12,7 +12,7 @@ export PATH=node_modules/.bin:$PATH
 
 echo "============================================================================================="
 echo "boostrapping..."
-lerna bootstrap --reject-cycles --loglevel=debug
+lerna bootstrap --reject-cycles
 
 echo "============================================================================================="
 echo "testing..."

bundle-beta.sh

@@ -24,7 +24,7 @@ echo "Staging: ${staging}"
 # Create a local npm repository
 mkdir -p repo/npm
 rsync -aL ${root}/pack/*.tgz repo/npm      # cdk modules
-rsync -aL ${root}/local-npm/*.tgz repo/npm # jsii modules
+rsync -aL ${root}/.local-npm/*.tgz repo/npm # jsii modules
 
 # Create a local maven repository
 mkdir -p repo/maven

install.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
+mkdir -p .local-npm
+(cd .local-npm && unzip ../vendor/*.zip)
+
 echo "============================================================================================="
 echo "installing repo-global dependencies..."
 npm i --no-package-lock --global-style

package.json

@@ -14,13 +14,13 @@
     "typescript": "^2.8.3",
     "tslint": "^5.10.0",
     "nyc": "^11.8.0",
-    "jsii": "file:local-npm/jsii-0.4.0-pre.tgz",
-    "jsii-java-runtime": "file:local-npm/jsii-java-runtime-0.4.0-pre.tgz",
-    "jsii-pacmak": "file:local-npm/jsii-pacmak-0.4.0-pre.tgz",
-    "jsii-runtime": "file:local-npm/jsii-runtime-0.4.0-pre.tgz",
-    "jsii-spec": "file:local-npm/jsii-spec-0.4.0-pre.tgz",
-    "jsii-kernel": "file:local-npm/jsii-kernel-0.4.0-pre.tgz",
-    "codemaker": "file:local-npm/codemaker-0.4.0-pre.tgz"
+    "jsii": "file:.local-npm/jsii-0.4.0-pre.tgz",
+    "jsii-java-runtime": "file:.local-npm/jsii-java-runtime-0.4.0-pre.tgz",
+    "jsii-pacmak": "file:.local-npm/jsii-pacmak-0.4.0-pre.tgz",
+    "jsii-runtime": "file:.local-npm/jsii-runtime-0.4.0-pre.tgz",
+    "jsii-spec": "file:.local-npm/jsii-spec-0.4.0-pre.tgz",
+    "jsii-kernel": "file:.local-npm/jsii-kernel-0.4.0-pre.tgz",
+    "codemaker": "file:.local-npm/codemaker-0.4.0-pre.tgz"
   },
   "repository": {
     "type": "git",

packages/@aws-cdk/acm/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/cloudformation-diff/lib/diff/index.ts

@@ -51,7 +51,7 @@ export function diffResource(oldValue: types.Resource, newValue: types.Resource)
 
     function _diffProperty(oldV: any, newV: any, key: string, resourceClass?: ResourceClass) {
         let changeImpact: types.ResourceImpact | undefined;
-        const spec = resourceClass && resourceClass.RESOURCE_PROPERTIES[key];
+        const spec = resourceClass && resourceClass.resourceProperties[key];
         if (spec) {
             switch (spec.updateType) {
             case 'Immutable':

packages/@aws-cdk/cloudfront/.gitignore

@@ -1,6 +1,7 @@
 *.js
 *.d.ts
 tsconfig.json
+tslint.json
 *.js.map
 dist
 coverage

packages/@aws-cdk/cloudtrail/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/codebuild/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/codecommit/.gitignore

@@ -4,3 +4,4 @@
 node_modules
 dist
 tsconfig.json
+tslint.json

packages/@aws-cdk/codepipeline/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/core/.gitignore

@@ -1,6 +1,7 @@
 *.js
 *.d.ts
 tsconfig.json
+tslint.json
 *.js.map
 dist
 coverage

packages/@aws-cdk/core/lib/cloudformation/resource.ts

@@ -24,8 +24,9 @@ export class Resource extends Referenceable {
     /**
      * A decoration used to create a CloudFormation attribute property.
      * @param customName Custom name for the attribute (default is the name of the property)
+     * NOTE: we return "any" here to satistfy jsii, which doesn't support lambdas.
      */
-    public static attribute(customName?: string) {
+    public static attribute(customName?: string): any {
         return (prototype: any, key: string) => {
             const name = customName || key;
             Object.defineProperty(prototype, key, {

packages/@aws-cdk/custom-resources/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/cx-api/.gitignore

@@ -4,3 +4,4 @@
 node_modules
 dist
 tsconfig.json
+tslint.json

packages/@aws-cdk/dynamodb/.gitignore

@@ -4,3 +4,5 @@
 node_modules
 dist
 tsconfig.json
+tslint.json
+

packages/@aws-cdk/ec2/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/events/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/iam/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/kms/.gitignore

@@ -4,3 +4,4 @@
 node_modules
 dist
 tsconfig.json
+tslint.json

packages/@aws-cdk/lambda/.gitignore

@@ -4,3 +4,5 @@
 node_modules
 dist
 tsconfig.json
+tslint.json
+

packages/@aws-cdk/neptune/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/quickstarts/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/rds/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/route53/.gitignore

@@ -4,3 +4,4 @@
 node_modules
 dist
 tsconfig.json
+tslint.json

packages/@aws-cdk/rtv/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/s3/.gitignore

@@ -1,5 +1,6 @@
 *.js
 tsconfig.json
+tslint.json
 *.js.map
 *.d.ts
 dist

packages/@aws-cdk/sns/.gitignore

@@ -4,3 +4,4 @@
 node_modules
 dist
 tsconfig.json
+tslint.json

packages/@aws-cdk/sqs/.gitignore

@@ -4,3 +4,5 @@
 node_modules
 dist
 tsconfig.json
+tslint.json
+

tools/cfn2ts/lib/codegen.ts

@@ -206,12 +206,12 @@ export default class CodeGenerator {
         this.code.line('/**');
         this.code.line(` * The CloudFormation resource type name for this resource class.`);
         this.code.line(' */');
-        this.code.line(`public static readonly RESOURCE_TYPE_NAME = ${JSON.stringify(resourceName.specName!.fqn)};`);
+        this.code.line(`public static readonly resourceTypeName = ${JSON.stringify(resourceName.specName!.fqn)};`);
         this.code.line();
         this.code.line('/**');
         this.code.line(' * The list of properties on the CloudFormation model for this resource, with their attache metadata.');
         this.code.line(' */');
-        this.code.open(`public static readonly RESOURCE_PROPERTIES: { [name: string]: ${REGISTRY}.PropertySpecification } = {`);
+        this.code.open(`public static readonly resourceProperties: { [name: string]: ${REGISTRY}.PropertySpecification } = {`);
         for (const pname of Object.keys(spec.Properties).sort()) {
             const prop = spec.Properties[pname];
             this.code.line(`${pname}: { isRequired: ${JSON.stringify(prop.Required)}, updateType: ${JSON.stringify(prop.UpdateType)} },`);

tools/cfn2ts/lib/index.ts

@@ -22,7 +22,7 @@ export default async function(specFiles: string[], enrichmentsDir?: string) {
     await fs.mkdirp(jsonPath);
     await fs.copy(templateDir, outPath, { recursive: true });
     const indexFile = fs.createWriteStream(indexPath);
-    indexFile.write('export { PropertySpecification, ResourceClass, resourceImplementationFor } from \'./registry\';\n\n');
+    indexFile.write('export * from \'./registry\';\n\n');
 
     for (const mod of Object.keys(specByModule).sort()) {
         const spec = specByModule[mod];

tools/cfn2ts/module-template/lib/registry.ts

@@ -4,8 +4,8 @@ export interface PropertySpecification {
 }
 
 export interface ResourceClass {
-    readonly RESOURCE_PROPERTIES: { [name: string]: PropertySpecification | undefined };
-    readonly RESOURCE_TYPE_NAME: string;
+    readonly resourceProperties: { [name: string]: PropertySpecification | undefined };
+    readonly resourceTypeName: string;
 }
 
 const catalog: { [resourceType: string]: ResourceClass } = {};
@@ -17,7 +17,7 @@ const catalog: { [resourceType: string]: ResourceClass } = {};
  * @param resourceClass the corresponding Resource implementation.
  */
 export function registerResourceType(resourceClass: ResourceClass) {
-    const typeName = resourceClass.RESOURCE_TYPE_NAME;
+    const typeName = resourceClass.resourceTypeName;
     if (catalog.hasOwnProperty(typeName)) {
         throw new Error(`Attempted to re-define CloudFormation resource ${typeName}`);
     }