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(rosetta): use of keyword 'lambda' produces invalid Python code #1850

Merged
merged 3 commits into from
Aug 6, 2020

Conversation

nija-at
Copy link
Contributor

@nija-at nija-at commented Aug 5, 2020

Replace all 'lambda' identifiers with 'awslambda'

fixes aws/aws-cdk#9169


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

Replace all 'lambda' identifiers with 'awslambda'

fixes #9169
@nija-at nija-at requested review from rix0rrr and a team August 5, 2020 10:49
@nija-at nija-at self-assigned this Aug 5, 2020
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 5, 2020
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.

Proposed simplification:

  • As a part of mangling, append _ to identifiers that end up the same as a list of known keywords.

@@ -833,6 +839,10 @@ const TOKEN_REWRITES: { [key: string]: string } = {
false: 'False',
};

const IDENTIFIER_KEYWORDS: { [key: string]: string } = {
lambda: 'awslambda',
Copy link
Contributor

Choose a reason for hiding this comment

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

This is too CDK-specific for JSII. Why not lambda_ ? It's not great but a simple convention.

In fact, any keyword can be non-keyworded by appending _.

@nija-at nija-at requested a review from rix0rrr August 6, 2020 09:29
@mergify
Copy link
Contributor

mergify bot commented Aug 6, 2020

Thank you for contributing! ❤️ I will now look into making sure the PR is up-to-date, then proceed to try and merge it!

@mergify mergify bot added the pr/ready-to-merge This PR is ready to be merged. label Aug 6, 2020
@mergify
Copy link
Contributor

mergify bot commented Aug 6, 2020

Merging (with squash)...

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-Blkkw9bQFn8A
  • Commit ID: 526d9d1
  • 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 39769b0 into master Aug 6, 2020
@mergify mergify bot deleted the nija-at/rosetta-keyword-lambda branch August 6, 2020 16:50
@mergify
Copy link
Contributor

mergify bot commented Aug 6, 2020

Merging (with squash)...

@mergify mergify bot removed the pr/ready-to-merge This PR is ready to be merged. label Aug 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[aws-lambda] Generated python example does not work
3 participants