feat(cfnspec): cloudformation spec v22.0.0 #12204

aws-cdk-automation · 2020-12-23T01:39:45Z

Fixes #12170
Fixes #11974
Fixes #12114
Fixes #12028

pahud · 2020-12-23T12:17:47Z

#12170

gitpod-io · 2020-12-29T00:48:52Z

…ource with a patch to the spec.

…nd decdk).

…Formation namespaces.

@aws-lambda

…from @aws-lambda.

packages/@aws-cdk/aws-cloudfront/lib/experimental/edge-function.ts

packages/@aws-cdk/aws-dynamodb/test/integ.global-replicas-provisioned.ts

packages/@aws-cdk/cfnspec/spec-source/713_ElastiCache_User_patch.json

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

eladb · 2020-12-30T18:25:29Z

packages/@aws-cdk/aws-cloudfront/lib/experimental/edge-function.ts

 import * as path from 'path';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import * as lambda from '@aws-cdk/aws-lambda';
+// hack, as this is not exported by the Lambda module
+import { calculateFunctionHash } from '@aws-cdk/aws-lambda/lib/function-hash';


Why not export then instead of reaching internals?

Less surface area for the module?

eladb · 2020-12-30T18:27:15Z

packages/@aws-cdk/aws-lambda/lib/function-hash.ts

@@ -9,15 +9,45 @@ export function calculateFunctionHash(fn: LambdaFunction) {

  // render the cloudformation resource from this function
  const config = stack.resolve((functionResource as any)._toCloudFormation());
+  // config is of the shape: { Resources: { LogicalId: { Type: 'Function', Properties: { ... } }}}
+  const resources = config.Resources;
+  const logicalId = Object.keys(resources)[0];


Why is this change needed here? Feels unrelated.

If the CfnFunction update resulted in hash changes and you think this is safe, we can easily update the hash without deploying by running yarn cdk-assert --dry-run.

We should follow up with a fix to how lambada calculates hash

But reverting these changes means every single customer that updates to the new CDK version will get their Function's Versions replaced...?

Why? Is this due to field order changes?

Yes. The previous properties of the CfnFunction class result in JSON.stringfy() from here returning

{"Resources":{"Fn9270CBC0":{"Type":"AWS::Lambda::Function","Properties":{"Code":{"ZipFile":"foo"},"Role":{"Fn::GetAtt":["FnServiceRoleB9001A96","Arn"]},"Handler":"index.handler","Runtime":"nodejs10.x"}}}}

With the new properties (ImageConfig and PackageType) added to CfnFunction, the result is

{"Resources":{"Fn9270CBC0":{"Type":"AWS::Lambda::Function","Properties":{"Code":{"ZipFile":"foo"},"Handler":"index.handler","Role":{"Fn::GetAtt":["FnServiceRoleB9001A96","Arn"]},"Runtime":"nodejs10.x"}}}}

Which results in a different hash.

To correct myself slightly, the addition of the ImageConfig and PackageType does not matter here. What changes the order is the fact that the Handler and Runtime properties have been made optional (from required) in this spec version, and our code generation takes required properties before optional ones.

Pull request has been modified.

…back to required.

…formation." This reverts commit ef9d14a

Pull request has been modified.

aws-cdk-automation · 2020-12-31T08:25:45Z

AWS CodeBuild CI Report

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

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

mergify · 2021-01-05T00:01:35Z

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).

Pull request has been modified.

mergify · 2021-01-05T01:19:20Z

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).

Fixes aws#12170 Fixes aws#11974 Fixes aws#12114 Fixes aws#12028

feat: cloudformation spec v22.0.0

6176823

github-actions bot added the @aws-cdk/cfnspec label Dec 23, 2020

github-actions bot assigned rix0rrr Dec 23, 2020

This was referenced Dec 23, 2020

(ecr): support ecr public repository #12162

Open

(eks): support CapacityType CFN property for Nodegroup #12154

Closed

NetaNir linked an issue Dec 23, 2020 that may be closed by this pull request

(cfnspec): cloudformation spec v22.0.0 #12170

Closed

2 tasks

Add patches to fix the spec problems.

9370e02

skinny85 added 6 commits December 28, 2020 17:04

Remove the AuditManager module for now, since we removed its only res…

cf63be9

…ource with a patch to the spec.

Also remove all dependent declarations of AuditManager (cfn-include a…

1f5e089

…nd decdk).

... and also from the monolithic packages.

a0c2849

Update the ReadMe banner to the newest shape.

a45adc6

Fix awslint to correctly handle the same module having multiple Cloud…

5f0fa04

…Formation namespaces.

Make the hash calculations in Lambda more stable.

9b75227

skinny85 added the pr/do-not-merge This PR should not be merged at this time. label Dec 29, 2020

skinny85 assigned skinny85 and unassigned rix0rrr Dec 29, 2020

skinny85 added 3 commits December 29, 2020 14:43

Ignore asset changes in a snapshot test in @aws-cdk/aws-cloudformation.

ef9d14a

...and also in integ.global-replicas-provisioned.ts

87d80d2

Change the calculateFunctionHash() in @aws-cloudfront that is copied …

bdb02a4

…from @aws-lambda.

iliapolo reviewed Dec 30, 2020

View reviewed changes

Remove the duplication between Lambda and CloudFront modules.

706aefb

eladb previously requested changes Dec 30, 2020

View reviewed changes

Move Greengrass V2 to its separate module.

d4b3c8c

skinny85 added 2 commits December 30, 2020 12:16

Update the Asset hash in integ.global-replicas-provisioned.ts.

041ef2e

Delete the old Lambda containers spec patch that is no longer needed.

3360220

eladb previously approved these changes Dec 30, 2020

View reviewed changes

Add a patch that changes AWS::Lambda::Function's Handler and Runtime …

3016239

…back to required.

skinny85 added 4 commits December 30, 2020 15:47

Revert the changes to the Lambda hash calculations.

1d6be00

Revert the cloudfront changes.

826fc81

Revert the asset changes in the integ.global-replicas-provisioned test.

e2ee1e5

Revert "Ignore asset changes in a snapshot test in @aws-cdk/aws-cloud…

554d01e

…formation." This reverts commit ef9d14a

eladb previously approved these changes Dec 31, 2020

View reviewed changes

eladb removed the pr/do-not-merge This PR should not be merged at this time. label Dec 31, 2020

Merge branch 'master' into bump-cfnspec/v22.0.0

c994b30

iliapolo mentioned this pull request Jan 4, 2021

(batch): Batch Compute on Fargate with CfnComputeEnvironment requires instance_role and instance_types #12028

Closed

github-actions bot assigned rix0rrr Jan 4, 2021

skinny85 previously approved these changes Jan 5, 2021

View reviewed changes

mergify bot and others added 2 commits January 5, 2021 00:01

Merge branch 'master' into bump-cfnspec/v22.0.0

a6df3c1

Correct the year in the License and Notice files of the new packages.

64ea94b

skinny85 approved these changes Jan 5, 2021

View reviewed changes

mergify bot merged commit a5be2e9 into master Jan 5, 2021

mergify bot deleted the bump-cfnspec/v22.0.0 branch January 5, 2021 01:19

flochaz pushed a commit to flochaz/aws-cdk that referenced this pull request Jan 5, 2021

feat(cfnspec): cloudformation spec v22.0.0 (aws#12204)

593421e

Fixes aws#12170 Fixes aws#11974 Fixes aws#12114 Fixes aws#12028

skinny85 mentioned this pull request Jan 6, 2021

feat(cfnspec): cloudformation spec v22.0.0 #12370

Closed

NetaNir mentioned this pull request Mar 5, 2021

(ecr): ECR is generating invalid cloudformation #13418

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(cfnspec): cloudformation spec v22.0.0 #12204

feat(cfnspec): cloudformation spec v22.0.0 #12204

aws-cdk-automation commented Dec 23, 2020 •

edited by iliapolo

Loading

pahud commented Dec 23, 2020

gitpod-io bot commented Dec 29, 2020 •

edited

Loading

eladb Dec 30, 2020

skinny85 Dec 30, 2020

eladb Dec 30, 2020

skinny85 Dec 30, 2020

eladb Dec 30, 2020

skinny85 Dec 30, 2020

skinny85 Dec 30, 2020

aws-cdk-automation commented Dec 31, 2020

mergify bot commented Jan 5, 2021

mergify bot commented Jan 5, 2021

feat(cfnspec): cloudformation spec v22.0.0 #12204

feat(cfnspec): cloudformation spec v22.0.0 #12204

Conversation

aws-cdk-automation commented Dec 23, 2020 • edited by iliapolo Loading

pahud commented Dec 23, 2020

gitpod-io bot commented Dec 29, 2020 • edited Loading

eladb Dec 30, 2020

Choose a reason for hiding this comment

skinny85 Dec 30, 2020

Choose a reason for hiding this comment

eladb Dec 30, 2020

Choose a reason for hiding this comment

skinny85 Dec 30, 2020

Choose a reason for hiding this comment

eladb Dec 30, 2020

Choose a reason for hiding this comment

skinny85 Dec 30, 2020

Choose a reason for hiding this comment

skinny85 Dec 30, 2020

Choose a reason for hiding this comment

aws-cdk-automation commented Dec 31, 2020

AWS CodeBuild CI Report

mergify bot commented Jan 5, 2021

mergify bot commented Jan 5, 2021

aws-cdk-automation commented Dec 23, 2020 •

edited by iliapolo

Loading

gitpod-io bot commented Dec 29, 2020 •

edited

Loading