Wire up support for converting integrations-next configs to flow. #5973
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
Include a mechanism for passing command line flags to the converter from the old format. Signed-off-by: erikbaranowski <[email protected]>
erikbaranowski
commented
Dec 13, 2023
| @@ -31,7 +31,7 @@ func Convert(in []byte, extraArgs []string) ([]byte, diag.Diagnostics) { | |||
| var diags diag.Diagnostics | |||
|
|
|||
| fs := flag.NewFlagSet("convert", flag.ContinueOnError) | |||
| args := []string{"-config.file", "convert", "-config.expand-env"} | |||
| args := []string{"-config.file", "convert"} | |||
There was a problem hiding this comment.
Remove this hard coded since we can now pass this in and have more control over the converter. This was the lesser of 2 evils before to automatically expand environment vars.
erikbaranowski
commented
Dec 13, 2023
| @@ -1,3 +1,7 @@ | |||
| server: | |||
| log_level: ${SOME_ENVIRONMENT_VARIABLE:='debug'} | |||
There was a problem hiding this comment.
Added an integration-next test for env vars to validate it also works.
erikbaranowski
commented
Dec 13, 2023
| @@ -10,8 +10,8 @@ import ( | |||
| ) | |||
|
|
|||
| func TestConvert(t *testing.T) { | |||
| test_common.TestDirectory(t, "testdata", ".yaml", true, []string{}, staticconvert.Convert) | |||
| test_common.TestDirectory(t, "testdata-v2", ".yaml", true, []string{"-enable-features", "integrations-next"}, staticconvert.Convert) | |||
| test_common.TestDirectory(t, "testdata", ".yaml", true, []string{"-config.expand-env"}, staticconvert.Convert) | |||
There was a problem hiding this comment.
This is no longer hard coded to be added so we need to pass it in for the tests.
thampiotr
reviewed
Dec 14, 2023
mattdurham
reviewed
Dec 14, 2023
Co-authored-by: Piotr <[email protected]>
…ana Agent Flow Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>
clayton-cornell
approved these changes
Dec 14, 2023
clayton-cornell
added
the
type/docs
thampiotr
approved these changes
Dec 15, 2023
| @@ -174,3 +187,35 @@ func supportedFormatsList() string { | |||
| } | |||
| return strings.Join(ret, ", ") | |||
| } | |||
|
|
|||
| func parseExtraArgs(extraArgs string) ([]string, error) { | |||
There was a problem hiding this comment.
Nice, thanks for addressing this! I'd only add maybe a couple of comments, e.g. the two cases in for loop for --flag and -flag. Some test cases for failed parses or the --key="foo=bar" may be a good idea too.
There was a problem hiding this comment.
once I did some deeper testing, I made some more significant improvements to the func. I added comments throughout due to the complexity which will hopefully help future us
Co-authored-by: Piotr <[email protected]>
…de comments Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
BarunKGP
pushed a commit
to BarunKGP/grafana-agent
that referenced
this pull request
Feb 20, 2024
…afana#5973) * Wire up support for converting integrations-next configs to flow. Include a mechanism for passing command line flags to the converter from the old format. Signed-off-by: erikbaranowski <[email protected]> * Update cmd/internal/flowmode/cmd_convert.go Co-authored-by: Piotr <[email protected]> * Apply suggestions from code review Co-authored-by: Clayton Cornell <[email protected]> * Update docs/sources/flow/getting-started/migrating-from-static.md Co-authored-by: Piotr <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]> Co-authored-by: Piotr <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Include a mechanism for passing command line flags to the converter from the old format.
PR Description
Which issue(s) this PR fixes
Notes to the Reviewer
PR Checklist