a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gitea: use GetRepoRefs instead of GetRepoRef 

Looks like GetRepoRef doesn't correcly handle gitea repo refs response expecting
a single entry. Instead, at least with latest gitea version, the response is
always an array of refs. So use GetRepoRefs.
This commit is contained in:
Simone Gotti 2019-10-22 10:15:20 +02:00
parent fc283e70d3
commit f0e4bbfeeb
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/gitsources/gitea/gitea.go
View File

@ -81,7 +81,7 @@ func fromCommitStatus(status gitsource.CommitStatus) gtypes.StatusState {
case gitsource.CommitStatusFailed: case gitsource.CommitStatusFailed:
return gtypes.StatusFailure return gtypes.StatusFailure
default: default:
panic(fmt.Errorf("unknown commit status %q", status)) panic(errors.Errorf("unknown commit status %q", status))
} }
} }
@ -410,12 +410,18 @@ func (c *Client) GetRef(repopath, ref string) (*gitsource.Ref, error) {
return nil, err return nil, err
} }
remoteRef, err := c.client.GetRepoRef(owner, reponame, ref) remoteRefs, err := c.client.GetRepoRefs(owner, reponame, ref)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(remoteRefs) == 0 {
return nil, errors.Errorf("no ref %q for repository %q", ref, repopath)
}
if len(remoteRefs) != 1 {
return nil, errors.Errorf("no exact match found for ref %q for repository %q", ref, repopath)
}
return fromGiteaRef(remoteRef) return fromGiteaRef(remoteRefs[0])
} }
func fromGiteaRef(remoteRef *gitea.Reference) (*gitsource.Ref, error) { func fromGiteaRef(remoteRef *gitea.Reference) (*gitsource.Ref, error) {
@ -423,7 +429,7 @@ func fromGiteaRef(remoteRef *gitea.Reference) (*gitsource.Ref, error) {
switch t { switch t {
case "commit": case "commit":
default: default:
return nil, fmt.Errorf("unsupported object type: %s", t) return nil, errors.Errorf("unsupported object type: %s", t)
} }
return &gitsource.Ref{ return &gitsource.Ref{
@ -445,7 +451,7 @@ func (c *Client) RefType(ref string) (gitsource.RefType, string, error) {
return gitsource.RefTypePullRequest, m[1], nil return gitsource.RefTypePullRequest, m[1], nil
default: default:
return -1, "", fmt.Errorf("unsupported ref: %s", ref) return -1, "", errors.Errorf("unsupported ref: %s", ref)
} }
} }