fix: many updates to fix for CDK 0.36.0 (#62)

* Change @aws-cdk/cdk to @aws-cdk/core
* change in typescript files as well
* changed values for resoruce overrides
* more updates to latest apis
* more updates
* added commet
* more cleanup
* updates to more files
* static site patch
* fix time
* Update CONTRIBUTING.md - Update documentation to align version `0.36.0`

Co-Authored-By: Tom Dufall <[email protected]>
* fix instance type constructor to include a combincation of class and size
* fix path resolution for fromAsset
* nit cleanup
* better definition of instane type
* timeout to 300 seconds
* change from AssetCode to Code
* added cluster capacity for further investigation
* added optional properities back
* extra space
* uncomment code for further investigation
* added timeout duration

Author: 2 people

CONTRIBUTING.md

@@ -101,7 +101,7 @@ Create a directory with a name that is descriptive of the resource type or workf
   },
   "dependencies": {
     ...
-    "@aws-cdk/cdk": "^0.23.0"
+    "@aws-cdk/core": "^0.36.0"
   }
 }
 ```

typescript/api-cors-lambda-crud-dynamodb/index.ts

@@ -1,7 +1,7 @@
 import apigateway = require('@aws-cdk/aws-apigateway'); 
 import dynamodb = require('@aws-cdk/aws-dynamodb');
 import lambda = require('@aws-cdk/aws-lambda');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 
 export class ApiLambdaCrudDynamoDBStack extends cdk.Stack {
   constructor(app: cdk.App, id: string) {
@@ -10,15 +10,15 @@ export class ApiLambdaCrudDynamoDBStack extends cdk.Stack {
     const dynamoTable = new dynamodb.Table(this, 'items', {
       partitionKey: {
         name: 'itemId',
-        type: dynamodb.AttributeType.String
+        type: dynamodb.AttributeType.STRING
       },
       tableName: 'items'
     });
 
     const getOneLambda = new lambda.Function(this, 'getOneItemFunction', {
       code: new lambda.AssetCode('src'),
       handler: 'get-one.handler',
-      runtime: lambda.Runtime.NodeJS810,
+      runtime: lambda.Runtime.NODEJS_8_10,
       environment: {
         TABLE_NAME: dynamoTable.tableName,
         PRIMARY_KEY: 'itemId'
@@ -28,7 +28,7 @@ export class ApiLambdaCrudDynamoDBStack extends cdk.Stack {
     const getAllLambda = new lambda.Function(this, 'getAllItemsFunction', {
       code: new lambda.AssetCode('src'),
       handler: 'get-all.handler',
-      runtime: lambda.Runtime.NodeJS810,
+      runtime: lambda.Runtime.NODEJS_8_10,
       environment: {
         TABLE_NAME: dynamoTable.tableName,
         PRIMARY_KEY: 'itemId'
@@ -38,7 +38,7 @@ export class ApiLambdaCrudDynamoDBStack extends cdk.Stack {
     const createOne = new lambda.Function(this, 'createItemFunction', {
       code: new lambda.AssetCode('src'),
       handler: 'create.handler',
-      runtime: lambda.Runtime.NodeJS810,
+      runtime: lambda.Runtime.NODEJS_8_10,
       environment: {
         TABLE_NAME: dynamoTable.tableName,
         PRIMARY_KEY: 'itemId'
@@ -48,7 +48,7 @@ export class ApiLambdaCrudDynamoDBStack extends cdk.Stack {
     const updateOne = new lambda.Function(this, 'updateItemFunction', {
       code: new lambda.AssetCode('src'),
       handler: 'update-one.handler',
-      runtime: lambda.Runtime.NodeJS810,
+      runtime: lambda.Runtime.NODEJS_8_10,
       environment: {
         TABLE_NAME: dynamoTable.tableName,
         PRIMARY_KEY: 'itemId'
@@ -58,7 +58,7 @@ export class ApiLambdaCrudDynamoDBStack extends cdk.Stack {
     const deleteOne = new lambda.Function(this, 'deleteItemFunction', {
       code: new lambda.AssetCode('src'),
       handler: 'delete-one.handler',
-      runtime: lambda.Runtime.NodeJS810,
+      runtime: lambda.Runtime.NODEJS_8_10,
       environment: {
         TABLE_NAME: dynamoTable.tableName,
         PRIMARY_KEY: 'itemId'
@@ -108,7 +108,7 @@ export function addCorsOptions(apiResource: apigateway.IResource) {
         'method.response.header.Access-Control-Allow-Methods': "'OPTIONS,GET,PUT,POST,DELETE'",
       },
     }],
-    passthroughBehavior: apigateway.PassthroughBehavior.Never,
+    passthroughBehavior: apigateway.PassthroughBehavior.NEVER,
     requestTemplates: {
       "application/json": "{\"statusCode\": 200}"
     },

typescript/api-cors-lambda-crud-dynamodb/package.json

@@ -21,6 +21,6 @@
     "@aws-cdk/aws-apigateway": "*",
     "@aws-cdk/aws-dynamodb": "*",
     "@aws-cdk/aws-lambda": "*",
-    "@aws-cdk/cdk": "*"
+    "@aws-cdk/core": "*"
   }
 }

typescript/application-load-balancer/index.ts

@@ -2,7 +2,7 @@
 import autoscaling = require('@aws-cdk/aws-autoscaling');
 import ec2 = require('@aws-cdk/aws-ec2');
 import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 
 class LoadBalancerStack extends cdk.Stack {
   constructor(app: cdk.App, id: string) {
@@ -12,7 +12,7 @@ class LoadBalancerStack extends cdk.Stack {
 
     const asg = new autoscaling.AutoScalingGroup(this, 'ASG', {
       vpc,
-      instanceType: new ec2.InstanceTypePair(ec2.InstanceClass.Burstable2, ec2.InstanceSize.Micro),
+      instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MICRO),
       machineImage: new ec2.AmazonLinuxImage(),
     });
 

typescript/application-load-balancer/package.json

@@ -22,6 +22,6 @@
     "@aws-cdk/aws-autoscaling": "*",
     "@aws-cdk/aws-ec2": "*",
     "@aws-cdk/aws-elasticloadbalancingv2": "*",
-    "@aws-cdk/cdk": "*"
+    "@aws-cdk/core": "*"
   }
 }

typescript/appsync-graphql-dynamodb/index.ts

@@ -1,7 +1,7 @@
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import { CfnGraphQLApi, CfnApiKey, CfnGraphQLSchema, CfnDataSource, CfnResolver } from '@aws-cdk/aws-appsync';
 import { Table, AttributeType, StreamViewType, BillingMode } from '@aws-cdk/aws-dynamodb';
-import { Role, ServicePrincipal } from '@aws-cdk/aws-iam';
+import { Role, ServicePrincipal, ManagedPolicy } from '@aws-cdk/aws-iam';
 
 
 export class AppSyncCdkStack extends cdk.Stack {
@@ -17,11 +17,11 @@ export class AppSyncCdkStack extends cdk.Stack {
     });
 
     new CfnApiKey(this, 'ItemsApiKey', {
-      apiId: itemsGraphQLApi.graphQlApiApiId
+      apiId: itemsGraphQLApi.attrApiId
     });
 
     const apiSchema = new CfnGraphQLSchema(this, 'ItemsSchema', {
-      apiId: itemsGraphQLApi.graphQlApiApiId,
+      apiId: itemsGraphQLApi.attrApiId,
       definition: `type ${tableName} {
         ${tableName}Id: ID!
         name: String
@@ -48,20 +48,20 @@ export class AppSyncCdkStack extends cdk.Stack {
       tableName: tableName,
       partitionKey: {
         name: `${tableName}Id`,
-        type: AttributeType.String
+        type: AttributeType.STRING
       },
-      billingMode: BillingMode.PayPerRequest,
-      streamSpecification: StreamViewType.NewImage
+      billingMode: BillingMode.PAY_PER_REQUEST,
+      stream: StreamViewType.NEW_IMAGE
     });
 
     const itemsTableRole = new Role(this, 'ItemsDynamoDBRole', {
       assumedBy: new ServicePrincipal('appsync.amazonaws.com')
     });
 
-    itemsTableRole.attachManagedPolicy('arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess');
+    itemsTableRole.addManagedPolicy(ManagedPolicy.fromAwsManagedPolicyName('arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess'));
 
     const dataSource = new CfnDataSource(this, 'ItemsDataSource', {
-      apiId: itemsGraphQLApi.graphQlApiApiId,
+      apiId: itemsGraphQLApi.attrApiId,
       name: 'ItemsDynamoDataSource',
       type: 'AMAZON_DYNAMODB',
       dynamoDbConfig: {
@@ -72,10 +72,10 @@ export class AppSyncCdkStack extends cdk.Stack {
     });
 
     const getOneResolver = new CfnResolver(this, 'GetOneQueryResolver', {
-      apiId: itemsGraphQLApi.graphQlApiApiId,
+      apiId: itemsGraphQLApi.attrApiId,
       typeName: 'Query',
       fieldName: 'getOne',
-      dataSourceName: dataSource.dataSourceName,
+      dataSourceName: dataSource.name,
       requestMappingTemplate: `{
         "version": "2017-02-28",
         "operation": "GetItem",
@@ -88,10 +88,10 @@ export class AppSyncCdkStack extends cdk.Stack {
     getOneResolver.addDependsOn(apiSchema);
 
     const getAllResolver = new CfnResolver(this, 'GetAllQueryResolver', {
-      apiId: itemsGraphQLApi.graphQlApiApiId,
+      apiId: itemsGraphQLApi.attrApiId,
       typeName: 'Query',
       fieldName: 'all',
-      dataSourceName: dataSource.dataSourceName,
+      dataSourceName: dataSource.name,
       requestMappingTemplate: `{
         "version": "2017-02-28",
         "operation": "Scan",
@@ -103,10 +103,10 @@ export class AppSyncCdkStack extends cdk.Stack {
     getAllResolver.addDependsOn(apiSchema);
 
     const saveResolver = new CfnResolver(this, 'SaveMutationResolver', {
-      apiId: itemsGraphQLApi.graphQlApiApiId,
+      apiId: itemsGraphQLApi.attrApiId,
       typeName: 'Mutation',
       fieldName: 'save',
-      dataSourceName: dataSource.dataSourceName,
+      dataSourceName: dataSource.name,
       requestMappingTemplate: `{
         "version": "2017-02-28",
         "operation": "PutItem",
@@ -122,10 +122,10 @@ export class AppSyncCdkStack extends cdk.Stack {
     saveResolver.addDependsOn(apiSchema);
 
     const deleteResolver = new CfnResolver(this, 'DeleteMutationResolver', {
-      apiId: itemsGraphQLApi.graphQlApiApiId,
+      apiId: itemsGraphQLApi.attrApiId,
       typeName: 'Mutation',
       fieldName: 'delete',
-      dataSourceName: dataSource.dataSourceName,
+      dataSourceName: dataSource.name,
       requestMappingTemplate: `{
         "version": "2017-02-28",
         "operation": "DeleteItem",

typescript/appsync-graphql-dynamodb/package.json

@@ -21,6 +21,6 @@
     "@aws-cdk/aws-appsync": "*",
     "@aws-cdk/aws-dynamodb": "*",
     "@aws-cdk/aws-iam": "*",
-    "@aws-cdk/cdk": "*"
+    "@aws-cdk/core": "*"
   }
 }

typescript/classic-load-balancer/index.ts

@@ -2,7 +2,7 @@
 import autoscaling = require('@aws-cdk/aws-autoscaling');
 import ec2 = require('@aws-cdk/aws-ec2');
 import elb = require('@aws-cdk/aws-elasticloadbalancing');
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 
 class LoadBalancerStack extends cdk.Stack {
   constructor(app: cdk.App, id: string) {
@@ -12,7 +12,7 @@ class LoadBalancerStack extends cdk.Stack {
 
     const asg = new autoscaling.AutoScalingGroup(this, 'ASG', {
       vpc,
-      instanceType: new ec2.InstanceTypePair(ec2.InstanceClass.Burstable2, ec2.InstanceSize.Micro),
+      instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MICRO),
       machineImage: new ec2.AmazonLinuxImage(),
     });
 

typescript/classic-load-balancer/package.json

@@ -22,6 +22,6 @@
     "@aws-cdk/aws-autoscaling": "*",
     "@aws-cdk/aws-ec2": "*",
     "@aws-cdk/aws-elasticloadbalancing": "*",
-    "@aws-cdk/cdk": "*"
+    "@aws-cdk/core": "*"
   }
 }

typescript/custom-resource/index.ts

@@ -1,4 +1,4 @@
-import cdk = require('@aws-cdk/cdk');
+import cdk = require('@aws-cdk/core');
 import { MyCustomResource } from './my-custom-resource';
 
 /**