Skip to content
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

Jump to bottom

updated unmarshaling logic #244

Merged
merged 2 commits into from
Aug 29, 2024
Merged

updated unmarshaling logic #244

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bceca4
updated unmarshaling logic
maurafortino Aug 23, 2024
80187b0
formatting fix
maurafortino Aug 29, 2024
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
14 changes: 7 additions & 7 deletions internalWebhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@ func ItemToInternalWebhook(i model.Item) (Register, error) {
return nil, err
}

err = json.Unmarshal(encodedWebhook, &v2)
if err == nil && v2.Registration.CanonicalName != "" {
return v2, nil
} else if err != nil {
errs = errors.Join(errs, fmt.Errorf("RegistryV2 unmarshal error: %s", err))
}

err = json.Unmarshal(encodedWebhook, &v1)
if err == nil {
return v1, nil
}

errs = errors.Join(errs, fmt.Errorf("RegistryV1 unmarshal error: %s", err))
err = json.Unmarshal(encodedWebhook, &v2)
if err == nil {
return v2, nil
}

errs = errors.Join(errs, fmt.Errorf("RegistryV2 unmarshal error: %s", err))

return nil, fmt.Errorf("could not unmarshal data into either RegistryV1 or RegistryV2: %s", errs)
}
Expand Down
Loading