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

Properly formatted bitbucketserver

Browse source
This commit is contained in:
Thomas Boerger 2016-07-26 15:12:22 +02:00 committed by Thomas Boerger
parent c91623c2e6
commit 606ca93881
No known key found for this signature in database
GPG key ID: 5A388F55283960B6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
remote/bitbucketserver/bitbucketserver.go
View file

@ -122,7 +122,7 @@ func (c *client) Login(res http.ResponseWriter, req *http.Request) (*model.User,
defer response1.Body.Close()
contents, err := ioutil.ReadAll(response1.Body)
if err !=nil {
if err != nil {
return nil, err
}
@ -152,7 +152,7 @@ func (*client) Teams(u *model.User) ([]*model.Team, error) {
func (c *client) Repo(u *model.User, owner, name string) (*model.Repo, error) {
client := NewClientWithToken(&c.Consumer, u.Token)
repo , err := c.FindRepo(client,owner,name)
repo, err := c.FindRepo(client, owner, name)
if err != nil {
return nil, err
}
@ -202,7 +202,7 @@ func (c *client) Perm(u *model.User, owner, repo string) (*model.Perm, error) {
}
// Must have admin to be able to list hooks. If have access the enable perms
_, err = client.Get(fmt.Sprintf("%s/rest/api/1.0/projects/%s/repos/%s/settings/hooks/%s", c.URL, owner, repo,"com.atlassian.stash.plugin.stash-web-post-receive-hooks-plugin:postReceiveHook"))
_, err = client.Get(fmt.Sprintf("%s/rest/api/1.0/projects/%s/repos/%s/settings/hooks/%s", c.URL, owner, repo, "com.atlassian.stash.plugin.stash-web-post-receive-hooks-plugin:postReceiveHook"))
if err == nil {
perms.Push = true
perms.Admin = true
@ -339,7 +339,7 @@ func (bs *client) DeleteHook(client *http.Client, project, slug, hook_key, link
return nil
}
func (c *client) FindRepo(client *http.Client, owner string, name string) (*model.Repo, error){
func (c *client) FindRepo(client *http.Client, owner string, name string) (*model.Repo, error) {
urlString := fmt.Sprintf("%s/rest/api/1.0/projects/%s/repos/%s", c.URL, owner, name)
@ -351,7 +351,7 @@ func (c *client) FindRepo(client *http.Client, owner string, name string) (*mode
contents, err := ioutil.ReadAll(response.Body)
bsRepo := BSRepo{}
err = json.Unmarshal(contents, &bsRepo)
if err !=nil {
if err != nil {
return nil, err
}
repo := &model.Repo{