Set config on interactive command in osquery checkup #1968
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
| @@ -66,10 +67,15 @@ func (o *osqueryCheckup) interactive(ctx context.Context) error { | |||
| return fmt.Errorf("getting current running executable: %w", err) | |||
| } | |||
|
|
|||
| flagFilePath := launcher.DefaultPath(launcher.ConfigFile) | |||
| if o.k != nil && o.k.Identifier() != "" { | |||
| flagFilePath = strings.ReplaceAll(flagFilePath, launcher.DefaultLauncherIdentifier, o.k.Identifier()) | |||
zackattack01
approved these changes
Nov 26, 2024
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.
Relates to #1892.
#1958 appeared to fix the above issue. However, during validation for v1.12.3, we saw a new iteration of the same error -- this time, though, it wasn't a timeout error.
When testing, I am finding that whether the osquery checkup fails depends on my
localdev_pathsetting (which also explains why I did not see this issue when testing the previous PR).localdev_path<bin-dir>\launcher.exe<updates-dir>\launcher\<nightly>\launcher.exe<bin-dir>\launcher.exe<updates-dir>\launcher\<nightly>\launcher.exeI'm not quite sure how to explain this behavior yet, especially when I can't reproduce it in my test environment. (Plus -- for my secondary install on the same computer, as well as for both installs on @zackattack01's Windows machine, this checkup consistently passes now.)
In this PR, I'm trying setting the
--configflag to see if that will change any of the behavior here. Regardless, it's useful to set the--configflag so e.g. the root directory can be picked up correctly by the interactive command.