Support multiline configuration values #63
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukebakken
force-pushed
the
cuttlefish-60-multiline-values
branch
from
089a67c to
0fd1922
Compare
Collaborator
There was a problem hiding this comment.
I'm impressed with how small the parser/grammar part of the change turned out to be.
The tests are very minimalistic and there's a newline character at the beginning of the value that might be worth stripping off but otherwise, this looks less intrusive than the escaped value support change was.
lukebakken
force-pushed
the
cuttlefish-60-multiline-values
branch
3 times, most recently
from
15ccbaf to
246404b
Compare
the-mikedavis
approved these changes
Oct 27, 2025
Collaborator
|
There was some discussion of newline handling in the EEP for it https://www.erlang.org/eeps/eep-0064#leading-and-trailing-newline Stripping exactly one leading and trailing newline seems reasonable to me but I don't have strong feelings either way |
lukebakken
force-pushed
the
cuttlefish-60-multiline-values
branch
2 times, most recently
from
be5a545 to
33596a4
Compare
Collaborator
Author
|
@the-mikedavis I decided to implement stripping leading/trailing newlines and |
Fixes #60 Multiline values will be configured using typical "here document" syntax: ``` a.b = ''' l0 l1 l2 ''' ``` All leading and trailing \n and \r in multiline values are trimmed. * Add support for single-quote delimited multiline here-documents * Fix match assertion to take win32 into account * Add multiline_empty_test * Add test for `value` multiline case. * Normalize newlines prior to match in tests for win32 systems. * Add test for multiline values that contain "special" characters. * Add test for unclosed here-document. * Add test for embedded `'''` which is a syntax error. * Add test for multiple here-documents in a conf file. * Add test that mixes simple and multiline values. * Add test with whitespace-only here-document. * Add test where here-document includes `#include` statements. * Add test when file does not end with newline. * Document syntax in README * Add here-document test with unicode.
lukebakken
force-pushed
the
cuttlefish-60-multiline-values
branch
from
33596a4 to
c74c263
Compare
Collaborator
|
Given how this feature will be used (e.g. for specifying LDAP queries "inline" in It will be more problematic for x.509 certificates where newlines can wreck parsing with very obscure errors elsewhere. @lukebakken @the-mikedavis I think dealing with the newline is something that can be handled by two different data types without any further parser changes:
This is the approach we have taken for tweaking how encrypted values are parsed, except that there we did not end up with one value but rather replaced one possible implementation with another over time to support values with certain characters in the middle. |
Collaborator
|
I have pushed a small fixture file update… in part because I can :D |
michaelklishin
approved these changes
Oct 28, 2025
michaelklishin
added a commit
that referenced
this pull request
Oct 28, 2025
Added entry for multiline string support in v3.6.0.
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 28, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 28, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 28, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 29, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 29, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 30, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
lukebakken
added a commit
to amazon-mq/upstream-to-rabbitmq-server
that referenced
this pull request
Oct 30, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63
mergify bot
pushed a commit
to rabbitmq/rabbitmq-server
that referenced
this pull request
Oct 30, 2025
The cuttlefish project recently added support for multiline values. The primary motivation for this is so that LDAP settings like `vhost_access_query` could now be expressed in `rabbitmq.conf`, rather than requiring `advanced.config`. These changes require cuttlefish version `3.6.0` or later. References: * Kyorai/cuttlefish#60 * Kyorai/cuttlefish#63 (cherry picked from commit 813617a)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #60
Multiline values will be configured using typical "here document" syntax: