Drop db operations from hook commands (#1514)
* move all database operations from hook command to web command and instead of internal routes * bug fixed * adjust the import path sequences * remove unused return value on hookSetuptokarchuk/v1.17
Lunny Xiao
8 years ago
committed by
GitHub
parent
59f5bbab0d
commit
1773e88643
@ -0,0 +1,43 @@ |
||||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package private |
||||
|
||||
import ( |
||||
"crypto/tls" |
||||
"encoding/json" |
||||
"fmt" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
"code.gitea.io/gitea/modules/log" |
||||
"code.gitea.io/gitea/modules/setting" |
||||
) |
||||
|
||||
// GetProtectedBranchBy get protected branch information
|
||||
func GetProtectedBranchBy(repoID int64, branchName string) (*models.ProtectedBranch, error) { |
||||
// Ask for running deliver hook and test pull request tasks.
|
||||
reqURL := setting.LocalURL + fmt.Sprintf("api/internal/branch/%d/%s", repoID, branchName) |
||||
log.GitLogger.Trace("GetProtectedBranchBy: %s", reqURL) |
||||
|
||||
resp, err := newRequest(reqURL, "GET").SetTLSClientConfig(&tls.Config{ |
||||
InsecureSkipVerify: true, |
||||
}).Response() |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
var branch models.ProtectedBranch |
||||
if err := json.NewDecoder(resp.Body).Decode(&branch); err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
defer resp.Body.Close() |
||||
|
||||
// All 2XX status codes are accepted and others will return an error
|
||||
if resp.StatusCode/100 != 2 { |
||||
return nil, fmt.Errorf("Failed to update public key: %s", decodeJSONError(resp).Err) |
||||
} |
||||
|
||||
return &branch, nil |
||||
} |
||||
@ -0,0 +1,43 @@ |
||||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package private |
||||
|
||||
import ( |
||||
"crypto/tls" |
||||
"encoding/json" |
||||
"fmt" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
"code.gitea.io/gitea/modules/log" |
||||
"code.gitea.io/gitea/modules/setting" |
||||
) |
||||
|
||||
// PushUpdate update publick key updates
|
||||
func PushUpdate(opt models.PushUpdateOptions) error { |
||||
// Ask for running deliver hook and test pull request tasks.
|
||||
reqURL := setting.LocalURL + "api/internal/push/update" |
||||
log.GitLogger.Trace("PushUpdate: %s", reqURL) |
||||
|
||||
body, err := json.Marshal(&opt) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
|
||||
resp, err := newRequest(reqURL, "POST").Body(body).SetTLSClientConfig(&tls.Config{ |
||||
InsecureSkipVerify: true, |
||||
}).Response() |
||||
if err != nil { |
||||
return err |
||||
} |
||||
|
||||
defer resp.Body.Close() |
||||
|
||||
// All 2XX status codes are accepted and others will return an error
|
||||
if resp.StatusCode/100 != 2 { |
||||
return fmt.Errorf("Failed to update public key: %s", decodeJSONError(resp).Err) |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
@ -0,0 +1,30 @@ |
||||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package private |
||||
|
||||
import ( |
||||
"code.gitea.io/gitea/models" |
||||
|
||||
macaron "gopkg.in/macaron.v1" |
||||
) |
||||
|
||||
// GetProtectedBranchBy get protected branch information
|
||||
func GetProtectedBranchBy(ctx *macaron.Context) { |
||||
repoID := ctx.ParamsInt64(":id") |
||||
branchName := ctx.Params(":branch") |
||||
protectBranch, err := models.GetProtectedBranchBy(repoID, branchName) |
||||
if err != nil { |
||||
ctx.JSON(500, map[string]interface{}{ |
||||
"err": err.Error(), |
||||
}) |
||||
return |
||||
} else if protectBranch != nil { |
||||
ctx.JSON(200, protectBranch) |
||||
} else { |
||||
ctx.JSON(200, &models.ProtectedBranch{ |
||||
CanPush: true, |
||||
}) |
||||
} |
||||
} |
||||
@ -0,0 +1,60 @@ |
||||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package private |
||||
|
||||
import ( |
||||
"encoding/json" |
||||
"strings" |
||||
|
||||
"code.gitea.io/git" |
||||
"code.gitea.io/gitea/models" |
||||
"code.gitea.io/gitea/modules/log" |
||||
|
||||
macaron "gopkg.in/macaron.v1" |
||||
) |
||||
|
||||
// PushUpdate update public key updates
|
||||
func PushUpdate(ctx *macaron.Context) { |
||||
var opt models.PushUpdateOptions |
||||
if err := json.NewDecoder(ctx.Req.Request.Body).Decode(&opt); err != nil { |
||||
ctx.JSON(500, map[string]interface{}{ |
||||
"err": err.Error(), |
||||
}) |
||||
return |
||||
} |
||||
|
||||
branch := strings.TrimPrefix(opt.RefFullName, git.BranchPrefix) |
||||
if len(branch) == 0 || opt.PusherID <= 0 { |
||||
ctx.Error(404) |
||||
log.Trace("PushUpdate: branch or secret is empty, or pusher ID is not valid") |
||||
return |
||||
} |
||||
|
||||
repo, err := models.PushUpdate(opt) |
||||
if err != nil { |
||||
ctx.JSON(500, map[string]interface{}{ |
||||
"err": err.Error(), |
||||
}) |
||||
return |
||||
} |
||||
|
||||
pusher, err := models.GetUserByID(opt.PusherID) |
||||
if err != nil { |
||||
if models.IsErrUserNotExist(err) { |
||||
ctx.Error(404) |
||||
} else { |
||||
ctx.JSON(500, map[string]interface{}{ |
||||
"err": err.Error(), |
||||
}) |
||||
} |
||||
return |
||||
} |
||||
|
||||
log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name) |
||||
|
||||
go models.HookQueue.Add(repo.ID) |
||||
go models.AddTestPullRequestTask(pusher, repo.ID, branch, true) |
||||
ctx.Status(202) |
||||
} |
||||
Loading…
Reference in new issue