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

🐛 Retrieve branch on release triggers #89

Merged
merged 6 commits into from
Jun 9, 2022
Merged

🐛 Retrieve branch on release triggers #89

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a2ada7
updates
laurentsimon Jun 9, 2022
44ba6cb
unit test
laurentsimon Jun 9, 2022
2aeddba
fixes
laurentsimon Jun 9, 2022
9ff5037
updates
laurentsimon Jun 9, 2022
bf63a2b
typo
laurentsimon Jun 9, 2022
ef8de04
unit test
laurentsimon Jun 9, 2022
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
Prev Previous commit
Next Next commit
updates
  • Loading branch information
@laurentsimon
laurentsimon committed Jun 9, 2022
commit 9ff5037b4ec5697f6f564ed27d764117900c246f
36 changes: 20 additions & 16 deletions pkg/provenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,20 @@ func getAsString(environment map[string]interface{}, field string) (string, erro
return i, nil
}

func getEventPayload(environment map[string]interface{}) (map[string]interface{}, error) {
eventPayload, ok := environment["github_event_payload"]
if !ok {
return nil, fmt.Errorf("%w: %s", ErrorInvalidDssePayload, "parameters type event payload")
}

payload, ok := eventPayload.(map[string]interface{})
if !ok {
return nil, fmt.Errorf("%w: %s", ErrorInvalidDssePayload, "parameters type payload")
}

return payload, nil
}

func getBaseRef(environment map[string]interface{}) (string, error) {
baseRef, err := getAsString(environment, "github_base_ref")
if err != nil {
Expand All @@ -642,14 +656,9 @@ func getBaseRef(environment map[string]interface{}) (string, error) {
return "", nil
}

eventPayload, ok := environment["github_event_payload"]
if !ok {
return "", fmt.Errorf("%w: %s", ErrorInvalidDssePayload, "parameters type event payload")
}

payload, ok := eventPayload.(map[string]interface{})
if !ok {
return "", fmt.Errorf("%w: %s", ErrorInvalidDssePayload, "parameters type payload")
payload, err := getEventPayload(environment)
if err != nil {
return "", err
}

return getAsString(payload, "base_ref")
Expand All @@ -665,14 +674,9 @@ func getTargetCommittish(environment map[string]interface{}) (string, error) {
return "", nil
}

eventPayload, ok := environment["github_event_payload"]
if !ok {
return "", fmt.Errorf("%w: %s", ErrorInvalidDssePayload, "parameters type event payload")
}

payload, ok := eventPayload.(map[string]interface{})
if !ok {
return "", fmt.Errorf("%w: %s", ErrorInvalidDssePayload, "parameters type payload")
payload, err := getEventPayload(environment)
if err != nil {
return "", err
}

// For a release event, we look for release.target_commitish.
Expand Down