get rid of codeHash

Author: Elad Ben-Israel

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

@@ -1,7 +1,6 @@
 import * as s3 from '@aws-cdk/aws-s3';
 import * as s3_assets from '@aws-cdk/aws-s3-assets';
 import * as cdk from '@aws-cdk/core';
-import * as crypto from 'crypto';
 
 export abstract class Code {
   /**
@@ -105,12 +104,6 @@ export interface CodeConfig {
    * Inline code (mutually exclusive with `s3Location`).
    */
   readonly inlineCode?: string;
-
-  /**
-   * The hash of the lambda code (if applicable) or `undefined` if it cannot be
-   * computed.
-   */
-  readonly codeHash?: string;
 }
 
 /**
@@ -147,7 +140,6 @@ export class S3Code extends Code {
  */
 export class InlineCode extends Code {
   public readonly isInline = true;
-  private readonly codeHash: string;
 
   constructor(private code: string) {
     super();
@@ -159,14 +151,11 @@ export class InlineCode extends Code {
     if (code.length > 4096) {
       throw new Error("Lambda source is too large, must be <= 4096 but is " + code.length);
     }
-
-    this.codeHash = crypto.createHash('sha256').update(code).digest('hex');
   }
 
   public bind(_scope: cdk.Construct): CodeConfig {
     return {
       inlineCode: this.code,
-      codeHash: this.codeHash
     };
   }
 }
@@ -200,7 +189,6 @@ export class AssetCode extends Code {
     }
 
     return {
-      codeHash: this.asset.sourceHash,
       s3Location: {
         bucketName: this.asset.s3BucketName,
         objectKey: this.asset.s3ObjectKey

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

@@ -7,18 +7,11 @@ export function calculateFunctionHash(fn: LambdaFunction) {
 
   const functionResource = fn.node.defaultChild as CfnResource;
 
-  if (!fn._codeHash) {
-    throw new Error(`assertion failed: codeHash is expected to have a value if currentVersion is defined`);
-  }
-
   // render the cloudformation resource from this function
   const config = stack.resolve((functionResource as any)._toCloudFormation());
 
   const hash = crypto.createHash('md5');
-  hash.update(JSON.stringify({
-    code: fn._codeHash,
-    config
-  }));
+  hash.update(JSON.stringify(config));
 
   return hash.digest('hex');
 }

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

@@ -287,12 +287,6 @@ export class Function extends FunctionBase {
       return this._currentVersion;
     }
 
-    if (!this._codeHash) {
-      throw new Error(
-        `cannot automatically create a version resource for this function since the hash of the code cannot be calculated. ` +
-        `This is only supported for "lambda.Code.fromAsset" and "lambda.Code.fromInline"`);
-    }
-
     this._currentVersion = new Version(this, `CurrentVersion`, {
       lambda: this,
       description: `${this.node.path}.currentVersion (created by AWS CDK)`,
@@ -470,11 +464,6 @@ export class Function extends FunctionBase {
 
   public readonly permissionsNode = this.node;
 
-  /**
-   * @internal
-   */
-  public _codeHash?: string;
-
   protected readonly canCreatePermissions = true;
 
   private readonly layers: ILayerVersion[] = [];
@@ -520,7 +509,6 @@ export class Function extends FunctionBase {
     verifyCodeConfig(code, props.runtime);
 
     this.deadLetterQueue = this.buildDeadLetterQueue(props);
-    this._codeHash = code.codeHash;
 
     const resource: CfnFunction = new CfnFunction(this, 'Resource', {
       functionName: this.physicalName,
@@ -820,5 +808,5 @@ export function verifyCodeConfig(code: CodeConfig, runtime: Runtime) {
   // if this is inline code, check that the runtime supports
   if (code.inlineCode && !runtime.supportsInlineCode) {
     throw new Error(`Inline source not allowed for ${runtime.name}`);
-  }}
-
+  }
+}

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

@@ -83,43 +83,6 @@ export = {
       }, ResourcePart.CompleteDefinition));
       test.done();
     },
-
-    'codeHash is supported for assets and inline'(test: Test) {
-      // GIVEN
-      const stack = new cdk.Stack();
-
-      // WHEN
-      const asset = new lambda.Function(stack, 'AssetCode', {
-        code: lambda.Code.fromAsset(path.join(__dirname, 'my-lambda-handler')),
-        runtime: lambda.Runtime.NODEJS_12_X,
-        handler: 'index.handler'
-      });
-
-      const inline = new lambda.Function(stack, 'InlineCode', {
-        code: lambda.Code.fromInline('boom boom'),
-        runtime: lambda.Runtime.NODEJS_12_X,
-        handler: 'index.handler'
-      });
-
-      const bucket = new lambda.Function(stack, 'S3Code', {
-        code: lambda.Code.fromBucket(s3.Bucket.fromBucketName(stack, 'Bucket', 'bucket'), 'key'),
-        runtime: lambda.Runtime.NODEJS_12_X,
-        handler: 'index.handler'
-      });
-
-      const params = new lambda.Function(stack, 'CfnParams', {
-        code: lambda.Code.fromCfnParameters(),
-        runtime: lambda.Runtime.NODEJS_12_X,
-        handler: 'index.handler'
-      });
-
-      // THEN
-      test.deepEqual(asset._codeHash, '9678c34eca93259d11f2d714177347afd66c50116e1e08996eff893d3ca81232');
-      test.deepEqual(inline._codeHash, '58ad733fe276cb7b9b171b0beafad40f43b6d1cd68a1b93327d3655f739dfa0e');
-      test.deepEqual(bucket._codeHash, undefined);
-      test.deepEqual(params._codeHash, undefined);
-      test.done();
-    }
   },
 
   'lambda.Code.fromCfnParameters': {

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

@@ -39,8 +39,8 @@ export = {
         handler: 'index.handler'
       });
 
-      test.deepEqual(calculateFunctionHash(fn1), 'a1dd0e860a511e65bf720e3bd0f6b6a9');
-      test.deepEqual(calculateFunctionHash(fn2), 'a1dd0e860a511e65bf720e3bd0f6b6a9');
+      test.deepEqual(calculateFunctionHash(fn1), calculateFunctionHash(fn2));
+      test.deepEqual(calculateFunctionHash(fn1), 'aea5463dba236007afe91d2832b3c836');
       test.done();
     },
   },
@@ -53,8 +53,8 @@ export = {
       handler: 'index.handler'
     });
 
-    test.notDeepEqual(calculateFunctionHash(fn1), 'a1dd0e860a511e65bf720e3bd0f6b6a9');
-    test.deepEqual(calculateFunctionHash(fn1), '1ad32fcab0aa68bf36825df8e6f0a7a2');
+    test.notDeepEqual(calculateFunctionHash(fn1), 'aea5463dba236007afe91d2832b3c836');
+    test.deepEqual(calculateFunctionHash(fn1), '979b4a14c6f174c745cdbcd1036cf844');
     test.done();
   },
 
@@ -79,8 +79,8 @@ export = {
       }
     });
 
-    test.deepEqual(calculateFunctionHash(fn1), 'ea4daca738e83756eec5a3a3c806d54d');
-    test.deepEqual(calculateFunctionHash(fn2), '2cb1ed852c739c60254b3bbfb258e513');
+    test.deepEqual(calculateFunctionHash(fn1), 'd1bc824ac5022b7d62d8b12dbae6580c');
+    test.deepEqual(calculateFunctionHash(fn2), '3b683d05465012b0aa9c4ff53b32f014');
     test.done();
   },
 
@@ -105,8 +105,28 @@ export = {
       }
     });
 
-    test.deepEqual(calculateFunctionHash(fn1), 'ea4daca738e83756eec5a3a3c806d54d');
-    test.deepEqual(calculateFunctionHash(fn2), '4bdbec98b3c838410b5637fb71101514');
+    test.deepEqual(calculateFunctionHash(fn1), 'd1bc824ac5022b7d62d8b12dbae6580c');
+    test.deepEqual(calculateFunctionHash(fn2), '0f168f0772463e8e547bb3800937e54d');
+    test.done();
+  },
+
+  'inline code change impacts the hash'(test: Test) {
+    const stack1 = new Stack();
+    const fn1 = new lambda.Function(stack1, 'MyFunction', {
+      runtime: lambda.Runtime.NODEJS_12_X,
+      code: lambda.Code.fromInline('foo'),
+      handler: 'index.handler',
+    });
+
+    const stack2 = new Stack();
+    const fn2 = new lambda.Function(stack2, 'MyFunction', {
+      runtime: lambda.Runtime.NODEJS_10_X,
+      code: lambda.Code.fromInline('foo bar'),
+      handler: 'index.handler',
+    });
+
+    test.deepEqual(calculateFunctionHash(fn1), 'ebf2e871fc6a3062e8bdcc5ebe16db3f');
+    test.deepEqual(calculateFunctionHash(fn2), 'ffedf6424a18a594a513129dc97bf53c');
     test.done();
   }
 };

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

@@ -185,22 +185,6 @@ export = testCase({
 
   'currentVersion': {
 
-    'cannot be created for unsupported lambda.Code types'(test: Test) {
-      // GIVEN
-      const stack = new cdk.Stack();
-
-      // WHEN
-      const fn = new lambda.Function(stack, 'fn', {
-        handler: 'foo',
-        runtime: lambda.Runtime.NODEJS_12_X,
-        code: lambda.Code.fromCfnParameters()
-      });
-
-      // THEN
-      test.throws(() => fn.currentVersion, /cannot automatically create a version resource for this function/);
-      test.done();
-    },
-
     // see test.function-hash.ts for more coverage for this
     'logical id of version is based on the function hash'(test: Test) {
       // GIVEN
@@ -235,18 +219,17 @@ export = testCase({
       expect(stack1).to(haveOutput({
         outputName: 'CurrentVersionArn',
         outputValue: {
-          Ref: "MyFunctionCurrentVersion197490AFa10cabe18b67f28a68a1ad20c7468ba6"
+          Ref: "MyFunctionCurrentVersion197490AF1a9a73cf5c46aec5e40fb202042eb60b"
         }
       }));
       expect(stack2).to(haveOutput({
         outputName: 'CurrentVersionArn',
         outputValue: {
-          Ref: "MyFunctionCurrentVersion197490AF35a71af54fb82ee3ff968834b82d088c"
+          Ref: "MyFunctionCurrentVersion197490AF8360a045031060e3117269037b7bffd6"
         }
       }));
       test.done();
     }
-
   },
 
 });

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

@@ -134,7 +134,7 @@ export = {
       },
       "FunctionVersion": {
         "Fn::GetAtt": [
-          "FnCurrentVersion17A89ABB3127ebe0d45a77e18d3b1ca1c6c8c55c",
+          "FnCurrentVersion17A89ABB19ed45993ff69fd011ae9fd4ab6e2005",
           "Version"
         ]
       },