Backport config type fixes to 1.20.x#2005
Merged
sagikazarmark merged 2 commits intov1.20.xfrom Mar 26, 2025
Merged
Conversation
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
There was a problem hiding this comment.
Pull Request Overview
This PR backports config type fixes to the 1.20.x branch by changing how the configuration type is determined and how configurations are read and merged. Key changes include:
- Removing explicit checks for config type in ReadConfig and MergeConfig and deferring this to unmarshalReader.
- Replacing direct assignment of a new map with reading into a temporary config map.
- Introducing new tests that set a dummy config file to infer configuration type from its file extension.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| viper.go | Refactors ReadConfig, MergeConfig, and unmarshalReader to improve config type handling. |
| viper_test.go | Adds tests for ReadConfig and MergeConfig when a config file is set to derive config type. |
Comments suppressed due to low confidence (1)
viper.go:1673
- Consider checking the error returned by buf.ReadFrom(in) to handle potential read failures.
buf.ReadFrom(in)
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
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.
See #2003
See #2007