darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix PR comments

Browse source 
full_name   -> fullName
"%s"        -> %q
errors.New  -> fmt.Errorf
This commit is contained in:
folex 2018-04-28 10:25:30 +03:00
parent 0b73e5489b
commit b1dfa4a5a9
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
remote/bitbucket/internal/client.go
View file

@ -22,7 +22,6 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"github.com/pkg/errors"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/bitbucket" "golang.org/x/oauth2/bitbucket"
) )
@ -37,7 +36,7 @@ const (
const ( const (
pathUser = "%s/2.0/user/" pathUser = "%s/2.0/user/"
pathEmails = "%s/2.0/user/emails" pathEmails = "%s/2.0/user/emails"
pathPermissions = "%s/2.0/user/permissions/repositories?q=repository.full_name=\"%s\"" pathPermissions = "%s/2.0/user/permissions/repositories?q=repository.full_name=%q"
pathTeams = "%s/2.0/teams/?%s" pathTeams = "%s/2.0/teams/?%s"
pathRepo = "%s/2.0/repositories/%s/%s" pathRepo = "%s/2.0/repositories/%s/%s"
pathRepos = "%s/2.0/repositories/%s?%s" pathRepos = "%s/2.0/repositories/%s?%s"
@ -154,9 +153,9 @@ func (c *Client) CreateStatus(owner, name, revision string, status *BuildStatus)
return c.do(uri, post, status, nil) return c.do(uri, post, status, nil)
} }
func (c *Client) GetPermission(full_name string) (*RepoPerm, error) { func (c *Client) GetPermission(fullName string) (*RepoPerm, error) {
out := new(RepoPermResp) out := new(RepoPermResp)
uri := fmt.Sprintf(pathPermissions, c.base, full_name) uri := fmt.Sprintf(pathPermissions, c.base, fullName)
err := c.do(uri, get, nil, out) err := c.do(uri, get, nil, out)
if err != nil { if err != nil {
@ -164,8 +163,7 @@ func (c *Client) GetPermission(full_name string) (*RepoPerm, error) {
} }
if len(out.Values) == 0 { if len(out.Values) == 0 {
err = errors.New(fmt.Sprint("no permissions in repository ", full_name)) return nil, fmt.Errorf("no permissions in repository ", fullName)
return nil, err
} else { } else {
return out.Values[0], nil return out.Values[0], nil
} }