fix(config): Fix comment removal in TOML files #14240
Merged
Conversation
This file contains 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
|
Download PR build artifacts for linux_amd64.tar.gz, darwin_amd64.tar.gz, and windows_amd64.zip. 📦 Click here to get additional PR build artifactsArtifact URLs |
srebhan
added
area/configuration
ready for final review
powersj
approved these changes
Nov 3, 2023
Hipska
added a commit
to Super-Visions/telegraf
that referenced
this pull request
Nov 7, 2023
* master: fix(inputs.win_perf_counter): Do not rely on returned buffer size (influxdata#14241) feat(inputs.modbus): Add support for string-fields (influxdata#14145) chore(deps): Bump cloud.google.com/go/storage from 1.30.1 to 1.34.1 (influxdata#14253) chore(deps): Bump github.com/rabbitmq/amqp091-go from 1.8.1 to 1.9.0 (influxdata#14252) chore(deps): Bump github.com/hashicorp/consul/api from 1.25.1 to 1.26.1 (influxdata#14251) chore(deps): Bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs from 1.23.5 to 1.26.0 (influxdata#14249) fix(config): Fix comment removal in TOML files (influxdata#14240) feat(outputs.prometheus_client): Support listen on vsock (influxdata#14108) fix(inputs.mqtt_consumer): Resolve could not mark message delivered (influxdata#14243) chore(linters): Fix findings found by testifylint for Windows and enable it. (influxdata#14238) feat(migrations): Add option migration for inputs.nats_consumer (influxdata#14234) feat(migrations): Add option migration for inputs.mqtt_consumer (influxdata#14233) test(inputs.jolokia2_agent): Sort metrics as order is not consistent (influxdata#14227)
powersj
pushed a commit
that referenced
this pull request
Nov 13, 2023
(cherry picked from commit 1887d29)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
resolves #14237
The current code for removing comments from TOML files is not aware of multi-line strings. As a consequence, hashes embedded in multi-line strings (as shown in #14237) will be considered a comment and all text until the end-line is removed.
This PR completely reworks the parsing by implementing a state machine matching the start and end of comments, strings, multi-line strings and handles escaping. It also adds a test case including (but not limited to) #14237.