Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into tls-for-lb-fargat…
Browse files Browse the repository at this point in the history 
…e-svc
  • Loading branch information
@clareliguori
clareliguori committed Nov 8, 2018
2 parents 4ff33c6 + ce999b6 commit 12d0fd0
Show file tree
Hide file tree
Showing 114 changed files with 958 additions and 793 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
@@ -1,3 +1,17 @@
<a name="0.15.2"></a>
## [0.15.2](https://github.com/awslabs/aws-cdk/compare/v0.15.1...v0.15.2) (2018-11-08)


### Bug Fixes

* correctly emit quoted YAML for account numbers ([#1105](https://github.com/awslabs/aws-cdk/issues/1105)) ([b4d9155](https://github.com/awslabs/aws-cdk/commit/b4d9155)), closes [#1100](https://github.com/awslabs/aws-cdk/issues/1100) [#1098](https://github.com/awslabs/aws-cdk/issues/1098)
* **aws-ecs:** fix use of published NPM package with TypeScript ([#1117](https://github.com/awslabs/aws-cdk/issues/1117)) ([ebfb522](https://github.com/awslabs/aws-cdk/commit/ebfb522))


### Features

* **aws-ecs:** Add desired count to LoadBalanced[Fargate|EC2]Service ([#1111](https://github.com/awslabs/aws-cdk/issues/1111)) ([cafcc11](https://github.com/awslabs/aws-cdk/commit/cafcc11))

<a name="0.15.1"></a>
## [0.15.1](https://github.com/awslabs/aws-cdk/compare/v0.15.0...v0.15.1) (2018-11-06)

Expand Down
6 changes: 3 additions & 3 deletions examples/cdk-examples-java/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "cdk-examples-java",
"version": "0.15.1",
"version": "0.15.2",
"description": "CDK examples in Java",
"private": true,
"repository": {
Expand All @@ -22,7 +22,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"aws-cdk": "^0.15.1",
"pkgtools": "^0.15.1"
"aws-cdk": "^0.15.2",
"pkgtools": "^0.15.2"
}
}
42 changes: 21 additions & 21 deletions examples/cdk-examples-typescript/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "cdk-examples-typescript",
"version": "0.15.1",
"version": "0.15.2",
"description": "A bunch of CDK examples",
"private": true,
"scripts": {
Expand All @@ -18,28 +18,28 @@
},
"license": "Apache-2.0",
"devDependencies": {
"aws-cdk": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"pkglint": "^0.15.1"
"aws-cdk": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/aws-autoscaling": "^0.15.1",
"@aws-cdk/aws-cloudformation": "^0.15.1",
"@aws-cdk/aws-cognito": "^0.15.1",
"@aws-cdk/aws-dynamodb": "^0.15.1",
"@aws-cdk/aws-ec2": "^0.15.1",
"@aws-cdk/aws-ecs": "^0.15.1",
"@aws-cdk/aws-elasticloadbalancing": "^0.15.1",
"@aws-cdk/aws-elasticloadbalancingv2": "^0.15.1",
"@aws-cdk/aws-iam": "^0.15.1",
"@aws-cdk/aws-lambda": "^0.15.1",
"@aws-cdk/aws-neptune": "^0.15.1",
"@aws-cdk/aws-rds": "^0.15.1",
"@aws-cdk/aws-s3": "^0.15.1",
"@aws-cdk/aws-sns": "^0.15.1",
"@aws-cdk/aws-sqs": "^0.15.1",
"@aws-cdk/cdk": "^0.15.1",
"@aws-cdk/runtime-values": "^0.15.1"
"@aws-cdk/aws-autoscaling": "^0.15.2",
"@aws-cdk/aws-cloudformation": "^0.15.2",
"@aws-cdk/aws-cognito": "^0.15.2",
"@aws-cdk/aws-dynamodb": "^0.15.2",
"@aws-cdk/aws-ec2": "^0.15.2",
"@aws-cdk/aws-ecs": "^0.15.2",
"@aws-cdk/aws-elasticloadbalancing": "^0.15.2",
"@aws-cdk/aws-elasticloadbalancingv2": "^0.15.2",
"@aws-cdk/aws-iam": "^0.15.2",
"@aws-cdk/aws-lambda": "^0.15.2",
"@aws-cdk/aws-neptune": "^0.15.2",
"@aws-cdk/aws-rds": "^0.15.2",
"@aws-cdk/aws-s3": "^0.15.2",
"@aws-cdk/aws-sns": "^0.15.2",
"@aws-cdk/aws-sqs": "^0.15.2",
"@aws-cdk/cdk": "^0.15.2",
"@aws-cdk/runtime-values": "^0.15.2"
},
"repository": {
"url": "https://github.com/awslabs/aws-cdk.git",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Expand Up @@ -14,5 +14,5 @@
}
},
"rejectCycles": "true",
"version": "0.15.1"
"version": "0.15.2"
}
22 changes: 11 additions & 11 deletions packages/@aws-cdk/app-delivery/package.json
View file
@@ -1,7 +1,7 @@
{
"name": "@aws-cdk/app-delivery",
"description": "Continuous Integration / Continuous Delivery for CDK Applications",
"version": "0.15.1",
"version": "0.15.2",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"jsii": {
Expand Down Expand Up @@ -32,19 +32,19 @@
"integ": "cdk-integ"
},
"dependencies": {
"@aws-cdk/aws-cloudformation": "^0.15.1",
"@aws-cdk/aws-codebuild": "^0.15.1",
"@aws-cdk/aws-codepipeline-api": "^0.15.1",
"@aws-cdk/cdk": "^0.15.1",
"@aws-cdk/cx-api": "^0.15.1"
"@aws-cdk/aws-cloudformation": "^0.15.2",
"@aws-cdk/aws-codebuild": "^0.15.2",
"@aws-cdk/aws-codepipeline-api": "^0.15.2",
"@aws-cdk/cdk": "^0.15.2",
"@aws-cdk/cx-api": "^0.15.2"
},
"devDependencies": {
"@aws-cdk/aws-codepipeline": "^0.15.1",
"@aws-cdk/aws-s3": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cdk-integ-tools": "^0.15.1",
"@aws-cdk/aws-codepipeline": "^0.15.2",
"@aws-cdk/aws-s3": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cdk-integ-tools": "^0.15.2",
"fast-check": "^1.7.0",
"pkglint": "^0.15.1"
"pkglint": "^0.15.2"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/applet-js/bin/cdk-applet-js.ts
View file
Expand Up @@ -4,9 +4,9 @@ import 'source-map-support/register';
import cdk = require('@aws-cdk/cdk');
import child_process = require('child_process');
import fs = require('fs-extra');
import YAML = require('js-yaml');
import os = require('os');
import path = require('path');
import YAML = require('yaml');

import { isStackConstructor, parseApplet } from '../lib/applet-helpers';

Expand All @@ -25,7 +25,7 @@ async function main() {
}

// read applet(s) properties from the provided file
const fileContents = YAML.safeLoad(await fs.readFile(appletFile, { encoding: 'utf-8' }));
const fileContents = YAML.parse(await fs.readFile(appletFile, { encoding: 'utf-8' }));
if (typeof fileContents !== 'object') {
throw new Error(`${appletFile}: should contain a YAML object`);
}
Expand Down
12 changes: 6 additions & 6 deletions packages/@aws-cdk/applet-js/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/applet-js",
"version": "0.15.1",
"version": "0.15.2",
"description": "Javascript CDK applet host program",
"main": "bin/cdk-applet-js.js",
"types": "bin/cdk-applet-js.d.ts",
Expand All @@ -23,15 +23,15 @@
"license": "Apache-2.0",
"devDependencies": {
"@types/fs-extra": "^5.0.4",
"@types/js-yaml": "^3.11.2",
"cdk-build-tools": "^0.15.1",
"pkglint": "^0.15.1"
"@types/yaml": "^1.0.0",
"cdk-build-tools": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/cdk": "^0.15.1",
"@aws-cdk/cdk": "^0.15.2",
"fs-extra": "^7.0.0",
"source-map-support": "^0.5.6",
"js-yaml": "^3.12.0"
"yaml": "^1.0.1"
},
"repository": {
"url": "https://github.com/awslabs/aws-cdk.git",
Expand Down
12 changes: 6 additions & 6 deletions packages/@aws-cdk/assert/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/assert",
"version": "0.15.1",
"version": "0.15.2",
"description": "An assertion library for use with CDK Apps",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -23,13 +23,13 @@
},
"license": "Apache-2.0",
"devDependencies": {
"cdk-build-tools": "^0.15.1",
"pkglint": "^0.15.1"
"cdk-build-tools": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/cdk": "^0.15.1",
"@aws-cdk/cloudformation-diff": "^0.15.1",
"@aws-cdk/cx-api": "^0.15.1",
"@aws-cdk/cdk": "^0.15.2",
"@aws-cdk/cloudformation-diff": "^0.15.2",
"@aws-cdk/cx-api": "^0.15.2",
"source-map-support": "^0.5.6"
},
"repository": {
Expand Down
20 changes: 10 additions & 10 deletions packages/@aws-cdk/assets/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/assets",
"version": "0.15.1",
"version": "0.15.2",
"description": "Integration of CDK apps with local assets",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -49,17 +49,17 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.15.1",
"aws-cdk": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cdk-integ-tools": "^0.15.1",
"pkglint": "^0.15.1"
"@aws-cdk/assert": "^0.15.2",
"aws-cdk": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cdk-integ-tools": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/aws-iam": "^0.15.1",
"@aws-cdk/aws-s3": "^0.15.1",
"@aws-cdk/cdk": "^0.15.1",
"@aws-cdk/cx-api": "^0.15.1"
"@aws-cdk/aws-iam": "^0.15.2",
"@aws-cdk/aws-s3": "^0.15.2",
"@aws-cdk/cdk": "^0.15.2",
"@aws-cdk/cx-api": "^0.15.2"
},
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/@aws-cdk/aws-amazonmq/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/aws-amazonmq",
"version": "0.15.1",
"version": "0.15.2",
"description": "The CDK Construct Library for AWS::AmazonMQ",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -53,13 +53,13 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cfn2ts": "^0.15.1",
"pkglint": "^0.15.1"
"@aws-cdk/assert": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cfn2ts": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/cdk": "^0.15.1"
"@aws-cdk/cdk": "^0.15.2"
},
"peerDependencies": {
"@aws-cdk/cdk": "^0.15.1"
Expand Down
18 changes: 9 additions & 9 deletions packages/@aws-cdk/aws-apigateway/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/aws-apigateway",
"version": "0.15.1",
"version": "0.15.2",
"description": "The CDK Construct Library for AWS::ApiGateway",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -52,16 +52,16 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cdk-integ-tools": "^0.15.1",
"cfn2ts": "^0.15.1",
"pkglint": "^0.15.1"
"@aws-cdk/assert": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cdk-integ-tools": "^0.15.2",
"cfn2ts": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/aws-iam": "^0.15.1",
"@aws-cdk/aws-lambda": "^0.15.1",
"@aws-cdk/cdk": "^0.15.1"
"@aws-cdk/aws-iam": "^0.15.2",
"@aws-cdk/aws-lambda": "^0.15.2",
"@aws-cdk/cdk": "^0.15.2"
},
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/@aws-cdk/aws-applicationautoscaling/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/aws-applicationautoscaling",
"version": "0.15.1",
"version": "0.15.2",
"description": "The CDK Construct Library for AWS::ApplicationAutoScaling",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -52,16 +52,16 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cfn2ts": "^0.15.1",
"@aws-cdk/assert": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cfn2ts": "^0.15.2",
"fast-check": "^1.6.1",
"pkglint": "^0.15.1"
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/aws-cloudwatch": "^0.15.1",
"@aws-cdk/aws-iam": "^0.15.1",
"@aws-cdk/cdk": "^0.15.1"
"@aws-cdk/aws-cloudwatch": "^0.15.2",
"@aws-cdk/aws-iam": "^0.15.2",
"@aws-cdk/cdk": "^0.15.2"
},
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/@aws-cdk/aws-appstream/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/aws-appstream",
"version": "0.15.1",
"version": "0.15.2",
"description": "The CDK Construct Library for AWS::AppStream",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -53,12 +53,12 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cfn2ts": "^0.15.1",
"pkglint": "^0.15.1"
"@aws-cdk/assert": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cfn2ts": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/cdk": "^0.15.1"
"@aws-cdk/cdk": "^0.15.2"
}
}
12 changes: 6 additions & 6 deletions packages/@aws-cdk/aws-appsync/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@aws-cdk/aws-appsync",
"version": "0.15.1",
"version": "0.15.2",
"description": "The CDK Construct Library for AWS::AppSync",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -52,13 +52,13 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.15.1",
"cdk-build-tools": "^0.15.1",
"cfn2ts": "^0.15.1",
"pkglint": "^0.15.1"
"@aws-cdk/assert": "^0.15.2",
"cdk-build-tools": "^0.15.2",
"cfn2ts": "^0.15.2",
"pkglint": "^0.15.2"
},
"dependencies": {
"@aws-cdk/cdk": "^0.15.1"
"@aws-cdk/cdk": "^0.15.2"
},
"homepage": "https://github.com/awslabs/aws-cdk",
"peerDependencies": {
Expand Down

0 comments on commit 12d0fd0

Please sign in to comment.