Skip to content
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.

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

feat(cfnspec): cloudformation spec v18.3.0 #10385

Merged
merged 18 commits into from
Sep 17, 2020
Merged

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Sep 16, 2020

Patches partially inspired by:

BREAKING CHANGE: Fixed ECS task definition within the L1 layer. Fixed the casing of the efsVolumeConfiguration property to match the spec published by cloudformation. Fixed the type of the DockerVolumeConfiguration.labels property to allow users to properly apply labels.

  • ecs: Task definitions configured with an efsVolumeConfiguration will incur a resource replacement due to wrong casing of the underlying resources introduced in this PR. This replacement will in turn cause a rolling update to any running tasks that use that definition.
  • ecs: DockerVolumeConfiguration.labels changed from an array to a map. This was a long standing latent bug and in fact configuring labels in the old format would have resulted in the wrong behavior.

@@ -328,6 +328,32 @@ export class TaskDefinition extends TaskDefinitionBase {
return this._executionRole;
}

private renderVolumes(): CfnTaskDefinition.VolumeProperty[] {
Copy link
Contributor

Choose a reason for hiding this comment

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

@@ -713,7 +739,7 @@ export interface DockerVolumeConfiguration {
*
* @default No labels
*/
readonly labels?: string[];
readonly labels?: { [key: string]: string; }
Copy link
Contributor

Choose a reason for hiding this comment

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

@@ -1006,8 +1006,8 @@ export = {
Family: 'Ec2TaskDef',
Volumes: [{
Name: 'scratch',
EfsVolumeConfiguration: {
FileSystemId: 'local',
EFSVolumeConfiguration: {
Copy link
Contributor

Choose a reason for hiding this comment

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

@MrArnoldPalmer MrArnoldPalmer added the pr/do-not-merge This PR should not be merged at this time. label Sep 17, 2020
Copy link
Contributor

@MrArnoldPalmer MrArnoldPalmer left a comment

Choose a reason for hiding this comment

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

Approved with do-not-merge. Wanted to give @RomainMuller a chance to check this out.

@RomainMuller RomainMuller removed the pr/do-not-merge This PR should not be merged at this time. label Sep 17, 2020
@mergify
Copy link
Contributor

mergify bot commented Sep 17, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: c4f4c6e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Sep 17, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit dbdc7ff into master Sep 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants