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

serialize non-table keys of config before table keys #3059

Merged
merged 1 commit into from Aug 31, 2017
Merged

Conversation

mwrock
Copy link
Contributor

@mwrock mwrock commented Aug 31, 2017

When serializing a Cfg, its default, environment, user and gossip tables are merged into a new toml::value::Table which orders its keys. This means that if there are table keys ordered before non table keys, a ValueAfterTable error occurs.

This PR orders the serialization of non table, array and table keys in that order to avoid this error.

Signed-off-by: Matt Wrock matt@mattwrock.com

Signed-off-by: Matt Wrock <matt@mattwrock.com>
@thesentinels
Copy link
Contributor

Thanks for the pull request! Here is what will happen next:

  1. Your PR will be reviewed by the maintainers
  2. If everything looks good, one of them will approve it, and your PR will be merged.

Thank you for contributing!

@chefsalim
Copy link
Contributor

tenor-203597002

@reset
Copy link
Collaborator

reset commented Aug 31, 2017

@mwrock excellent solution!

tenor-19080372

@thesentinels approve

@thesentinels
Copy link
Contributor

🤘 I am testing your branch against master before merging it. We do this to ensure that the master branch is never failing tests.

@thesentinels
Copy link
Contributor

:neckbeard: Travis CI has started testing this PR.

@thesentinels
Copy link
Contributor

💔 Travis CI reports this PR failed to pass the test suite.

The next step is to examine the job and figure out why. If it is transient, you can try re-triggering the Travis CI Job - if it passes, this PR will be automatically merged. If it is not transient, you should fix the issue and update this pull request, and issue approve again. If you believe it will never pass, and you are feeling :godmode:, you can issue a force to merge this PR anyway.

@mwrock
Copy link
Contributor Author

mwrock commented Aug 31, 2017

@thesentinels approve

@thesentinels
Copy link
Contributor

🤘 I am testing your branch against master before merging it. We do this to ensure that the master branch is never failing tests.

@christophermaier
Copy link
Contributor

@thesentinels approve

@thesentinels
Copy link
Contributor

🤘 I am testing your branch against master before merging it. We do this to ensure that the master branch is never failing tests.

@thesentinels
Copy link
Contributor

:neckbeard: Travis CI has started testing this PR.

@thesentinels
Copy link
Contributor

💖 Travis CI reports this PR passed.

It always makes me feel nice when humans approve of one anothers work. I'm merging this PR now.

I just want you and the contributor to answer me one question:

gif-keyboard-3280869874741411265

@thesentinels thesentinels merged commit 3434f39 into master Aug 31, 2017
@thesentinels thesentinels deleted the ser_table branch August 31, 2017 14:09
@mwrock
Copy link
Contributor Author

mwrock commented Aug 31, 2017

3rd time's a charm i guess

@christophermaier christophermaier added Focus:Supervisor Related to the Habitat Supervisor (core/hab-sup) component Type: Bug Issues that describe broken functionality and removed A-supervisor labels Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Focus:Supervisor Related to the Habitat Supervisor (core/hab-sup) component Type: Bug Issues that describe broken functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants