Skip to content

avoid quoted string at fnresult Field unmarshal #4549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tgzsolt wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −14
Open

avoid quoted string at fnresult Field unmarshal #4549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions pkg/api/fnresult/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,38 +164,50 @@ var _ json.Unmarshaler = &Field{}
var _ yaml.Unmarshaler = &Field{}

func (in *Field) UnmarshalJSON(data []byte) error {
rnode, err := yaml.Parse(string(data))
rNode, err := yaml.Parse(string(data))
if err != nil {
return fmt.Errorf("error parsing `field`: %v", err)
}

return in.unmarshalRNode(rnode)
return in.unmarshalRNode(rNode)
}

func (in *Field) UnmarshalYAML(value *yaml.Node) error {
rnode := yaml.NewRNode(value)
rNode := yaml.NewRNode(value)

return in.unmarshalRNode(rnode)
return in.unmarshalRNode(rNode)
}

func (in *Field) unmarshalRNode(rnode *yaml.RNode) error {
if path, err := rnode.GetString("path"); err == nil {
func (in *Field) unmarshalRNode(rNode *yaml.RNode) error {
if path, err := rNode.GetString("path"); err == nil {
in.Path = strings.TrimSpace(path)
}

if currentValue, err := rnode.Pipe(yaml.Lookup("currentValue")); err == nil {
in.CurrentValue, err = currentValue.String()
if err != nil {
return fmt.Errorf("error parsing `field.currentValue`: %v", err)
if currentValue, err := rNode.Pipe(yaml.Lookup("currentValue")); err == nil && currentValue.YNode() != nil {
switch currentValue.YNode().Kind {
case yaml.ScalarNode:
in.CurrentValue = currentValue.YNode().Value
default:
in.CurrentValue, err = currentValue.String()
if err != nil {
return fmt.Errorf("error parsing `field.currentValue`: %v", err)
}
}
Comment on lines +186 to 195

in.CurrentValue = strings.TrimSpace(in.CurrentValue)
}

if proposedValue, err := rnode.Pipe(yaml.Lookup("proposedValue")); err == nil {
in.ProposedValue, err = proposedValue.String()
if err != nil {
return fmt.Errorf("error parsing `field.proposedValue`: %v", err)
if proposedValue, err := rNode.Pipe(yaml.Lookup("proposedValue")); err == nil && proposedValue.YNode() != nil {
switch proposedValue.YNode().Kind {
case yaml.ScalarNode:
in.ProposedValue = proposedValue.YNode().Value
default:
in.ProposedValue, err = proposedValue.String()
if err != nil {
return fmt.Errorf("error parsing `field.proposedValue`: %v", err)
}
}
Comment on lines +200 to 209

in.ProposedValue = strings.TrimSpace(in.ProposedValue)
}

Expand Down
Loading