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(rds): fix unresolved endpoint socket address #2846

Merged
merged 1 commit into from
Jun 13, 2019

Conversation

jogold
Copy link
Contributor

@jogold jogold commented Jun 12, 2019

Convert port to a string token before using it in socketAddress otherwise the number token is
converted to a string and cannot be resolved.

Fixes #2711


Pull Request Checklist

  • Testing
    • Unit test added (prefer not to modify an existing test, otherwise, it's probably a breaking change)
    • CLI change?: coordinate update of integration tests with team
    • cdk-init template change?: coordinated update of integration tests with team
  • Docs
    • jsdocs: All public APIs documented
    • README: README and/or documentation topic updated
    • Design: For significant features, design document added to design folder
  • Title and Description
    • Change type: title prefixed with fix, feat and module name in parens, which will appear in changelog
    • Title: use lower-case and doesn't end with a period
    • Breaking?: last paragraph: "BREAKING CHANGE: <describe what changed + link for details>"
    • Issues: Indicate issues fixed via: "Fixes #xxx" or "Closes #xxx"
  • Sensitive Modules (requires 2 PR approvers)
    • IAM Policy Document (in @aws-cdk/aws-iam)
    • EC2 Security Groups and ACLs (in @aws-cdk/aws-ec2)
    • Grant APIs (only if not based on official documentation with a reference)

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

@jogold jogold requested a review from a team as a code owner June 12, 2019 17:32
@eladb
Copy link
Contributor

eladb commented Jun 12, 2019

This actually looks like something I'd like tokens to be able to do. @rix0rrr what do you think?

const num = Token.asNumber({ "Fn::GetAtt": [ "Boom", "Port" ] });
const text = `Hello, ${num}`;

Should resolve to:

{ "Fn::Join": [ "", [ "Hello, ", { "Fn::GetAtt": [ "Boom", "Port" ] } ] ] }

I think??

Convert port to a string token before using it in `socketAddress` otherwise the number token is
converted to a string and cannot be resolved.

Fixes aws#2711
@jogold jogold force-pushed the fix-rds-endpoint branch from 0ef110c to a3c3c3a Compare June 12, 2019 20:17
@jogold
Copy link
Contributor Author

jogold commented Jun 12, 2019

@eladb found a "nicer" fix in the mean time, see latest commit.

Agree that it would be nice if this would be handled by the token system.

As the fix here implies, wouldn't this need something like a .toString() for number tokens that would convert them to string tokens and not string representation of a number? But those are of type number?

@rix0rrr
Copy link
Contributor

rix0rrr commented Jun 13, 2019

Elad, so you're saying we should also be scanning strings for stringified versions of number-encoded tokens? I mean, technically possible, but pretty tricky I'm expecting.

(Also, purity nitpick: to properly mirror the language type system into the document type system, we would then need to produce a stringified version of the number in the CloudFormation document language as well, which we can't. Good thing is that CFN probably doesn't care about the distinction all that much...)

@rix0rrr rix0rrr merged commit 902636a into aws:master Jun 13, 2019
@jogold jogold deleted the fix-rds-endpoint branch June 13, 2019 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't get port from RDS DatabaseCluster Endpoint
3 participants