Set the config file format #1299
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
Eugeny
reviewed
Mar 25, 2025
warpgate/src/config.rs
Outdated
| @@ -11,7 +11,7 @@ use warpgate_common::{WarpgateConfig, WarpgateConfigStore}; | |||
|
|
|||
| pub fn load_config(path: &Path, secure: bool) -> Result<WarpgateConfig> { | |||
| let mut store: serde_yaml::Value = Config::builder() | |||
| .add_source(File::from(path)) | |||
| .add_source(File::new(path.to_str().unwrap_or(""), FileFormat::Yaml)) | |||
There was a problem hiding this comment.
Should fail instead of defaulting to ""
There was a problem hiding this comment.
I didn't know enough rust to know how to make it fail with an error thats why I added the default. The default should fail anyway because it doesnt exists.
If you show me how to make it fail, I make the commit
|
I've changed the code to generate an error instead of defaulting to empty string |
|
Thank you! @all-contributors please add @Mice7R for code |
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.
This sets the file format to be yaml instead of let the config to figure it out by extension. The problem is that it guesses file format by extension and some tools - eg ansible - create tempfiles without extension to validate the config changes before applying them, that makes the validation always fail.
This PR changes how the config file is loaded so that it doesn't guess file type.