github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-14 14:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling when activating a repository (#2965)

Browse Source 
Activate Repo:
- Don't drop errors and also always log them on the server.
- Show users only meaningful error messages.
This commit is contained in:
6543
2023-12-19 06:25:59 +01:00
committed by GitHub
parent 7d837e625e
commit 257a76c5ea
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/api/repo.go
View File

@@ -61,7 +61,9 @@ func PostRepo(c *gin.Context) {
c.String(http.StatusConflict, "Repository is already active.") c.String(http.StatusConflict, "Repository is already active.")
return return
} else if err != nil && !errors.Is(err, types.RecordNotExist) { } else if err != nil && !errors.Is(err, types.RecordNotExist) {
c.String(http.StatusInternalServerError, err.Error()) msg := "Could not get repo by remote id from store."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return return
} }
@@ -113,7 +115,9 @@ func PostRepo(c *gin.Context) {
t := token.New(token.HookToken, repo.FullName) t := token.New(token.HookToken, repo.FullName)
sig, err := t.Sign(repo.Hash) sig, err := t.Sign(repo.Hash)
if err != nil { if err != nil {
c.String(http.StatusInternalServerError, err.Error()) msg := "Could not generate new jwt token."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return return
} }
@@ -135,13 +139,17 @@ func PostRepo(c *gin.Context) {
if errors.Is(err, types.RecordNotExist) { if errors.Is(err, types.RecordNotExist) {
org, err = forge.Org(c, user, repo.Owner) org, err = forge.Org(c, user, repo.Owner)
if err != nil { if err != nil {
c.String(http.StatusInternalServerError, "Could not fetch organization from forge.") msg := "Could not fetch organization from forge."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return return
} }
err = _store.OrgCreate(org) err = _store.OrgCreate(org)
if err != nil { if err != nil {
c.String(http.StatusInternalServerError, err.Error()) msg := "Could not create organization in store."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return return
} }
} }
@@ -150,7 +158,9 @@ func PostRepo(c *gin.Context) {
err = forge.Activate(c, user, repo, hookURL) err = forge.Activate(c, user, repo, hookURL)
if err != nil { if err != nil {
c.String(http.StatusInternalServerError, err.Error()) msg := "Could not create webhook in forge."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return return
} }
@@ -160,7 +170,9 @@ func PostRepo(c *gin.Context) {
err = _store.CreateRepo(repo) err = _store.CreateRepo(repo)
} }
if err != nil { if err != nil {
c.String(http.StatusInternalServerError, err.Error()) msg := "Could not create/update repo in store."
log.Error().Err(err).Msg(msg)
c.String(http.StatusInternalServerError, msg)
return return
} }
repo.Perm = from.Perm repo.Perm = from.Perm