Filter out files _before_ parsing #272
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
anderseknert
force-pushed
the
fix-ignore-parse-error
branch
from
b46a0ea
to
6fa531b
Compare
kristiansvalland
approved these changes
Aug 23, 2023
internal/io/io.go
Outdated
| @@ -72,6 +72,23 @@ func JSONRoundTrip(from any, to any) error { | |||
| return json.Unmarshal(bs, to) //nolint:wrapcheck | |||
| } | |||
|
|
|||
| // YAMLRoundTrip convert any value to YAML and back again. | |||
| func YAMLRoundTrip(from any, to any) error { | |||
There was a problem hiding this comment.
While I am not very familiar with (un)marshalling YAML, I do not immediately see how making a roundtrip via YAML as the intermediate is any different from JSON when considering the end result. Or is there some go types that would behave differently in this case?
There was a problem hiding this comment.
No, you're right. This remained from a point where I considered ditching JSON altogether, but I realized later we need that for output formats. I'll have this removed before merge.
pkg/config/config.go
Outdated
Comment on lines
167
to
171
| level, ok := result["level"].(string) | ||
| if !ok { | ||
| return errLevelMustBeString | ||
| } | ||
|
|
||
| if ignore, ok := result["ignore"]; ok { | ||
| var dst Ignore | ||
|
|
||
| err := rio.YAMLRoundTrip(ignore, &dst) | ||
| if err != nil { | ||
| return fmt.Errorf("unmarshalling rule ignore failed: %w", err) | ||
| } | ||
|
|
||
| rule.Ignore = dst | ||
| } | ||
|
|
||
| delete(result, "enabled") | ||
|
|
||
| rule.Level = level | ||
| rule.Extra = result | ||
|
|
||
| return nil |
There was a problem hiding this comment.
Probably not a big improvement, but could/should this part be shared with UnmarshalJSON to reduce code duplication?
Also: * Allow files to be provided either from file paths, *or* programmatically as modules. * Marshal config directly to Config struct, and prefer to use the struct rather than passing around the config as a map. Fixes #265 Signed-off-by: Anders Eknert <anders@styra.com>
anderseknert
force-pushed
the
fix-ignore-parse-error
branch
from
6fa531b
to
bc3be5e
Compare
srenatus
pushed a commit
to srenatus/regal
that referenced
this pull request
Oct 1, 2024
Also: * Allow files to be provided either from file paths, *or* programmatically as modules. * Marshal config directly to Config struct, and prefer to use the struct rather than passing around the config as a map. Fixes StyraInc#265 Signed-off-by: Anders Eknert <anders@styra.com>
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.
Also:
Fixes #265