Skip to content

Commit

Permalink
Merge branch 'master' into bug-6723-kubepatch_type2
Browse files Browse the repository at this point in the history
  • Loading branch information
Elad Ben-Israel authored Mar 17, 2020
2 parents d87eafa + 52fd078 commit fd56cb2
Show file tree
Hide file tree
Showing 199 changed files with 2,160 additions and 1,165 deletions.
6 changes: 4 additions & 2 deletions packages/@aws-cdk/alexa-ask/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/app-delivery/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"@aws-cdk/aws-events": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0"
"@aws-cdk/cx-api": "0.0.0",
"constructs": "^1.1.2"
},
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
Expand Down Expand Up @@ -83,7 +84,8 @@
"@aws-cdk/aws-events": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0"
"@aws-cdk/cx-api": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/assert/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@
"dependencies": {
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0"
"@aws-cdk/cx-api": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0",
"jest": "^24.9.0"
"jest": "^24.9.0",
"constructs": "^1.1.2"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,14 @@
"dependencies": {
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"minimatch": "^3.0.4"
"minimatch": "^3.0.4",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0"
"@aws-cdk/cx-api": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-accessanalyzer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-acmpca/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-amazonmq/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-amplify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,16 @@
"@aws-cdk/aws-kms": "0.0.0",
"@aws-cdk/aws-codebuild": "0.0.0",
"@aws-cdk/aws-secretsmanager": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-kms": "0.0.0",
"@aws-cdk/aws-codebuild": "0.0.0",
"@aws-cdk/aws-secretsmanager": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-apigateway/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
Expand All @@ -85,7 +86,8 @@
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-apigatewayv2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-appconfig/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-applicationautoscaling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@
"@aws-cdk/aws-autoscaling-common": "0.0.0",
"@aws-cdk/aws-cloudwatch": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-autoscaling-common": "0.0.0",
"@aws-cdk/aws-cloudwatch": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-appmesh/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@
"@aws-cdk/aws-ec2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-servicediscovery": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/aws-ec2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-servicediscovery": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-appstream/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-appsync/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,17 @@
"@aws-cdk/aws-dynamodb": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-cognito": "0.0.0",
"@aws-cdk/aws-dynamodb": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-athena/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-autoscaling-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@
},
"dependencies": {
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"awslint": {
"exclude": [
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
"@aws-cdk/aws-sns": "0.0.0",
"@aws-cdk/aws-sns-subscriptions": "0.0.0",
"@aws-cdk/aws-sqs": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
Expand All @@ -101,7 +102,8 @@
"@aws-cdk/aws-sns": "0.0.0",
"@aws-cdk/aws-sns-subscriptions": "0.0.0",
"@aws-cdk/aws-sqs": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements

// use delayed evaluation
const imageConfig = props.machineImage.getImage(this);
this.userData = props.userData || imageConfig.userData || ec2.UserData.forOperatingSystem(imageConfig.osType);
this.userData = props.userData ?? imageConfig.userData;
const userDataToken = Lazy.stringValue({ produce: () => Fn.base64(this.userData.render()) });
const securityGroupsToken = Lazy.listValue({ produce: () => this.securityGroups.map(sg => sg.securityGroupId) });

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook-target.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Construct } from '@aws-cdk/core/lib/construct';
import { Construct } from '@aws-cdk/core';
import { ILifecycleHook } from './lifecycle-hook';

/**
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-autoscaling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-sns": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
Expand All @@ -90,7 +91,8 @@
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-sns": "0.0.0",
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-autoscalingplans/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-backup/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"peerDependencies": {
"@aws-cdk/core": "0.0.0"
"@aws-cdk/core": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-batch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,17 @@
"@aws-cdk/aws-ec2": "0.0.0",
"@aws-cdk/aws-ecr": "0.0.0",
"@aws-cdk/aws-ecs": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0"
"@aws-cdk/aws-iam": "0.0.0",
"constructs": "^1.1.2"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/core": "0.0.0",
"@aws-cdk/aws-ec2": "0.0.0",
"@aws-cdk/aws-ecr": "0.0.0",
"@aws-cdk/aws-ecs": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0"
"@aws-cdk/aws-iam": "0.0.0",
"constructs": "^1.1.2"
},
"engines": {
"node": ">= 10.3.0"
Expand Down
Loading

0 comments on commit fd56cb2

Please sign in to comment.