Skip to content
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.

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

fix(cli): Lambda hotswap fails if environment contains tokens #22099

Merged
merged 4 commits into from
Sep 19, 2022

Conversation

tmokmss
Copy link
Contributor

@tmokmss tmokmss commented Sep 18, 2022

closes #22088

We always need to use evaluateCfnTemplate.evaluateCfnExpression when a variable to be used in hotswap may contain tokens.


All Submissions:

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
Copy link

gitpod-io bot commented Sep 18, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team September 18, 2022 13:46
@github-actions github-actions bot added bug This issue is a bug. p2 labels Sep 18, 2022
@skinny85
Copy link
Contributor

I haven't added any unit test for this because all the other hotswap code does not seem to have such tests. It might be difficult to test hotswap with tokens in unit tests. Let me know if I should add a integration test for this issue.

Hotswap code definitely has unit tests 😉. Example.

@tmokmss
Copy link
Contributor Author

tmokmss commented Sep 19, 2022

Hi Adam thanks! I could not have found hotswap unit tests with token resolution but I must have overlooked them 🤦

@rix0rrr rix0rrr changed the title fix(cli): fix lambda environment variable hotswap with tokens fix(cli): Lambda hotswap fails if environment contains tokens Sep 19, 2022
Copy link
Contributor

@rix0rrr rix0rrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mergify
Copy link
Contributor

mergify bot commented Sep 19, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 4ae9c78
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify mergify bot merged commit 8280709 into aws:main Sep 19, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 19, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@tmokmss tmokmss deleted the fix-lambda-hotswap-envvar branch September 20, 2022 05:35
homakk pushed a commit to homakk/aws-cdk that referenced this pull request Dec 1, 2022
)

closes aws#22088 

We always need to use `evaluateCfnTemplate.evaluateCfnExpression` when a variable to be used in hotswap may contain tokens.

----

### All Submissions:

* [X] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [ ] 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*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cli: hotswapping Lambda environment variable with tokens results in an error
4 participants