Fix SAMLForceAuthn marshalling
#48098
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
Joerger
added
backport/branch/v17
no-changelog
kimlisa
approved these changes
Oct 29, 2024
rosstimothy
approved these changes
Oct 30, 2024
api/types/mfa.go
Outdated
| @@ -173,3 +175,113 @@ func (d *MFADevice) UnmarshalJSON(buf []byte) error { | |||
| err := unmarshaler.Unmarshal(bytes.NewReader(buf), d) | |||
| return trace.Wrap(err) | |||
| } | |||
|
|
|||
| // MarshalJSON marshals SAMLForceAuthn to string. | |||
| func (s *SAMLForceAuthn) MarshalYAML() (interface{}, error) { | |||
There was a problem hiding this comment.
Here and everywhere else prefer using any over interface{}
Suggested change
| func (s *SAMLForceAuthn) MarshalYAML() (interface{}, error) { | |
| func (s *SAMLForceAuthn) MarshalYAML() (any, error) { |
There was a problem hiding this comment.
This actually need to be interface{} for this to implement yaml.Marshaler, apparently interface{} isn't treated exactly like any. Changed it where I could though.
rosstimothy
reviewed
Oct 30, 2024
Joerger
force-pushed
the
joerger/fix-sso-mfa-settings-marshalling
branch
from
2d272f0 to
fc9990f
Compare
Joerger
force-pushed
the
joerger/fix-sso-mfa-settings-marshalling
branch
from
fc9990f to
e3b49d2
Compare
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.
Follow up to #46703 to fix json/yaml marshalling to/from string/bool. This way, you can set it like: