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.

Sign up for GitHub

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

Jump to bottom

feat(cli): support hotswapping Lambda functions with inline code #18408

Merged

mergify merged 11 commits into aws:master from tmokmss:hotswap_inline_lambda

Jan 19, 2022

Contributor

tmokmss commented Jan 13, 2022

Similarly to #18319, this PR supports hotswap of Lambda functions that use InlineCode.

InlineCode uses CloudFormation ZipFile feature. To emulate its behavior, we create a zip file of the provided inline code with its filename index.js or index.py according to the runtime (CFn only supports python or nodejs for ZipFile), and pass the file's binary buffer to Lambda API.

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


          hotswap for inline code lambda

cc2f641

gitpod-io bot commented Jan 13, 2022

github-actions bot assigned rix0rrr

github-actions bot added the package/tools label

tmokmss mentioned this pull request

feat(cli): support hotswapping Lambda functions that use Docker images #18319

Merged

comcalvi assigned skinny85 and comcalvi and unassigned rix0rrr


          Merge branch 'master' into hotswap_inline_lambda

f40d8b1

comcalvi previously requested changes

View reviewed changes

Contributor

comcalvi left a comment •

edited

Loading

Awesome work! I have a few comments, @skinny85 let me know what you think. Also, @tmokmss can you update the README to please the linter?

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Show resolved Hide resolved

packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts Show resolved Hide resolved

packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

comcalvi requested a review from skinny85

January 13, 2022 17:55

skinny85 previously requested changes

View reviewed changes

Contributor

skinny85 left a comment

Looks great @tmokmss! A few minor comments before we merge this in 🙂.

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated

+                            // We must create a zip package containing a file with the inline code
+                            const rawZipFile = await evaluateCfnTemplate.evaluateCfnExpression(updatedProp.newValue[newPropName]);
+                            // file extension must be chosen depending on the runtime
+                            const runtime: string = await evaluateCfnTemplate.evaluateCfnExpression(change.newValue.Properties!.Runtime);

Contributor

skinny85 Jan 14, 2022

Is the ! really required? Can we go without it?

Suggested change

      
                          const runtime: string = await evaluateCfnTemplate.evaluateCfnExpression(change.newValue.Properties!.Runtime);
          
                          const runtime: string = await evaluateCfnTemplate.evaluateCfnExpression(change.newValue.Properties.Runtime);

Contributor

skinny85 Jan 14, 2022

Also, let's call this variable functionRuntime, just to make it's very clear what runtime we are talking about here.

Contributor Author

tmokmss Jan 14, 2022

Properties is possibly undefined so we need to care it.

aws-cdk/packages/@aws-cdk/cloudformation-diff/lib/diff/types.ts

Lines 475 to 480 in c7c51de

    
           export interface Resource { 
        
             Type: string; 
        
             Properties?: { [name: string]: any }; 
        
             [key: string]: any; 
        
           }

I replaced ! to ? to care when runtime is undefined, c.f. s3-bucket-deployments.ts (idk if there's such a case though)

aws-cdk/packages/aws-cdk/lib/api/hotswap/s3-bucket-deployments.ts

Lines 25 to 28 in c7c51de

    
           const functionName = await evaluateCfnTemplate.evaluateCfnExpression(change.newValue.Properties?.ServiceToken); 
        
           if (!functionName) { 
        
             return ChangeHotswapImpact.REQUIRES_FULL_DEPLOYMENT; 
        
           }

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Outdated Show resolved Hide resolved

packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts Outdated Show resolved Hide resolved

packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts Show resolved Hide resolved

packages/aws-cdk/lib/api/hotswap/lambda-functions.ts Show resolved Hide resolved

tmokmss added 3 commits

January 14, 2022 09:55


          rename variables

e896c51


          throw CfnEvaluationException on unsupported runtime

01144be


          Update README.md

9af3e1a

mergify bot dismissed stale reviews from comcalvi and skinny85

January 14, 2022 01:30

Pull request has been modified.

Contributor Author

tmokmss commented Jan 14, 2022

Thank you very much @comcalvi @skinny85! I fixed all of the review points. I'll fix possible conflicts after #18319 will be merged.

tmokmss added 3 commits

January 14, 2022 11:29


          fix null handling of functionRuntime

6c3abbf


          Update lambda-functions.ts

4908e98


          Update lambda-functions.ts

a131157

mergify bot pushed a commit that referenced this pull request


          feat(cli): support hotswapping Lambda functions that use Docker images (

6b553b7

#18319)

closes #18302

We must just update `ImageUri` with the new ECR image url.

PR for `InlineCode` hotswap: #18408
 
`----`

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

tmokmss added 2 commits

January 15, 2022 10:01


          Merge branch 'master' into hotswap_inline_lambda

d031faa


          fix order

1b5bc41

Contributor Author

tmokmss commented Jan 15, 2022

@skinny85
I resolved conflicts with master branch. Now ready for merge:)

skinny85 approved these changes

View reviewed changes

Contributor

skinny85 left a comment

Looks great @tmokmss, thanks for the contribution!

skinny85 changed the title ~~feat(cli): Support hotswap for Lambda code with InlineCode~~ feat(cli): support hotswapping Lambda functions with inline code

github-actions bot assigned rix0rrr

Contributor

mergify bot commented Jan 18, 2022

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

comcalvi approved these changes

View reviewed changes


          Merge branch 'master' into hotswap_inline_lambda

fb4656c

Collaborator

aws-cdk-automation commented Jan 19, 2022

AWS CodeBuild CI Report

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

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

mergify bot merged commit d0b8512 into aws:master

Contributor

mergify bot commented Jan 19, 2022

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

tmokmss deleted the hotswap_inline_lambda branch

January 19, 2022 12:06

TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request


          feat(cli): support hotswapping Lambda functions that use Docker images (

9744c77

aws#18319)

closes aws#18302

We must just update `ImageUri` with the new ECR image url.

PR for `InlineCode` hotswap: aws#18408
 
`----`

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

TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request


          feat(cli): support hotswapping Lambda functions with inline code (aws…

edc4260

…#18408)

Similarly to aws#18319, this PR supports hotswap of Lambda functions that use `InlineCode`.

`InlineCode` uses [CloudFormation `ZipFile` feature](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#:~:text=requires%3A%20No%20interruption-,ZipFile,-\(Node.js%20and). To emulate its behavior, we create a zip file of the provided inline code with its filename `index.js` or `index.py` according to the runtime (CFn only supports python or nodejs for ZipFile), and pass the file's binary buffer to Lambda API.

----

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels