Skip to content

chore(deps): bumping cdk from 1.78.0 to 1.83.0 #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddneilson merged 1 commit into from
Jan 8, 2021
Merged

chore(deps): bumping cdk from 1.78.0 to 1.83.0 #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.core==1.78.0",
"aws-cdk.core==1.83.0",
"aws-rfdk==0.22.0"
],

Expand Down
6 changes: 3 additions & 3 deletions examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "^14.14.14",
"aws-cdk": "1.78.0",
"@types/node": "^14.14.20",
"aws-cdk": "1.83.0",
"ts-node": "^9.1.1",
"typescript": "~4.1.3"
},
"dependencies": {
"@aws-cdk/core": "1.78.0",
"@aws-cdk/core": "1.83.0",
"aws-rfdk": "0.22.0",
"source-map-support": "^0.5.19"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.core==1.78.0",
"aws-cdk.core==1.83.0",
"aws-rfdk==0.22.0"
],

Expand Down
6 changes: 3 additions & 3 deletions examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "^14.14.14",
"aws-cdk": "1.78.0",
"@types/node": "^14.14.20",
"aws-cdk": "1.83.0",
"ts-node": "^9.1.1",
"typescript": "~4.1.3"
},
"dependencies": {
"@aws-cdk/core": "1.78.0",
"@aws-cdk/core": "1.83.0",
"aws-rfdk": "0.22.0",
"source-map-support": "^0.5.19"
}
Expand Down
70 changes: 35 additions & 35 deletions integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
"pkglint": "pkglint -f"
},
"devDependencies": {
"@aws-cdk/assert": "1.78.0",
"@types/jest": "^26.0.19",
"@types/node": "^14.14.14",
"@typescript-eslint/eslint-plugin": "^4.10.0",
"@typescript-eslint/parser": "^4.10.0",
"aws-cdk": "1.78.0",
"eslint": "^7.15.0",
"@aws-cdk/assert": "1.83.0",
"@types/jest": "^26.0.20",
"@types/node": "^14.14.20",
"@typescript-eslint/eslint-plugin": "^4.12.0",
"@typescript-eslint/parser": "^4.12.0",
"aws-cdk": "1.83.0",
"eslint": "^7.17.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-import-resolver-typescript": "^2.3.0",
"eslint-plugin-import": "^2.22.1",
Expand All @@ -71,40 +71,40 @@
"ts-jest": "^26.4.4"
},
"dependencies": {
"@aws-cdk/aws-docdb": "1.78.0",
"@aws-cdk/aws-ec2": "1.78.0",
"@aws-cdk/aws-ecr": "1.78.0",
"@aws-cdk/aws-ecs": "1.78.0",
"@aws-cdk/aws-efs": "1.78.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.78.0",
"@aws-cdk/aws-iam": "1.78.0",
"@aws-cdk/aws-logs": "1.78.0",
"@aws-cdk/aws-route53": "1.78.0",
"@aws-cdk/aws-s3": "1.78.0",
"@aws-cdk/aws-s3-assets": "1.78.0",
"@aws-cdk/aws-secretsmanager": "1.78.0",
"@aws-cdk/core": "1.78.0",
"@aws-cdk/aws-docdb": "1.83.0",
"@aws-cdk/aws-ec2": "1.83.0",
"@aws-cdk/aws-ecr": "1.83.0",
"@aws-cdk/aws-ecs": "1.83.0",
"@aws-cdk/aws-efs": "1.83.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.83.0",
"@aws-cdk/aws-iam": "1.83.0",
"@aws-cdk/aws-logs": "1.83.0",
"@aws-cdk/aws-route53": "1.83.0",
"@aws-cdk/aws-s3": "1.83.0",
"@aws-cdk/aws-s3-assets": "1.83.0",
"@aws-cdk/aws-secretsmanager": "1.83.0",
"@aws-cdk/core": "1.83.0",
"aws-rfdk": "0.22.0",
"aws-sdk": "^2.810.0"
"aws-sdk": "^2.823.0"
},
"peerDependencies": {
"@aws-cdk/aws-docdb": "1.78.0",
"@aws-cdk/aws-ec2": "1.78.0",
"@aws-cdk/aws-ecr": "1.78.0",
"@aws-cdk/aws-ecs": "1.78.0",
"@aws-cdk/aws-efs": "1.78.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.78.0",
"@aws-cdk/aws-iam": "1.78.0",
"@aws-cdk/aws-logs": "1.78.0",
"@aws-cdk/aws-route53": "1.78.0",
"@aws-cdk/aws-s3": "1.78.0",
"@aws-cdk/aws-s3-assets": "1.78.0",
"@aws-cdk/aws-secretsmanager": "1.78.0",
"@aws-cdk/core": "1.78.0",
"@aws-cdk/aws-docdb": "1.83.0",
"@aws-cdk/aws-ec2": "1.83.0",
"@aws-cdk/aws-ecr": "1.83.0",
"@aws-cdk/aws-ecs": "1.83.0",
"@aws-cdk/aws-efs": "1.83.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.83.0",
"@aws-cdk/aws-iam": "1.83.0",
"@aws-cdk/aws-logs": "1.83.0",
"@aws-cdk/aws-route53": "1.83.0",
"@aws-cdk/aws-s3": "1.83.0",
"@aws-cdk/aws-s3-assets": "1.83.0",
"@aws-cdk/aws-secretsmanager": "1.83.0",
"@aws-cdk/core": "1.83.0",
"aws-rfdk": "0.22.0",
"aws-sdk": "^2.810.0"
},
"engines": {
"node": ">= 10.13.0 <13 || >=13.7.0"
}
}
}
4 changes: 2 additions & 2 deletions lambda-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"stability": "stable",
"maturity": "stable",
"devDependencies": {
"@types/node": "^14.14.14",
"@types/node": "^14.14.20",
"typescript": "~4.1.3"
},
"dependencies": {
"aws-sdk": "^2.810.0"
"aws-sdk": "^2.823.0"
}
}
114 changes: 57 additions & 57 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,64 +26,64 @@
}
},
"devDependencies": {
"@aws-cdk/assets": "1.78.0",
"@aws-cdk/aws-apigateway": "1.78.0",
"@aws-cdk/aws-apigatewayv2": "1.78.0",
"@aws-cdk/aws-applicationautoscaling": "1.78.0",
"@aws-cdk/aws-autoscaling": "1.78.0",
"@aws-cdk/aws-autoscaling-common": "1.78.0",
"@aws-cdk/aws-autoscaling-hooktargets": "1.78.0",
"@aws-cdk/aws-batch": "1.78.0",
"@aws-cdk/aws-certificatemanager": "1.78.0",
"@aws-cdk/aws-cloudformation": "1.78.0",
"@aws-cdk/aws-cloudfront": "1.78.0",
"@aws-cdk/aws-cloudwatch": "1.78.0",
"@aws-cdk/aws-cloudwatch-actions": "1.78.0",
"@aws-cdk/aws-codebuild": "1.78.0",
"@aws-cdk/aws-codecommit": "1.78.0",
"@aws-cdk/aws-codeguruprofiler": "1.78.0",
"@aws-cdk/aws-codepipeline": "1.78.0",
"@aws-cdk/aws-cognito": "1.78.0",
"@aws-cdk/aws-docdb": "1.78.0",
"@aws-cdk/aws-dynamodb": "1.78.0",
"@aws-cdk/aws-ec2": "1.78.0",
"@aws-cdk/aws-ecr": "1.78.0",
"@aws-cdk/aws-ecr-assets": "1.78.0",
"@aws-cdk/aws-ecs": "1.78.0",
"@aws-cdk/aws-ecs-patterns": "1.78.0",
"@aws-cdk/aws-efs": "1.78.0",
"@aws-cdk/aws-elasticloadbalancing": "1.78.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.78.0",
"@aws-cdk/aws-events": "1.78.0",
"@aws-cdk/aws-events-targets": "1.78.0",
"@aws-cdk/aws-iam": "1.78.0",
"@aws-cdk/aws-kinesis": "1.78.0",
"@aws-cdk/aws-kinesisfirehose": "1.78.0",
"@aws-cdk/aws-kms": "1.78.0",
"@aws-cdk/aws-lambda": "1.78.0",
"@aws-cdk/aws-logs": "1.78.0",
"@aws-cdk/aws-route53": "1.78.0",
"@aws-cdk/aws-route53-targets": "1.78.0",
"@aws-cdk/aws-s3": "1.78.0",
"@aws-cdk/aws-s3-assets": "1.78.0",
"@aws-cdk/aws-sam": "1.78.0",
"@aws-cdk/aws-secretsmanager": "1.78.0",
"@aws-cdk/aws-servicediscovery": "1.78.0",
"@aws-cdk/aws-sns": "1.78.0",
"@aws-cdk/aws-sns-subscriptions": "1.78.0",
"@aws-cdk/aws-sqs": "1.78.0",
"@aws-cdk/aws-ssm": "1.78.0",
"@aws-cdk/aws-stepfunctions": "1.78.0",
"@aws-cdk/cloud-assembly-schema": "1.78.0",
"@aws-cdk/core": "1.78.0",
"@aws-cdk/custom-resources": "1.78.0",
"@aws-cdk/cx-api": "1.78.0",
"@aws-cdk/region-info": "1.78.0",
"@types/jest": "^26.0.19",
"@types/node": "^14.14.14",
"@aws-cdk/assets": "1.83.0",
"@aws-cdk/aws-apigateway": "1.83.0",
"@aws-cdk/aws-apigatewayv2": "1.83.0",
"@aws-cdk/aws-applicationautoscaling": "1.83.0",
"@aws-cdk/aws-autoscaling": "1.83.0",
"@aws-cdk/aws-autoscaling-common": "1.83.0",
"@aws-cdk/aws-autoscaling-hooktargets": "1.83.0",
"@aws-cdk/aws-batch": "1.83.0",
"@aws-cdk/aws-certificatemanager": "1.83.0",
"@aws-cdk/aws-cloudformation": "1.83.0",
"@aws-cdk/aws-cloudfront": "1.83.0",
"@aws-cdk/aws-cloudwatch": "1.83.0",
"@aws-cdk/aws-cloudwatch-actions": "1.83.0",
"@aws-cdk/aws-codebuild": "1.83.0",
"@aws-cdk/aws-codecommit": "1.83.0",
"@aws-cdk/aws-codeguruprofiler": "1.83.0",
"@aws-cdk/aws-codepipeline": "1.83.0",
"@aws-cdk/aws-cognito": "1.83.0",
"@aws-cdk/aws-docdb": "1.83.0",
"@aws-cdk/aws-dynamodb": "1.83.0",
"@aws-cdk/aws-ec2": "1.83.0",
"@aws-cdk/aws-ecr": "1.83.0",
"@aws-cdk/aws-ecr-assets": "1.83.0",
"@aws-cdk/aws-ecs": "1.83.0",
"@aws-cdk/aws-ecs-patterns": "1.83.0",
"@aws-cdk/aws-efs": "1.83.0",
"@aws-cdk/aws-elasticloadbalancing": "1.83.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.83.0",
"@aws-cdk/aws-events": "1.83.0",
"@aws-cdk/aws-events-targets": "1.83.0",
"@aws-cdk/aws-iam": "1.83.0",
"@aws-cdk/aws-kinesis": "1.83.0",
"@aws-cdk/aws-kinesisfirehose": "1.83.0",
"@aws-cdk/aws-kms": "1.83.0",
"@aws-cdk/aws-lambda": "1.83.0",
"@aws-cdk/aws-logs": "1.83.0",
"@aws-cdk/aws-route53": "1.83.0",
"@aws-cdk/aws-route53-targets": "1.83.0",
"@aws-cdk/aws-s3": "1.83.0",
"@aws-cdk/aws-s3-assets": "1.83.0",
"@aws-cdk/aws-sam": "1.83.0",
"@aws-cdk/aws-secretsmanager": "1.83.0",
"@aws-cdk/aws-servicediscovery": "1.83.0",
"@aws-cdk/aws-sns": "1.83.0",
"@aws-cdk/aws-sns-subscriptions": "1.83.0",
"@aws-cdk/aws-sqs": "1.83.0",
"@aws-cdk/aws-ssm": "1.83.0",
"@aws-cdk/aws-stepfunctions": "1.83.0",
"@aws-cdk/cloud-assembly-schema": "1.83.0",
"@aws-cdk/core": "1.83.0",
"@aws-cdk/custom-resources": "1.83.0",
"@aws-cdk/cx-api": "1.83.0",
"@aws-cdk/region-info": "1.83.0",
"@types/jest": "^26.0.20",
"@types/node": "^14.14.20",
"@types/nodeunit": "^0.0.31",
"aws-cdk": "1.78.0",
"aws-sdk": "^2.810.0",
"aws-cdk": "1.83.0",
"aws-sdk": "^2.823.0",
"constructs": "^3.2.0",
"conventional-changelog-cli": "^2.1.1",
"fs-extra": "^9.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-rfdk/lib/deadline/lib/usage-based-licensing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ export class UsageBasedLicensing extends Construct implements IGrantable {
this.service = new Ec2Service(this, 'Service', {
cluster: this.cluster,
taskDefinition,
desiredCount: props.desiredCount,
desiredCount: props.desiredCount ?? 1,
Copy link
Contributor

@ddneilson ddneilson Jan 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remind me... what was the CDK change that required this change?

edit: n/m, I found it -- aws/aws-cdk#12223

Copy link
Contributor Author

@ryyakobe ryyakobe Jan 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link and short description is in the description of this PR. There were 2 options available:

  1. In RFDK we just default to size 1 if desiredCount is not set explicitly. (what I did in this PR)
  2. Do not set any default in RFDK for Ec2Service. In this case CDK will not add DesiredCount property to the CloudFormation template. But then it's not clear what to use for minCapacity and maxCapacity in ASG here https://github.com/aws/aws-rfdk/blob/mainline/packages/aws-rfdk/lib/deadline/lib/usage-based-licensing.ts#L508, that's why I decided to go with a simpler option 1.

placementConstraints: [PlacementConstraint.distinctInstances()],
// This is required to right-size our host capacity and not have the ECS service block on updates. We set a memory
// reservation, but no memory limit on the container. This allows the container's memory usage to grow unbounded.
Expand Down
Loading