feat(pkger): fixup flux query normalization in exporting of task #16346
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
jsteenb2
commented
Dec 27, 2019
| @@ -502,18 +502,14 @@ func ruleToResource(iRule influxdb.NotificationRule, endpointName, name string) | |||
| } | |||
|
|
|||
| // regex used to rip out the hard coded task option stuffs | |||
| var taskFluxRegex = regexp.MustCompile(`option task = {(.|\n)*}`) | |||
| var taskFluxRegex = regexp.MustCompile(`option task = {(.|\n)*?}`) | |||
There was a problem hiding this comment.
needed to make this not greedy
regex plagyround: https://regex101.com/r/xV9wL4/30
jsteenb2
force-pushed
the
16342/pkger_tasks_cleanup
branch
from
e5101b7
to
1e83f1f
Compare
kelwang
approved these changes
Dec 27, 2019
jsteenb2
force-pushed
the
16342/pkger_tasks_cleanup
branch
from
1e83f1f
to
0e4031d
Compare
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.
Closes #16342
Right now we have this duality of making the name/offset/every stuffs both inside the flux query and as siblings on the influxdb.Task type. For pgker, it needs just the query and not the hand jammed
option taskstuffs, b/c of the brittleness of the current Task API. This makes the initial regex no longer greedy, it was capturing too much. The regex playground below is useful if you want to test drive some more stuffs at it:regex playground for this fix: https://regex101.com/r/xV9wL4/30