fix(lambda): function version ignores layer version changes #20150

kaizencc · 2022-04-29T22:03:22Z

Fixes #19098.

This introduces two bug fixes that are hidden behind a feature flag to preserve the current hash:

lambda layer order is ignored by the hash now
lambda layer version is included in the hash (along with other lambda layer attributes)

I also added a few more tests around this area to confirm the current behavior which should help demonstrate what the feature flag will change.

All Submissions:

Have you followed the guidelines in our Contributing guide?

Adding new Unconventional Dependencies:

This PR adds new unconventional dependencies following the process described here

New Features

Have you added the new feature to an integration test?
- Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn integ without --dry-run)?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

gitpod-io · 2022-04-29T22:03:32Z

kaizencc

Reviving this PR that has been sitting in my local copy of cdk for a while. It's still a bit rough around the edges but I think it's worth getting out there.

packages/@aws-cdk/cx-api/lib/features.ts

packages/@aws-cdk/aws-lambda/test/function.test.ts

kaizencc · 2022-04-29T22:18:16Z

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

@@ -640,7 +641,7 @@ export class Function extends FunctionBase {

  protected readonly canCreatePermissions = true;

-  private readonly layers: ILayerVersion[] = [];
+  public readonly layers: ILayerVersion[] = [];


The alternative to making this public is to send the layers directly into the calculateFunctionHash() like: calculateFunctionHash(fn, fn.layers). That seems awkward to me so I chose to make this public.

calculateFunctionHash is a private function, so I don't really care about its signature. I care more about making this public, which this change does... so I'd rather you didn't.

Marked @internal instead. I need this to be publicly accessible for the aspect as well, and if my understanding of @internal is correct, this makes the most sense.

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

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

packages/@aws-cdk/aws-lambda/test/function.test.ts

packages/@aws-cdk/cx-api/lib/features.ts

…ambdalayer

…nto conroy/lambdalayer

kaizencc · 2022-05-27T15:19:57Z

packages/@aws-cdk/aws-lambda/README.md

@@ -291,8 +291,15 @@ by default.
 Existing users will need to enable the [feature flag]
 `@aws-cdk/aws-lambda:recognizeVersionProps`. Since CloudFormation does not
 allow duplicate versions, they will also need to make some modification to
-their function so that a new version can be created. Any trivial change such as


updated this readme

kaizencc · 2022-05-27T15:21:07Z

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

+ * version. This aspect will change the function description in these cases,
+ * which "validates" the new function hash.
+ */
+export class FunctionVersionUpgrade implements IAspect {


added this Aspect that should help users update their existing lambdas

kaizencc · 2022-05-27T15:22:35Z

packages/@aws-cdk/aws-lambda/test/integ.lambda.ts

@@ -31,4 +32,8 @@ alias.addFunctionUrl({
  authType: lambda.FunctionUrlAuthType.NONE,
 });

+// Changes the function description when the feature flag is present
+// to validate the changed function hash.
+cdk.Aspects.of(stack).add(new lambda.FunctionVersionUpgrade(LAMBDA_RECOGNIZE_LAYER_VERSION));


Added this aspect here, so that yarn integ --update-on-failed succeeds. For the integ test updates in other modules, I just ran yarn integ --update-on-failed --disable-update-workflow --dry-run.

rix0rrr

Conditionally approved

packages/@aws-cdk/aws-lambda/README.md

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

rix0rrr · 2022-05-30T08:20:11Z

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

@@ -640,7 +641,7 @@ export class Function extends FunctionBase {

  protected readonly canCreatePermissions = true;

-  private readonly layers: ILayerVersion[] = [];
+  public readonly layers: ILayerVersion[] = [];


calculateFunctionHash is a private function, so I don't really care about its signature. I care more about making this public, which this change does... so I'd rather you didn't.

mergify · 2022-05-31T17:42:21Z

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 · 2022-05-31T18:25:53Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
Commit ID: de03832
Result: SUCCEEDED
Build Logs (available for 30 days)

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

mergify · 2022-05-31T18:26:27Z

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

izsherpa · 2022-10-04T12:44:13Z

modify cdk.json to enable this feature, pasting this inside the context:
{...
"context": {
"@aws-cdk/aws-lambda:recognizeLayerVersion": true,
....
}
}

kaizencc added 7 commits March 14, 2022 09:23

start

6061750

more progress

ca89e1a

add feature flag to lock lambda layer order

6562425

layer stuff

5bb2c19

merge

c5af8f5

revive branch and fix test

97f7f8c

bake layer version into function version hash

144b38d

github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p1 labels Apr 29, 2022

aws-cdk-automation requested a review from a team April 29, 2022 22:03

kaizencc requested review from rix0rrr and removed request for a team April 29, 2022 22:03

mergify bot added the contribution/core This is a PR that came from AWS. label Apr 29, 2022

kaizencc marked this pull request as draft April 29, 2022 22:03

kaizencc commented Apr 29, 2022

View reviewed changes

add docstring

2bac2c9

kaizencc commented May 2, 2022

View reviewed changes

packages/@aws-cdk/aws-lambda/test/function-hash.test.ts Outdated Show resolved Hide resolved

kaizencc requested a review from a team May 4, 2022 15:35

Merge branch 'master' into conroy/lambdalayer

5d45ae6

kaizencc marked this pull request as ready for review May 11, 2022 16:03

rix0rrr added the pr/do-not-merge This PR should not be merged at this time. label May 12, 2022

rix0rrr approved these changes May 12, 2022

View reviewed changes

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

packages/@aws-cdk/aws-lambda/test/function.test.ts Show resolved Hide resolved

packages/@aws-cdk/cx-api/lib/features.ts Show resolved Hide resolved

kaizencc and others added 6 commits May 12, 2022 19:49

update test to better capture old behavior

78fd23b

update integ tests

56db632

Merge branch 'master' into conroy/lambdalayer

a050989

Merge branch 'master' of https://github.com/aws/aws-cdk into conroy/l…

68d06b3

…ambdalayer

Merge branch 'master' into conroy/lambdalayer

3f62785

Merge branch 'master' into conroy/lambdalayer

4e6b561

kaizencc added 7 commits May 26, 2022 12:46

functionversionupgrade aspect

0068a22

Merge branch 'master' of https://github.com/aws/aws-cdk into conroy/l…

8df2619

…ambdalayer

update integ tests and generalize functionversionupgrade

d850443

add documentation

404fcd3

Merge branch 'conroy/lambdalayer' of https://github.com/aws/aws-cdk i…

594a590

…nto conroy/lambdalayer

fix for imported layers

dc4a0d2

update triggers test

757ef2d

github-actions bot added effort/medium Medium work item – several days of effort and removed effort/small Small work item – less than a day of effort labels May 26, 2022

kaizencc and others added 3 commits May 26, 2022 17:11

update cloudfront snapshots

a0a617b

update codedeploy snapshots

5967433

Merge branch 'master' into conroy/lambdalayer

3404aa3

kaizencc commented May 27, 2022

View reviewed changes

kaizencc requested a review from rix0rrr May 27, 2022 15:22

rix0rrr approved these changes May 30, 2022

View reviewed changes

kaizencc added 3 commits May 31, 2022 10:13

make layers internal api

47f7115

readme updates

3be936f

bake version arn into layer hash

72a3197

kaizencc removed the pr/do-not-merge This PR should not be merged at this time. label May 31, 2022

Merge branch 'master' into conroy/lambdalayer

de03832

mergify bot merged commit f19ecef into master May 31, 2022

mergify bot deleted the conroy/lambdalayer branch May 31, 2022 18:26

tim-finnigan mentioned this pull request Feb 22, 2024

(aws_lambda): get the latest Lambda Layer version in the Lambda function construct. #29214

Open

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(lambda): function version ignores layer version changes #20150

fix(lambda): function version ignores layer version changes #20150

kaizencc commented Apr 29, 2022 •

edited

Loading

gitpod-io bot commented Apr 29, 2022

kaizencc left a comment

kaizencc Apr 29, 2022

rix0rrr May 30, 2022

kaizencc May 31, 2022

kaizencc May 27, 2022

kaizencc May 27, 2022

kaizencc May 27, 2022

rix0rrr left a comment

rix0rrr May 30, 2022

mergify bot commented May 31, 2022

aws-cdk-automation commented May 31, 2022

mergify bot commented May 31, 2022

izsherpa commented Oct 4, 2022

fix(lambda): function version ignores layer version changes #20150

fix(lambda): function version ignores layer version changes #20150

Conversation

kaizencc commented Apr 29, 2022 • edited Loading

All Submissions:

Adding new Unconventional Dependencies:

New Features

gitpod-io bot commented Apr 29, 2022

kaizencc left a comment

Choose a reason for hiding this comment

kaizencc Apr 29, 2022

Choose a reason for hiding this comment

rix0rrr May 30, 2022

Choose a reason for hiding this comment

kaizencc May 31, 2022

Choose a reason for hiding this comment

kaizencc May 27, 2022

Choose a reason for hiding this comment

kaizencc May 27, 2022

Choose a reason for hiding this comment

kaizencc May 27, 2022

Choose a reason for hiding this comment

rix0rrr left a comment

Choose a reason for hiding this comment

rix0rrr May 30, 2022

Choose a reason for hiding this comment

mergify bot commented May 31, 2022

aws-cdk-automation commented May 31, 2022

AWS CodeBuild CI Report

mergify bot commented May 31, 2022

izsherpa commented Oct 4, 2022

kaizencc commented Apr 29, 2022 •

edited

Loading