Remove @aws-cdk/util

packages/@aws-cdk/aws-codepipeline-api/package.json

@@ -60,11 +60,7 @@
   "dependencies": {
     "@aws-cdk/aws-events": "^0.9.2",
     "@aws-cdk/aws-iam": "^0.9.2",
-    "@aws-cdk/cdk": "^0.9.2",
-    "@aws-cdk/util": "^0.9.2"
+    "@aws-cdk/cdk": "^0.9.2"
   },
-  "bundledDependencies": [
-    "@aws-cdk/util"
-  ],
   "homepage": "https://github.com/awslabs/aws-cdk"
 }

packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts

@@ -3,7 +3,6 @@ import events = require('@aws-cdk/aws-events');
 import iam = require('@aws-cdk/aws-iam');
 import s3 = require('@aws-cdk/aws-s3');
 import cdk = require('@aws-cdk/cdk');
-import util = require('@aws-cdk/util');
 import { cloudformation } from './codepipeline.generated';
 import { CommonStageProps, Stage, StagePlacement } from './stage';
 
@@ -204,10 +203,10 @@ export class Pipeline extends cdk.Construct implements events.IEventRuleTarget {
      * @override
      */
     public validate(): string[] {
-        return util.flatten([
-            this.validateHasStages(),
-            this.validateSourceActionLocations()
-        ]);
+        return [
+            ...this.validateHasStages(),
+            ...this.validateSourceActionLocations()
+        ];
     }
 
     /**
@@ -292,12 +291,16 @@ export class Pipeline extends cdk.Construct implements events.IEventRuleTarget {
     }
 
     private validateSourceActionLocations(): string[] {
-        return util.flatMap(this.stages, (stage, i) => {
-            const onlySourceActionsPermitted = i === 0;
-            return util.flatMap(stage.actions, (action, _) =>
-                actions.validateSourceAction(onlySourceActionsPermitted, action.category, action.id, stage.id)
-            );
-        });
+        const errors = new Array<string>();
+        let firstStage = true;
+        for (const stage of this.stages) {
+            const onlySourceActionsPermitted = firstStage;
+            for (const action of stage.actions) {
+                errors.push(...actions.validateSourceAction(onlySourceActionsPermitted, action.category, action.id, stage.id));
+            }
+            firstStage = false;
+        }
+        return errors;
     }
 
     private validateHasStages(): string[] {

packages/@aws-cdk/aws-codepipeline/package.json

@@ -75,11 +75,7 @@
     "@aws-cdk/aws-events": "^0.9.2",
     "@aws-cdk/aws-iam": "^0.9.2",
     "@aws-cdk/aws-s3": "^0.9.2",
-    "@aws-cdk/cdk": "^0.9.2",
-    "@aws-cdk/util": "^0.9.2"
+    "@aws-cdk/cdk": "^0.9.2"
   },
-  "bundledDependencies": [
-    "@aws-cdk/util"
-  ],
   "homepage": "https://github.com/awslabs/aws-cdk"
 }

packages/@aws-cdk/aws-ec2/lib/vpc.ts

@@ -1,5 +1,4 @@
 import cdk = require('@aws-cdk/cdk');
-import { Obj } from '@aws-cdk/util';
 import { cloudformation } from './ec2.generated';
 import { NetworkBuilder } from './network-util';
 import { DEFAULT_SUBNET_NAME, subnetId } from './util';
@@ -252,7 +251,7 @@ export class VpcNetwork extends VpcNetworkRef implements cdk.ITaggable {
     /**
      * Mapping of NatGateway by AZ
      */
-    private natGatewayByAZ: Obj<string> = {};
+    private natGatewayByAZ: { [az: string]: string } = {};
 
     /**
      * Subnet configurations for this VPC
@@ -530,7 +529,7 @@ export class VpcPublicSubnet extends VpcSubnet {
     /**
      * Creates a new managed NAT gateway attached to this public subnet.
      * Also adds the EIP for the managed NAT.
-     * Returns the NAT Gateway ref
+     * @returns A ref to the the NAT Gateway ID
      */
     public addNatGateway() {
         // Create a NAT Gateway in this public subnet
@@ -541,7 +540,7 @@ export class VpcPublicSubnet extends VpcSubnet {
             }).eipAllocationId,
             tags: new cdk.TagManager(this),
         });
-        return ngw.ref;
+        return ngw.natGatewayId;
     }
 }
 

packages/@aws-cdk/aws-ec2/package.json

@@ -60,11 +60,7 @@
   },
   "dependencies": {
     "@aws-cdk/aws-iam": "^0.9.2",
-    "@aws-cdk/cdk": "^0.9.2",
-    "@aws-cdk/util": "^0.9.2"
+    "@aws-cdk/cdk": "^0.9.2"
   },
-  "bundledDependencies": [
-    "@aws-cdk/util"
-  ],
   "homepage": "https://github.com/awslabs/aws-cdk"
 }

packages/@aws-cdk/aws-events/package.json

@@ -60,11 +60,7 @@
   },
   "dependencies": {
     "@aws-cdk/aws-iam": "^0.9.2",
-    "@aws-cdk/cdk": "^0.9.2",
-    "@aws-cdk/util": "^0.9.2"
+    "@aws-cdk/cdk": "^0.9.2"
   },
-  "bundledDependencies": [
-    "@aws-cdk/util"
-  ],
   "homepage": "https://github.com/awslabs/aws-cdk"
 }

packages/@aws-cdk/aws-quickstarts/lib/database.ts

@@ -1,7 +1,6 @@
 import ec2 = require('@aws-cdk/aws-ec2');
 import rds = require('@aws-cdk/aws-rds');
 import cdk = require('@aws-cdk/cdk');
-import util = require('@aws-cdk/util');
 
 export interface SqlServerProps {
     instanceClass?: string;
@@ -34,22 +33,16 @@ export class SqlServer extends cdk.Construct implements ec2.IConnectable {
             dbSubnetGroupDescription: 'Database subnet group',
         });
 
-        const p = util.applyDefaults(props, {
-            instanceClass: 'db.m4.large',
-            engine: 'sqlserver-se',
-            engineVersion: '13.00.4422.0.v1',
-            licenseModel: 'license-included',
-            allocatedStorage: 200
-        });
+        const allocatedStorage = props.allocatedStorage !== undefined ? props.allocatedStorage : 200;
 
         new rds.cloudformation.DBInstanceResource(this, 'Resource', {
-            allocatedStorage: p.allocatedStorage.toString(),
-            dbInstanceClass: p.instanceClass,
-            engine: p.engine,
-            engineVersion: p.engineVersion,
-            licenseModel: p.licenseModel,
-            masterUsername: p.masterUsername,
-            masterUserPassword: p.masterPassword,
+            allocatedStorage: allocatedStorage.toString(),
+            dbInstanceClass: props.instanceClass || 'db.m4.large',
+            engine: props.engine || 'sqlserver-se',
+            engineVersion: props.engineVersion || '13.00.4422.0.v1',
+            licenseModel: props.licenseModel || 'license-included',
+            masterUsername: props.masterUsername,
+            masterUserPassword: props.masterPassword,
             port: SqlServer.PORT.toString(),
             dbSubnetGroupName: subnetGroup.ref,
             vpcSecurityGroups: [ securityGroup.securityGroupId ]

packages/@aws-cdk/aws-quickstarts/package.json

@@ -56,11 +56,7 @@
     "@aws-cdk/aws-ec2": "^0.9.2",
     "@aws-cdk/aws-iam": "^0.9.2",
     "@aws-cdk/aws-rds": "^0.9.2",
-    "@aws-cdk/cdk": "^0.9.2",
-    "@aws-cdk/util": "^0.9.2"
+    "@aws-cdk/cdk": "^0.9.2"
   },
-  "bundledDependencies": [
-    "@aws-cdk/util"
-  ],
   "homepage": "https://github.com/awslabs/aws-cdk"
 }