fix(lambda): recognizeVersionProps featureFlag not defaulting correctly (#17866)

njlynch · web-flow · commit f19fc3903269 · 2021-12-07T12:06:23.000Z
The `@aws-cdk/aws-lambda:recognizeVersionProps` feature flag has always had the "future" behavior set to "true", meaning any new projects get the flag set to true. All of these style flags were intended to default to true as well for v2, but this one was missed. The end result is that users who have created a new v1 project anytime in the last ~6 months, and then upgrade to v2, actually experience a _downgrade_ in behavior if following the offical migration guide (which instructs users to delete all feature flags). This change fixes the behavior to work as intended. Users who wish to opt out can continue to set `@aws-cdk/aws-lambda:recognizeVersionProps` to false in their `cdk.json`. fixes #17810 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
diff --git a/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts b/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
@@ -3,9 +3,9 @@ import '@aws-cdk/assert-internal/jest';
 import * as acm from '@aws-cdk/aws-certificatemanager';
 import * as lambda from '@aws-cdk/aws-lambda';
 import * as s3 from '@aws-cdk/aws-s3';
+import { testFutureBehavior, testLegacyBehavior } from '@aws-cdk/cdk-build-tools/lib/feature-flag';
 import { App, Duration, Stack } from '@aws-cdk/core';
 import { CLOUDFRONT_DEFAULT_SECURITY_POLICY_TLS_V1_2_2021 } from '@aws-cdk/cx-api';
-import { testFutureBehavior, testLegacyBehavior } from '@aws-cdk/cdk-build-tools/lib/feature-flag';
 import {
   CfnDistribution,
   Distribution,
@@ -595,7 +595,7 @@ describe('with Lambda@Edge functions', () => {
               EventType: 'origin-request',
               IncludeBody: true,
               LambdaFunctionARN: {
-                Ref: 'FunctionCurrentVersion4E2B2261477a5ae8059bbaa7813f752292c0f65e',
+                Ref: 'FunctionCurrentVersion4E2B2261f9b8c8b9c774af866281167c3323362d',
               },
             },
           ],
@@ -665,7 +665,7 @@ describe('with Lambda@Edge functions', () => {
               {
                 EventType: 'viewer-request',
                 LambdaFunctionARN: {
-                  Ref: 'FunctionCurrentVersion4E2B2261477a5ae8059bbaa7813f752292c0f65e',
+                  Ref: 'FunctionCurrentVersion4E2B2261f9b8c8b9c774af866281167c3323362d',
                 },
               },
             ],
@@ -771,7 +771,7 @@ describe('with Lambda@Edge functions', () => {
             {
               EventType: 'origin-request',
               LambdaFunctionARN: {
-                Ref: 'SingletonLambdasingletonforcloudfrontCurrentVersion0078406348a0962a52448a200cd0dbc0e22edb2a',
+                Ref: 'SingletonLambdasingletonforcloudfrontCurrentVersion00784063de5dfb6e46a8d2a0436a69c9a8bfabae',
               },
             },
           ],
diff --git a/packages/@aws-cdk/aws-cloudfront/test/experimental/edge-function.test.ts b/packages/@aws-cdk/aws-cloudfront/test/experimental/edge-function.test.ts
@@ -97,7 +97,7 @@ describe('stacks', () => {
     });
     expect(fnStack).toHaveResource('AWS::SSM::Parameter', {
       Type: 'String',
-      Value: { Ref: 'MyFnCurrentVersion309B29FC29686ce94039b6e08d1645be854b3ac9' },
+      Value: { Ref: 'MyFnCurrentVersion309B29FC37a9dfc56f4df872af37f8a33a191788' },
       Name: '/cdk/EdgeFunctionArn/testregion/Stack/MyFn',
     });
   });
diff --git a/packages/@aws-cdk/aws-cloudfront/test/web-distribution.test.ts b/packages/@aws-cdk/aws-cloudfront/test/web-distribution.test.ts
@@ -290,7 +290,7 @@ describe('web distribution', () => {
     const sourceBucket = new s3.Bucket(stack, 'Bucket');
 
     new CloudFrontWebDistribution(stack, 'AnAmazingWebsiteProbably', {
-      comment: `Adding a comment longer than 128 characters should be trimmed and 
+      comment: `Adding a comment longer than 128 characters should be trimmed and
 added the ellipsis so a user would know there was more to read and everything beyond this point should not show up`,
       originConfigs: [
         {
@@ -344,8 +344,8 @@ added the ellipsis so a user would know there was more to read and everything be
                 },
                 Compress: true,
               },
-              Comment: `Adding a comment longer than 128 characters should be trimmed and 
-added the ellipsis so a user would know there was more to ...`,
+              Comment: `Adding a comment longer than 128 characters should be trimmed and
+added the ellipsis so a user would know there was more to r...`,
               Enabled: true,
               IPV6Enabled: true,
               HttpVersion: 'http2',
@@ -871,7 +871,7 @@ added the ellipsis so a user would know there was more to ...`,
               'EventType': 'origin-request',
               'IncludeBody': true,
               'LambdaFunctionARN': {
-                'Ref': 'LambdaCurrentVersionDF706F6A97fb843e9bd06fcd2bb15eeace80e13e',
+                'Ref': 'LambdaCurrentVersionDF706F6A25bf7d67df4eb614ea2e1ea69c8759b6',
               },
             },
           ],
diff --git a/packages/@aws-cdk/aws-lambda/test/function-hash.test.ts b/packages/@aws-cdk/aws-lambda/test/function-hash.test.ts
@@ -44,7 +44,7 @@ describe('function hash', () => {
       });
 
       expect(calculateFunctionHash(fn1)).toEqual(calculateFunctionHash(fn2));
-      expect(calculateFunctionHash(fn1)).toEqual('aea5463dba236007afe91d2832b3c836');
+      expect(calculateFunctionHash(fn1)).toEqual('e5235e3cb7a9b70c42c1a665a3ebd77c');
     });
   });
 
@@ -61,8 +61,8 @@ describe('function hash', () => {
       handler: 'index.handler',
     });
 
-    expect(calculateFunctionHash(fn1)).not.toEqual('aea5463dba236007afe91d2832b3c836');
-    expect(calculateFunctionHash(fn1)).toEqual('979b4a14c6f174c745cdbcd1036cf844');
+    expect(calculateFunctionHash(fn1)).not.toEqual('e5235e3cb7a9b70c42c1a665a3ebd77c');
+    expect(calculateFunctionHash(fn1)).toEqual('bb95ae2489ebc480a23ff373362e453a');
   });
 
   test('environment variables impact hash', () => {
@@ -91,8 +91,8 @@ describe('function hash', () => {
       },
     });
 
-    expect(calculateFunctionHash(fn1)).toEqual('d1bc824ac5022b7d62d8b12dbae6580c');
-    expect(calculateFunctionHash(fn2)).toEqual('3b683d05465012b0aa9c4ff53b32f014');
+    expect(calculateFunctionHash(fn1)).toEqual('a072f10967c25eb87c187e3d61d88f58');
+    expect(calculateFunctionHash(fn2)).toEqual('29aa77e049793f5424d31e880d6ce535');
   });
 
   test('runtime impacts hash', () => {
@@ -121,8 +121,8 @@ describe('function hash', () => {
       },
     });
 
-    expect(calculateFunctionHash(fn1)).toEqual('d1bc824ac5022b7d62d8b12dbae6580c');
-    expect(calculateFunctionHash(fn2)).toEqual('0f168f0772463e8e547bb3800937e54d');
+    expect(calculateFunctionHash(fn1)).toEqual('a072f10967c25eb87c187e3d61d88f58');
+    expect(calculateFunctionHash(fn2)).toEqual('c27e1d43e5595311b185324306244f1b');
   });
 
   test('inline code change impacts the hash', () => {
@@ -140,8 +140,8 @@ describe('function hash', () => {
       handler: 'index.handler',
     });
 
-    expect(calculateFunctionHash(fn1)).toEqual('ebf2e871fc6a3062e8bdcc5ebe16db3f');
-    expect(calculateFunctionHash(fn2)).toEqual('ffedf6424a18a594a513129dc97bf53c');
+    expect(calculateFunctionHash(fn1)).toEqual('ae3a05e0797a7b59e850d453a2e8ea97');
+    expect(calculateFunctionHash(fn2)).toEqual('bdce872a679fc58e06ab8b0cd30ffb37');
   });
 
   describe('impact of env variables order on hash', () => {
diff --git a/packages/@aws-cdk/aws-lambda/test/lambda-version.test.ts b/packages/@aws-cdk/aws-lambda/test/lambda-version.test.ts
@@ -123,7 +123,7 @@ describe('lambda version', () => {
       },
       FunctionVersion: {
         'Fn::GetAtt': [
-          'FnCurrentVersion17A89ABBab5c765f3c55e4e61583b51b00a95742',
+          'FnCurrentVersion17A89ABB60415807620115f34aaea569cf042980',
           'Version',
         ],
       },
@@ -142,7 +142,7 @@ describe('lambda version', () => {
     const version = fn.currentVersion;
 
     // THEN
-    expect(stack.resolve(version.edgeArn)).toEqual({ Ref: 'FnCurrentVersion17A89ABB19ed45993ff69fd011ae9fd4ab6e2005' });
+    expect(stack.resolve(version.edgeArn)).toEqual({ Ref: 'FnCurrentVersion17A89ABB60415807620115f34aaea569cf042980' });
   });
 
   test('edgeArn throws with $LATEST', () => {
diff --git a/packages/@aws-cdk/cx-api/lib/features.ts b/packages/@aws-cdk/cx-api/lib/features.ts
@@ -224,7 +224,7 @@ const FUTURE_FLAGS_DEFAULTS: { [key: string]: boolean } = {
   [ECS_REMOVE_DEFAULT_DESIRED_COUNT]: true,
   [RDS_LOWERCASE_DB_IDENTIFIER]: true,
   [EFS_DEFAULT_ENCRYPTION_AT_REST]: true,
-  [LAMBDA_RECOGNIZE_VERSION_PROPS]: false,
+  [LAMBDA_RECOGNIZE_VERSION_PROPS]: true,
   [CLOUDFRONT_DEFAULT_SECURITY_POLICY_TLS_V1_2_2021]: true,
 };
 
