self-hosted/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-30 23:27:39 +02:00
Code Issues Releases Activity

Add linter revive (#554)

Browse Source 
* Add linter revive

* Add underscore to variable name to prevent shadowing

* Remove unnecessary leading underscore

* Revert changes to vendor file

* export ConfigFetcher as interface

* no 'yoda conditions'

* rename envsubst

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
Lukas
2021-12-01 14:22:06 +01:00
committed by GitHub
parent 494c211910
commit 680d003a29
53 changed files with 340 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@@ -22,6 +22,7 @@ linters:
- varcheck
- ineffassign
- unused
- revive
run:
timeout: 5m

6
cli/internal/util.go
View File

@@ -29,10 +29,10 @@ func NewClient(c *cli.Context) (woodpecker.Client, error) {
// if no server url is provided we can default
// to the hosted Woodpecker service.
if len(server) == 0 {
return nil, fmt.Errorf("Error: you must provide the Woodpecker server address.")
return nil, fmt.Errorf("Error: you must provide the Woodpecker server address")
}
if len(token) == 0 {
return nil, fmt.Errorf("Error: you must provide your Woodpecker access token.")
return nil, fmt.Errorf("Error: you must provide your Woodpecker access token")
}
// attempt to find system CA certs
@@ -77,7 +77,7 @@ func NewClient(c *cli.Context) (woodpecker.Client, error) {
func ParseRepo(str string) (user, repo string, err error) {
var parts = strings.Split(str, "/")
if len(parts) != 2 {
err = fmt.Errorf("Error: Invalid or missing repository. eg octocat/hello-world.")
err = fmt.Errorf("Error: Invalid or missing repository. eg octocat/hello-world")
return
}
user = parts[0]

2
cli/lint/lint.go
View File

@@ -53,7 +53,7 @@ func lint(c *cli.Context) error {
}
func lintFile(file string) error {
err, configErrors := schema.Lint(file)
configErrors, err := schema.Lint(file)
if err != nil {
fmt.Println("❌ Config is invalid")
for _, configError := range configErrors {

16
cmd/server/server.go
View File

@@ -98,22 +98,22 @@ func run(c *cli.Context) error {
)
}
remote_, err := setupRemote(c)
_remote, err := setupRemote(c)
if err != nil {
log.Fatal().Err(err).Msg("")
}
store_, err := setupStore(c)
_store, err := setupStore(c)
if err != nil {
log.Fatal().Err(err).Msg("")
}
defer func() {
if err := store_.Close(); err != nil {
if err := _store.Close(); err != nil {
log.Error().Err(err).Msg("could not close store")
}
}()
setupEvilGlobals(c, store_, remote_)
setupEvilGlobals(c, _store, _remote)
proxyWebUI := c.String("www-proxy")
@@ -141,7 +141,7 @@ func run(c *cli.Context) error {
middleware.Logger(time.RFC3339, true),
middleware.Version,
middleware.Config(c),
middleware.Store(c, store_),
middleware.Store(c, _store),
)
var g errgroup.Group
@@ -164,11 +164,11 @@ func run(c *cli.Context) error {
}),
)
woodpeckerServer := woodpeckerGrpcServer.NewWoodpeckerServer(
remote_,
_remote,
server.Config.Services.Queue,
server.Config.Services.Logs,
server.Config.Services.Pubsub,
store_,
_store,
server.Config.Server.Host,
)
proto.RegisterWoodpeckerServer(grpcServer, woodpeckerServer)
@@ -181,7 +181,7 @@ func run(c *cli.Context) error {
return nil
})
setupMetrics(&g, store_)
setupMetrics(&g, _store)
// start the server with tls enabled
if c.String("server-cert") != "" {

11
cmd/server/setup.go
View File

@@ -166,9 +166,8 @@ func setupRegistryService(c *cli.Context, s store.Store) model.RegistryService {
registry.New(s),
registry.Filesystem(c.String("docker-config")),
)
} else {
return registry.New(s)
}
return registry.New(s)
}
func setupEnvironService(c *cli.Context, s store.Store) model.EnvironService {
@@ -301,7 +300,7 @@ func setupCoding(c *cli.Context) (remote.Remote, error) {
return coding.New(opts)
}
func setupMetrics(g *errgroup.Group, store_ store.Store) {
func setupMetrics(g *errgroup.Group, _store store.Store) {
pendingJobs := promauto.NewGauge(prometheus.GaugeOpts{
Namespace: "woodpecker",
Name: "pending_jobs",
@@ -350,9 +349,9 @@ func setupMetrics(g *errgroup.Group, store_ store.Store) {
})
g.Go(func() error {
for {
repoCount, _ := store_.GetRepoCount()
userCount, _ := store_.GetUserCount()
buildCount, _ := store_.GetBuildCount()
repoCount, _ := _store.GetRepoCount()
userCount, _ := _store.GetUserCount()
buildCount, _ := _store.GetBuildCount()
builds.Set(float64(buildCount))
users.Set(float64(userCount))
repos.Set(float64(repoCount))

3
pipeline/backend/docker/convert.go
View File

@@ -170,7 +170,6 @@ func splitVolumeParts(volumeParts string) ([]string, error) {
}
}
return cleanResults, nil
} else {
return strings.Split(volumeParts, ":"), nil
}
return strings.Split(volumeParts, ":"), nil
}

18
pipeline/frontend/yaml/compiler/convert.go
View File

@@ -16,13 +16,13 @@ func (c *Compiler) createProcess(name string, container *yaml.Container, section
detached bool
workingdir string
workspace = fmt.Sprintf("%s_default:%s", c.prefix, c.base)
privileged = container.Privileged
entrypoint = container.Entrypoint
command = container.Command
image = expandImage(container.Image)
network_mode = container.NetworkMode
ipc_mode = container.IpcMode
workspace = fmt.Sprintf("%s_default:%s", c.prefix, c.base)
privileged = container.Privileged
entrypoint = container.Entrypoint
command = container.Command
image = expandImage(container.Image)
networkMode = container.NetworkMode
ipcMode = container.IpcMode
// network = container.Network
)
@@ -176,7 +176,7 @@ func (c *Compiler) createProcess(name string, container *yaml.Container, section
OnFailure: (len(container.Constraints.Status.Include)+
len(container.Constraints.Status.Exclude) != 0) &&
container.Constraints.Status.Match("failure"),
NetworkMode: network_mode,
IpcMode: ipc_mode,
NetworkMode: networkMode,
IpcMode: ipcMode,
}
}

10
pipeline/schema/schema.go
View File

@@ -12,21 +12,21 @@ import (
//go:embed schema.json
var schemaDefinition []byte
func Lint(file string) (error, []gojsonschema.ResultError) {
func Lint(file string) ([]gojsonschema.ResultError, error) {
schemaLoader := gojsonschema.NewBytesLoader(schemaDefinition)
j, err := yml.LoadYmlFileAsJson(file)
j, err := yml.LoadYmlFileAsJSON(file)
if err != nil {
return fmt.Errorf("Failed to load yml file %w", err), nil
return nil, fmt.Errorf("Failed to load yml file %w", err)
}
documentLoader := gojsonschema.NewBytesLoader(j)
result, err := gojsonschema.Validate(schemaLoader, documentLoader)
if err != nil {
return fmt.Errorf("Validation failed %w", err), nil
return nil, fmt.Errorf("Validation failed %w", err)
}
if !result.Valid() {
return fmt.Errorf("Config not valid"), result.Errors()
return result.Errors(), fmt.Errorf("Config not valid")
}
return nil, nil

2
pipeline/schema/schema_test.go
View File

@@ -78,7 +78,7 @@ func TestSchema(t *testing.T) {
for _, tt := range testTable {
t.Run(tt.name, func(t *testing.T) {
err, configErrors := schema.Lint(tt.testFile)
configErrors, err := schema.Lint(tt.testFile)
if tt.fail {
if len(configErrors) == 0 {
assert.Error(t, err, "Expected config errors but got none")

12
server/api/badge.go
View File

@@ -38,8 +38,8 @@ var (
)
func GetBadge(c *gin.Context) {
store_ := store.FromContext(c)
repo, err := store_.GetRepoName(c.Param("owner") + "/" + c.Param("name"))
_store := store.FromContext(c)
repo, err := _store.GetRepoName(c.Param("owner") + "/" + c.Param("name"))
if err != nil {
c.AbortWithStatus(404)
return
@@ -57,7 +57,7 @@ func GetBadge(c *gin.Context) {
branch = repo.Branch
}
build, err := store_.GetBuildLast(repo, branch)
build, err := _store.GetBuildLast(repo, branch)
if err != nil {
log.Warn().Err(err).Msg("")
c.String(200, badgeNone)
@@ -79,14 +79,14 @@ func GetBadge(c *gin.Context) {
}
func GetCC(c *gin.Context) {
store_ := store.FromContext(c)
repo, err := store_.GetRepoName(c.Param("owner") + "/" + c.Param("name"))
_store := store.FromContext(c)
repo, err := _store.GetRepoName(c.Param("owner") + "/" + c.Param("name"))
if err != nil {
c.AbortWithStatus(404)
return
}
builds, err := store_.GetBuildList(repo, 1)
builds, err := _store.GetBuildList(repo, 1)
if err != nil || len(builds) == 0 {
c.AbortWithStatus(404)
return

102
server/api/build.go
View File

@@ -54,7 +54,7 @@ func GetBuilds(c *gin.Context) {
}
func GetBuild(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
if c.Param("number") == "latest" {
GetBuildLast(c)
return
@@ -67,13 +67,13 @@ func GetBuild(c *gin.Context) {
return
}
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
files, _ := store_.FileList(build)
procs, _ := store_.ProcList(build)
files, _ := _store.FileList(build)
procs, _ := _store.ProcList(build)
build.Procs = model.Tree(procs)
build.Files = files
@@ -81,23 +81,23 @@ func GetBuild(c *gin.Context) {
}
func GetBuildLast(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
branch := c.DefaultQuery("branch", repo.Branch)
build, err := store_.GetBuildLast(repo, branch)
build, err := _store.GetBuildLast(repo, branch)
if err != nil {
c.String(http.StatusInternalServerError, err.Error())
return
}
procs, _ := store_.ProcList(build)
procs, _ := _store.ProcList(build)
build.Procs = model.Tree(procs)
c.JSON(http.StatusOK, build)
}
func GetBuildLogs(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
// parse the build number and job sequence number from
@@ -106,19 +106,19 @@ func GetBuildLogs(c *gin.Context) {
ppid, _ := strconv.Atoi(c.Params.ByName("pid"))
name := c.Params.ByName("proc")
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(404, err)
return
}
proc, err := store_.ProcChild(build, ppid, name)
proc, err := _store.ProcChild(build, ppid, name)
if err != nil {
_ = c.AbortWithError(404, err)
return
}
rc, err := store_.LogFind(proc)
rc, err := _store.LogFind(proc)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -133,7 +133,7 @@ func GetBuildLogs(c *gin.Context) {
}
func GetProcLogs(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
// parse the build number and job sequence number from
@@ -141,19 +141,19 @@ func GetProcLogs(c *gin.Context) {
num, _ := strconv.ParseInt(c.Params.ByName("number"), 10, 64)
pid, _ := strconv.Atoi(c.Params.ByName("pid"))
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(404, err)
return
}
proc, err := store_.ProcFind(build, pid)
proc, err := _store.ProcFind(build, pid)
if err != nil {
_ = c.AbortWithError(404, err)
return
}
rc, err := store_.LogFind(proc)
rc, err := _store.LogFind(proc)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -169,17 +169,17 @@ func GetProcLogs(c *gin.Context) {
// DeleteBuild cancels a build
func DeleteBuild(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
num, _ := strconv.ParseInt(c.Params.ByName("number"), 10, 64)
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(404, err)
return
}
procs, err := store_.ProcList(build)
procs, err := _store.ProcList(build)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -225,18 +225,18 @@ func DeleteBuild(c *gin.Context) {
for _, proc := range procs {
if proc.State == model.StatusPending {
if proc.PPID != 0 {
if _, err = shared.UpdateProcToStatusSkipped(store_, *proc, 0); err != nil {
if _, err = shared.UpdateProcToStatusSkipped(_store, *proc, 0); err != nil {
log.Error().Msgf("error: done: cannot update proc_id %d state: %s", proc.ID, err)
}
} else {
if _, err = shared.UpdateProcToStatusKilled(store_, *proc); err != nil {
if _, err = shared.UpdateProcToStatusKilled(_store, *proc); err != nil {
log.Error().Msgf("error: done: cannot update proc_id %d state: %s", proc.ID, err)
}
}
}
}
killedBuild, err := shared.UpdateToStatusKilled(store_, *build)
killedBuild, err := shared.UpdateToStatusKilled(_store, *build)
if err != nil {
_ = c.AbortWithError(500, err)
return
@@ -245,7 +245,7 @@ func DeleteBuild(c *gin.Context) {
// For pending builds, we stream the UI the latest state.
// For running builds, the UI will be updated when the agents acknowledge the cancel
if build.Status == model.StatusPending {
procs, err = store_.ProcList(killedBuild)
procs, err = _store.ProcList(killedBuild)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -261,14 +261,14 @@ func DeleteBuild(c *gin.Context) {
func PostApproval(c *gin.Context) {
var (
remote_ = server.Config.Services.Remote
store_ = store.FromContext(c)
_remote = server.Config.Services.Remote
_store = store.FromContext(c)
repo = session.Repo(c)
user = session.User(c)
num, _ = strconv.ParseInt(c.Params.ByName("number"), 10, 64)
)
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -286,13 +286,13 @@ func PostApproval(c *gin.Context) {
return
}
netrc, err := remote_.Netrc(user, repo)
netrc, err := _remote.Netrc(user, repo)
if err != nil {
c.String(500, "failed to generate netrc file. %s", err)
return
}
if build, err = shared.UpdateToStatusPending(store_, *build, user.Login); err != nil {
if build, err = shared.UpdateToStatusPending(_store, *build, user.Login); err != nil {
c.String(500, "error updating build. %s", err)
return
}
@@ -301,7 +301,7 @@ func PostApproval(c *gin.Context) {
// get the previous build so that we can send
// on status change notifications
last, _ := store_.GetBuildLastBefore(repo, build.Branch, build.ID)
last, _ := _store.GetBuildLastBefore(repo, build.Branch, build.ID)
secs, err := server.Config.Services.Secrets.SecretListBuild(repo, build)
if err != nil {
log.Debug().Msgf("Error getting secrets for %s#%d. %s", repo.FullName, build.Number, err)
@@ -336,14 +336,14 @@ func PostApproval(c *gin.Context) {
}
buildItems, err := b.Build()
if err != nil {
if _, err = shared.UpdateToStatusError(store_, *build, err); err != nil {
if _, err = shared.UpdateToStatusError(_store, *build, err); err != nil {
log.Error().Msgf("Error setting error status of build for %s#%d. %s", repo.FullName, build.Number, err)
}
return
}
build = shared.SetBuildStepsOnBuild(b.Curr, buildItems)
err = store_.ProcCreate(build.Procs)
err = _store.ProcCreate(build.Procs)
if err != nil {
log.Error().Msgf("error persisting procs %s/%d: %s", repo.FullName, build.Number, err)
}
@@ -352,9 +352,9 @@ func PostApproval(c *gin.Context) {
for _, item := range buildItems {
uri := fmt.Sprintf("%s/%s/%d", server.Config.Server.Host, repo.FullName, build.Number)
if len(buildItems) > 1 {
err = remote_.Status(c, user, repo, build, uri, item.Proc)
err = _remote.Status(c, user, repo, build, uri, item.Proc)
} else {
err = remote_.Status(c, user, repo, build, uri, nil)
err = _remote.Status(c, user, repo, build, uri, nil)
}
if err != nil {
log.Error().Msgf("error setting commit status for %s/%d: %v", repo.FullName, build.Number, err)
@@ -372,15 +372,15 @@ func PostApproval(c *gin.Context) {
func PostDecline(c *gin.Context) {
var (
remote_ = server.Config.Services.Remote
store_ = store.FromContext(c)
_remote = server.Config.Services.Remote
_store = store.FromContext(c)
repo = session.Repo(c)
user = session.User(c)
num, _ = strconv.ParseInt(c.Params.ByName("number"), 10, 64)
)
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -390,13 +390,13 @@ func PostDecline(c *gin.Context) {
return
}
if _, err = shared.UpdateToStatusDeclined(store_, *build, user.Login); err != nil {
if _, err = shared.UpdateToStatusDeclined(_store, *build, user.Login); err != nil {
c.String(500, "error updating build. %s", err)
return
}
uri := fmt.Sprintf("%s/%s/%d", server.Config.Server.Host, repo.FullName, build.Number)
err = remote_.Status(c, user, repo, build, uri, nil)
err = _remote.Status(c, user, repo, build, uri, nil)
if err != nil {
log.Error().Msgf("error setting commit status for %s/%d: %v", repo.FullName, build.Number, err)
}
@@ -415,8 +415,8 @@ func GetBuildQueue(c *gin.Context) {
// PostBuild restarts a build
func PostBuild(c *gin.Context) {
remote_ := server.Config.Services.Remote
store_ := store.FromContext(c)
_remote := server.Config.Services.Remote
_store := store.FromContext(c)
repo := session.Repo(c)
num, err := strconv.ParseInt(c.Param("number"), 10, 64)
@@ -425,14 +425,14 @@ func PostBuild(c *gin.Context) {
return
}
user, err := store_.GetUser(repo.UserID)
user, err := _store.GetUser(repo.UserID)
if err != nil {
log.Error().Msgf("failure to find repo owner %s. %s", repo.FullName, err)
_ = c.AbortWithError(500, err)
return
}
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
log.Error().Msgf("failure to get build %d. %s", num, err)
_ = c.AbortWithError(404, err)
@@ -449,12 +449,12 @@ func PostBuild(c *gin.Context) {
// if the remote has a refresh token, the current access token
// may be stale. Therefore, we should refresh prior to dispatching
// the job.
if refresher, ok := remote_.(remote.Refresher); ok {
if refresher, ok := _remote.(remote.Refresher); ok {
ok, err := refresher.Refresh(c, user)
if err != nil {
log.Error().Err(err).Msgf("refresh oauth token of user '%s' failed", user.Login)
} else if ok {
if err := store_.UpdateUser(user); err != nil {
if err := _store.UpdateUser(user); err != nil {
log.Error().Err(err).Msg("fail to save user to store after refresh oauth token")
}
}
@@ -468,7 +468,7 @@ func PostBuild(c *gin.Context) {
return
}
netrc, err := remote_.Netrc(user, repo)
netrc, err := _remote.Netrc(user, repo)
if err != nil {
log.Error().Msgf("failure to generate netrc for %s. %s", repo.FullName, err)
_ = c.AbortWithError(500, err)
@@ -493,7 +493,7 @@ func PostBuild(c *gin.Context) {
build.Event = event
}
err = store_.CreateBuild(build)
err = _store.CreateBuild(build)
if err != nil {
c.String(500, err.Error())
return
@@ -520,7 +520,7 @@ func PostBuild(c *gin.Context) {
// get the previous build so that we can send
// on status change notifications
last, _ := store_.GetBuildLastBefore(repo, build.Branch, build.ID)
last, _ := _store.GetBuildLastBefore(repo, build.Branch, build.ID)
secs, err := server.Config.Services.Secrets.SecretListBuild(repo, build)
if err != nil {
log.Debug().Msgf("Error getting secrets for %s#%d. %s", repo.FullName, build.Number, err)
@@ -563,7 +563,7 @@ func PostBuild(c *gin.Context) {
}
build = shared.SetBuildStepsOnBuild(b.Curr, buildItems)
err = store_.ProcCreate(build.Procs)
err = _store.ProcCreate(build.Procs)
if err != nil {
log.Error().Msgf("cannot restart %s#%d: %s", repo.FullName, build.Number, err)
build.Status = model.StatusError
@@ -584,19 +584,19 @@ func PostBuild(c *gin.Context) {
}
func DeleteBuildLogs(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
user := session.User(c)
num, _ := strconv.ParseInt(c.Params.ByName("number"), 10, 64)
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(404, err)
return
}
procs, err := store_.ProcList(build)
procs, err := _store.ProcList(build)
if err != nil {
_ = c.AbortWithError(404, err)
return
@@ -611,7 +611,7 @@ func DeleteBuildLogs(c *gin.Context) {
for _, proc := range procs {
t := time.Now().UTC()
buf := bytes.NewBufferString(fmt.Sprintf(deleteStr, proc.Name, user.Login, t.Format(time.UnixDate)))
lerr := store_.LogSave(proc, buf)
lerr := _store.LogSave(proc, buf)
if lerr != nil {
err = lerr
}

16
server/api/file.go
View File

@@ -29,7 +29,7 @@ import (
// FileList gets a list file by build.
func FileList(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
num, err := strconv.ParseInt(c.Param("number"), 10, 64)
if err != nil {
_ = c.AbortWithError(http.StatusBadRequest, err)
@@ -37,13 +37,13 @@ func FileList(c *gin.Context) {
}
repo := session.Repo(c)
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
files, err := store_.FileList(build)
files, err := _store.FileList(build)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -55,7 +55,7 @@ func FileList(c *gin.Context) {
// FileGet gets a file by process and name
func FileGet(c *gin.Context) {
var (
store_ = store.FromContext(c)
_store = store.FromContext(c)
repo = session.Repo(c)
name = strings.TrimPrefix(c.Param("file"), "/")
@@ -76,19 +76,19 @@ func FileGet(c *gin.Context) {
return
}
build, err := store_.GetBuildNumber(repo, num)
build, err := _store.GetBuildNumber(repo, num)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
proc, err := store_.ProcFind(build, pid)
proc, err := _store.ProcFind(build, pid)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
file, err := store_.FileFind(proc, name)
file, err := _store.FileFind(proc, name)
if err != nil {
c.String(404, "Error getting file %q. %s", name, err)
return
@@ -99,7 +99,7 @@ func FileGet(c *gin.Context) {
return
}
rc, err := store_.FileRead(proc, file.Name)
rc, err := _store.FileRead(proc, file.Name)
if err != nil {
c.String(404, "Error getting file stream %q. %s", name, err)
return

30
server/api/hook.go
View File

@@ -76,10 +76,10 @@ func BlockTilQueueHasRunningItem(c *gin.Context) {
}
func PostHook(c *gin.Context) {
remote_ := server.Config.Services.Remote
store_ := store.FromContext(c)
_remote := server.Config.Services.Remote
_store := store.FromContext(c)
tmpRepo, build, err := remote_.Hook(c.Request)
tmpRepo, build, err := _remote.Hook(c.Request)
if err != nil {
log.Error().Msgf("failure to parse hook. %s", err)
_ = c.AbortWithError(400, err)
@@ -104,7 +104,7 @@ func PostHook(c *gin.Context) {
return
}
repo, err := store_.GetRepoName(tmpRepo.Owner + "/" + tmpRepo.Name)
repo, err := _store.GetRepoName(tmpRepo.Owner + "/" + tmpRepo.Name)
if err != nil {
log.Error().Msgf("failure to find repo %s/%s from hook. %s", tmpRepo.Owner, tmpRepo.Name, err)
_ = c.AbortWithError(404, err)
@@ -144,7 +144,7 @@ func PostHook(c *gin.Context) {
return
}
user, err := store_.GetUser(repo.UserID)
user, err := _store.GetUser(repo.UserID)
if err != nil {
log.Error().Msgf("failure to find repo owner %s. %s", repo.FullName, err)
_ = c.AbortWithError(500, err)
@@ -154,12 +154,12 @@ func PostHook(c *gin.Context) {
// if the remote has a refresh token, the current access token
// may be stale. Therefore, we should refresh prior to dispatching
// the build.
if refresher, ok := remote_.(remote.Refresher); ok {
if refresher, ok := _remote.(remote.Refresher); ok {
ok, err := refresher.Refresh(c, user)
if err != nil {
log.Error().Msgf("failed to refresh oauth2 token: %s", err)
} else if ok {
if err := store_.UpdateUser(user); err != nil {
if err := _store.UpdateUser(user); err != nil {
log.Error().Msgf("error while updating user: %s", err)
// move forward
}
@@ -167,7 +167,7 @@ func PostHook(c *gin.Context) {
}
// fetch the build file from the remote
configFetcher := shared.NewConfigFetcher(remote_, user, repo, build)
configFetcher := shared.NewConfigFetcher(_remote, user, repo, build)
remoteYamlConfigs, err := configFetcher.Fetch(c)
if err != nil {
log.Error().Msgf("error: %s: cannot find %s in %s: %s", repo.FullName, repo.Config, build.Ref, err)
@@ -199,7 +199,7 @@ func PostHook(c *gin.Context) {
build.Status = model.StatusBlocked
}
err = store_.CreateBuild(build, build.Procs...)
err = _store.CreateBuild(build, build.Procs...)
if err != nil {
log.Error().Msgf("failure to save commit for %s. %s", repo.FullName, err)
_ = c.AbortWithError(500, err)
@@ -222,7 +222,7 @@ func PostHook(c *gin.Context) {
return
}
netrc, err := remote_.Netrc(user, repo)
netrc, err := _remote.Netrc(user, repo)
if err != nil {
c.String(500, "Failed to generate netrc file. %s", err)
return
@@ -247,7 +247,7 @@ func PostHook(c *gin.Context) {
}
// get the previous build so that we can send status change notifications
last, _ := store_.GetBuildLastBefore(repo, build.Branch, build.ID)
last, _ := _store.GetBuildLastBefore(repo, build.Branch, build.ID)
b := shared.ProcBuilder{
Repo: repo,
@@ -262,14 +262,14 @@ func PostHook(c *gin.Context) {
}
buildItems, err := b.Build()
if err != nil {
if _, err = shared.UpdateToStatusError(store_, *build, err); err != nil {
if _, err = shared.UpdateToStatusError(_store, *build, err); err != nil {
log.Error().Msgf("Error setting error status of build for %s#%d. %s", repo.FullName, build.Number, err)
}
return
}
build = shared.SetBuildStepsOnBuild(b.Curr, buildItems)
err = store_.ProcCreate(build.Procs)
err = _store.ProcCreate(build.Procs)
if err != nil {
log.Error().Msgf("error persisting procs %s/%d: %s", repo.FullName, build.Number, err)
}
@@ -278,9 +278,9 @@ func PostHook(c *gin.Context) {
for _, item := range buildItems {
uri := fmt.Sprintf("%s/%s/build/%d", server.Config.Server.Host, repo.FullName, build.Number)
if len(buildItems) > 1 {
err = remote_.Status(c, user, repo, build, uri, item.Proc)
err = _remote.Status(c, user, repo, build, uri, item.Proc)
} else {
err = remote_.Status(c, user, repo, build, uri, nil)
err = _remote.Status(c, user, repo, build, uri, nil)
}
if err != nil {
log.Error().Msgf("error setting commit status for %s/%d: %v", repo.FullName, build.Number, err)

12
server/api/login.go
View File

@@ -48,7 +48,7 @@ func HandleLogin(c *gin.Context) {
}
func HandleAuth(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
// when dealing with redirects we may need to adjust the content type. I
// cannot, however, remember why, so need to revisit this line.
@@ -68,7 +68,7 @@ func HandleAuth(c *gin.Context) {
config := ToConfig(c)
// get the user from the database
u, err := store_.GetUserLogin(tmpuser.Login)
u, err := _store.GetUserLogin(tmpuser.Login)
if err != nil {
// if self-registration is disabled we should return a not authorized error
if !config.Open && !config.IsAdmin(tmpuser) {
@@ -101,7 +101,7 @@ func HandleAuth(c *gin.Context) {
}
// insert the user into the database
if err := store_.CreateUser(u); err != nil {
if err := _store.CreateUser(u); err != nil {
log.Error().Msgf("cannot insert %s. %s", u.Login, err)
c.Redirect(303, "/login?error=internal_error")
return
@@ -125,7 +125,7 @@ func HandleAuth(c *gin.Context) {
}
}
if err := store_.UpdateUser(u); err != nil {
if err := _store.UpdateUser(u); err != nil {
log.Error().Msgf("cannot update %s. %s", u.Login, err)
c.Redirect(303, "/login?error=internal_error")
return
@@ -156,7 +156,7 @@ func GetLogout(c *gin.Context) {
}
func GetLoginToken(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
in := &tokenPayload{}
err := c.Bind(in)
@@ -171,7 +171,7 @@ func GetLoginToken(c *gin.Context) {
return
}
user, err := store_.GetUserLogin(login)
user, err := _store.GetUserLogin(login)
if err != nil {
_ = c.AbortWithError(http.StatusNotFound, err)
return

52
server/api/repo.go
View File

@@ -36,8 +36,8 @@ const defaultTimeout = 60 // 1 hour default build time
const maxTimeout = defaultTimeout * 2
func PostRepo(c *gin.Context) {
remote_ := server.Config.Services.Remote
store_ := store.FromContext(c)
remote := server.Config.Services.Remote
_store := store.FromContext(c)
user := session.User(c)
repo := session.Repo(c)
@@ -83,18 +83,18 @@ func PostRepo(c *gin.Context) {
sig,
)
err = remote_.Activate(c, user, repo, link)
err = remote.Activate(c, user, repo, link)
if err != nil {
c.String(http.StatusInternalServerError, err.Error())
return
}
from, err := remote_.Repo(c, user, repo.Owner, repo.Name)
from, err := remote.Repo(c, user, repo.Owner, repo.Name)
if err == nil {
repo.Update(from)
}
err = store_.UpdateRepo(repo)
err = _store.UpdateRepo(repo)
if err != nil {
c.String(http.StatusInternalServerError, err.Error())
return
@@ -104,7 +104,7 @@ func PostRepo(c *gin.Context) {
}
func PatchRepo(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
user := session.User(c)
@@ -151,7 +151,7 @@ func PatchRepo(c *gin.Context) {
repo.Counter = *in.BuildCounter
}
err := store_.UpdateRepo(repo)
err := _store.UpdateRepo(repo)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -161,12 +161,12 @@ func PatchRepo(c *gin.Context) {
}
func ChownRepo(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
repo := session.Repo(c)
user := session.User(c)
repo.UserID = user.ID
err := store_.UpdateRepo(repo)
err := _store.UpdateRepo(repo)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -199,8 +199,8 @@ func GetRepoBranches(c *gin.Context) {
func DeleteRepo(c *gin.Context) {
remove, _ := strconv.ParseBool(c.Query("remove"))
remote_ := server.Config.Services.Remote
store_ := store.FromContext(c)
remote := server.Config.Services.Remote
_store := store.FromContext(c)
repo := session.Repo(c)
user := session.User(c)
@@ -208,21 +208,21 @@ func DeleteRepo(c *gin.Context) {
repo.IsActive = false
repo.UserID = 0
err := store_.UpdateRepo(repo)
err := _store.UpdateRepo(repo)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
if remove {
err := store_.DeleteRepo(repo)
err := _store.DeleteRepo(repo)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
}
if err := remote_.Deactivate(c, user, repo, server.Config.Server.Host); err != nil {
if err := remote.Deactivate(c, user, repo, server.Config.Server.Host); err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
@@ -230,8 +230,8 @@ func DeleteRepo(c *gin.Context) {
}
func RepairRepo(c *gin.Context) {
remote_ := server.Config.Services.Remote
store_ := store.FromContext(c)
remote := server.Config.Services.Remote
_store := store.FromContext(c)
repo := session.Repo(c)
user := session.User(c)
@@ -251,15 +251,15 @@ func RepairRepo(c *gin.Context) {
sig,
)
if err := remote_.Deactivate(c, user, repo, host); err != nil {
if err := remote.Deactivate(c, user, repo, host); err != nil {
log.Trace().Err(err).Msgf("deactivate repo '%s' to repair failed", repo.FullName)
}
if err := remote_.Activate(c, user, repo, link); err != nil {
if err := remote.Activate(c, user, repo, link); err != nil {
c.String(500, err.Error())
return
}
from, err := remote_.Repo(c, user, repo.Owner, repo.Name)
from, err := remote.Repo(c, user, repo.Owner, repo.Name)
if err != nil {
log.Error().Err(err).Msgf("get repo '%s/%s' from remote", repo.Owner, repo.Name)
c.AbortWithStatus(http.StatusInternalServerError)
@@ -275,7 +275,7 @@ func RepairRepo(c *gin.Context) {
if repo.IsSCMPrivate != from.IsSCMPrivate {
repo.ResetVisibility()
}
if err := store_.UpdateRepo(repo); err != nil {
if err := _store.UpdateRepo(repo); err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}
@@ -284,8 +284,8 @@ func RepairRepo(c *gin.Context) {
}
func MoveRepo(c *gin.Context) {
remote_ := server.Config.Services.Remote
store_ := store.FromContext(c)
remote := server.Config.Services.Remote
_store := store.FromContext(c)
repo := session.Repo(c)
user := session.User(c)
@@ -302,7 +302,7 @@ func MoveRepo(c *gin.Context) {
return
}
from, err := remote_.Repo(c, user, owner, name)
from, err := remote.Repo(c, user, owner, name)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -323,7 +323,7 @@ func MoveRepo(c *gin.Context) {
repo.ResetVisibility()
}
errStore := store_.UpdateRepo(repo)
errStore := _store.UpdateRepo(repo)
if errStore != nil {
_ = c.AbortWithError(http.StatusInternalServerError, errStore)
return
@@ -345,10 +345,10 @@ func MoveRepo(c *gin.Context) {
sig,
)
if err := remote_.Deactivate(c, user, repo, host); err != nil {
if err := remote.Deactivate(c, user, repo, host); err != nil {
log.Trace().Err(err).Msgf("deactivate repo '%s' for move to activate later, got an error", repo.FullName)
}
if err := remote_.Activate(c, user, repo, link); err != nil {
if err := remote.Activate(c, user, repo, link); err != nil {
c.String(500, err.Error())
return
}

6
server/api/stream.go
View File

@@ -138,20 +138,20 @@ func LogStreamSSE(c *gin.Context) {
flusher.Flush()
repo := session.Repo(c)
store_ := store.FromContext(c)
_store := store.FromContext(c)
// // parse the build number and job sequence number from
// // the repquest parameter.
buildn, _ := strconv.ParseInt(c.Param("build"), 10, 64)
jobn, _ := strconv.Atoi(c.Param("number"))
build, err := store_.GetBuildNumber(repo, buildn)
build, err := _store.GetBuildNumber(repo, buildn)
if err != nil {
log.Debug().Msgf("stream cannot get build number: %v", err)
logWriteStringErr(io.WriteString(rw, "event: error\ndata: build not found\n\n"))
return
}
proc, err := store_.ProcFind(build, jobn)
proc, err := _store.ProcFind(build, jobn)
if err != nil {
log.Debug().Msgf("stream cannot get proc number: %v", err)
logWriteStringErr(io.WriteString(rw, "event: error\ndata: process not found\n\n"))

34
server/api/user.go
View File

@@ -37,8 +37,8 @@ func GetSelf(c *gin.Context) {
}
func GetFeed(c *gin.Context) {
store_ := store.FromContext(c)
remote_ := server.Config.Services.Remote
_store := store.FromContext(c)
remote := server.Config.Services.Remote
user := session.User(c)
latest, _ := strconv.ParseBool(c.Query("latest"))
@@ -47,7 +47,7 @@ func GetFeed(c *gin.Context) {
log.Debug().Msgf("sync begin: %s", user.Login)
user.Synced = time.Now().Unix()
if err := store_.UpdateUser(user); err != nil {
if err := _store.UpdateUser(user); err != nil {
log.Error().Err(err).Msg("UpdateUser")
return
}
@@ -55,9 +55,9 @@ func GetFeed(c *gin.Context) {
config := ToConfig(c)
sync := shared.Syncer{
Remote: remote_,
Store: store_,
Perms: store_,
Remote: remote,
Store: _store,
Perms: _store,
Match: shared.NamespaceFilter(config.OwnersWhitelist),
}
if err := sync.Sync(c, user); err != nil {
@@ -68,7 +68,7 @@ func GetFeed(c *gin.Context) {
}
if latest {
feed, err := store_.RepoListLatest(user)
feed, err := _store.RepoListLatest(user)
if err != nil {
c.String(500, "Error fetching feed. %s", err)
} else {
@@ -77,7 +77,7 @@ func GetFeed(c *gin.Context) {
return
}
feed, err := store_.UserFeed(user)
feed, err := _store.UserFeed(user)
if err != nil {
c.String(500, "Error fetching user feed. %s", err)
return
@@ -86,8 +86,8 @@ func GetFeed(c *gin.Context) {
}
func GetRepos(c *gin.Context) {
store_ := store.FromContext(c)
remote_ := server.Config.Services.Remote
_store := store.FromContext(c)
remote := server.Config.Services.Remote
user := session.User(c)
all, _ := strconv.ParseBool(c.Query("all"))
@@ -96,7 +96,7 @@ func GetRepos(c *gin.Context) {
if flush || time.Unix(user.Synced, 0).Add(time.Hour*72).Before(time.Now()) {
log.Debug().Msgf("sync begin: %s", user.Login)
user.Synced = time.Now().Unix()
if err := store_.UpdateUser(user); err != nil {
if err := _store.UpdateUser(user); err != nil {
log.Err(err).Msgf("update user '%s'", user.Login)
return
}
@@ -104,9 +104,9 @@ func GetRepos(c *gin.Context) {
config := ToConfig(c)
sync := shared.Syncer{
Remote: remote_,
Store: store_,
Perms: store_,
Remote: remote,
Store: _store,
Perms: _store,
Match: shared.NamespaceFilter(config.OwnersWhitelist),
}
@@ -117,7 +117,7 @@ func GetRepos(c *gin.Context) {
}
}
repos, err := store_.RepoList(user, true)
repos, err := _store.RepoList(user, true)
if err != nil {
c.String(500, "Error fetching repository list. %s", err)
return
@@ -148,13 +148,13 @@ func PostToken(c *gin.Context) {
}
func DeleteToken(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
user := session.User(c)
user.Hash = base32.StdEncoding.EncodeToString(
securecookie.GenerateRandomKey(32),
)
if err := store_.UpdateUser(user); err != nil {
if err := _store.UpdateUser(user); err != nil {
c.String(500, "Error revoking tokens. %s", err)
return
}

12
server/api/users.go
View File

@@ -44,7 +44,7 @@ func GetUser(c *gin.Context) {
}
func PatchUser(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
in := &model.User{}
err := c.Bind(in)
@@ -53,14 +53,14 @@ func PatchUser(c *gin.Context) {
return
}
user, err := store_.GetUserLogin(c.Param("login"))
user, err := _store.GetUserLogin(c.Param("login"))
if err != nil {
c.AbortWithStatus(http.StatusNotFound)
return
}
user.Active = in.Active
err = store_.UpdateUser(user)
err = _store.UpdateUser(user)
if err != nil {
c.AbortWithStatus(http.StatusConflict)
return
@@ -97,14 +97,14 @@ func PostUser(c *gin.Context) {
}
func DeleteUser(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
user, err := store_.GetUserLogin(c.Param("login"))
user, err := _store.GetUserLogin(c.Param("login"))
if err != nil {
c.String(404, "Cannot find user. %s", err)
return
}
if err = store_.DeleteUser(user); err != nil {
if err = _store.DeleteUser(user); err != nil {
c.String(500, "Error deleting user. %s", err)
return
}

7
server/grpc/rpc.go
View File

@@ -80,10 +80,9 @@ func (s *RPC) Next(c context.Context, filter rpc.Filter) (*rpc.Pipeline, error)
pipeline := new(rpc.Pipeline)
err = json.Unmarshal(task.Data, pipeline)
return pipeline, err
} else {
if err := s.Done(c, task.ID, rpc.State{}); err != nil {
log.Error().Err(err).Msgf("mark task '%s' done failed", task.ID)
}
}
if err := s.Done(c, task.ID, rpc.State{}); err != nil {
log.Error().Err(err).Msgf("mark task '%s' done failed", task.ID)
}
}
}

4
server/model/cc_test.go
View File

@@ -26,7 +26,7 @@ func TestCC(t *testing.T) {
g.Describe("CC", func() {
g.It("Should create a project", func() {
now := time.Now().Unix()
now_fmt := time.Unix(now, 0).Format(time.RFC3339)
nowFmt := time.Unix(now, 0).Format(time.RFC3339)
r := &Repo{
FullName: "foo/bar",
}
@@ -41,7 +41,7 @@ func TestCC(t *testing.T) {
g.Assert(cc.Project.Activity).Equal("Sleeping")
g.Assert(cc.Project.LastBuildStatus).Equal("Success")
g.Assert(cc.Project.LastBuildLabel).Equal("1")
g.Assert(cc.Project.LastBuildTime).Equal(now_fmt)
g.Assert(cc.Project.LastBuildTime).Equal(nowFmt)
g.Assert(cc.Project.WebURL).Equal("http://localhost/foo/bar/1")
})

2
server/model/repo.go
View File

@@ -65,7 +65,7 @@ func (r *Repo) ResetVisibility() {
func ParseRepo(str string) (user, repo string, err error) {
var parts = strings.Split(str, "/")
if len(parts) != 2 {
err = fmt.Errorf("Error: Invalid or missing repository. eg octocat/hello-world.")
err = fmt.Errorf("Error: Invalid or missing repository. eg octocat/hello-world")
return
}
user = parts[0]

41
server/queue/fifo_test.go
View File

@@ -291,32 +291,30 @@ func TestFifoErrorsMultiThread(t *testing.T) {
if got != task1 {
t.Errorf("expect task1 returned from queue as task2 and task3 depends on it")
return
} else {
task1Processed = true
assert.NoError(t, q.Error(noContext, got.ID, fmt.Errorf("exitcode 1, there was an error")))
go func() {
for {
fmt.Printf("Worker spawned\n")
got, _ := q.Poll(noContext, func(*Task) bool { return true })
obtainedWorkCh <- got
}
}()
}
task1Processed = true
assert.NoError(t, q.Error(noContext, got.ID, fmt.Errorf("exitcode 1, there was an error")))
go func() {
for {
fmt.Printf("Worker spawned\n")
got, _ := q.Poll(noContext, func(*Task) bool { return true })
obtainedWorkCh <- got
}
}()
} else if !task2Processed {
if got != task2 {
t.Errorf("expect task2 returned from queue")
return
} else {
task2Processed = true
assert.NoError(t, q.Done(noContext, got.ID, StatusSuccess))
go func() {
for {
fmt.Printf("Worker spawned\n")
got, _ := q.Poll(noContext, func(*Task) bool { return true })
obtainedWorkCh <- got
}
}()
}
task2Processed = true
assert.NoError(t, q.Done(noContext, got.ID, StatusSuccess))
go func() {
for {
fmt.Printf("Worker spawned\n")
got, _ := q.Poll(noContext, func(*Task) bool { return true })
obtainedWorkCh <- got
}
}()
} else {
if got != task3 {
t.Errorf("expect task3 returned from queue")
@@ -326,9 +324,8 @@ func TestFifoErrorsMultiThread(t *testing.T) {
if got.ShouldRun() {
t.Errorf("expect task3 should not run, task1 succeeded but task2 failed")
return
} else {
return
}
return
}
case <-time.After(5 * time.Second):

8
server/remote/bitbucket/bitbucket.go
View File

@@ -226,7 +226,7 @@ func (c *config) Status(ctx context.Context, u *model.User, r *model.Repo, b *mo
State: convertStatus(b.Status),
Desc: convertDesc(b.Status),
Key: "Woodpecker",
Url: link,
URL: link,
}
return c.newClient(ctx, u).CreateStatus(r.Owner, r.Name, b.Commit, &status)
}
@@ -245,7 +245,7 @@ func (c *config) Activate(ctx context.Context, u *model.User, r *model.Repo, lin
Active: true,
Desc: rawurl.Host,
Events: []string{"repo:push"},
Url: link,
URL: link,
})
}
@@ -260,7 +260,7 @@ func (c *config) Deactivate(ctx context.Context, u *model.User, r *model.Repo, l
}
hook := matchingHooks(hooks.Values, link)
if hook != nil {
return client.DeleteHook(r.Owner, r.Name, hook.Uuid)
return client.DeleteHook(r.Owner, r.Name, hook.UUID)
}
return nil
}
@@ -326,7 +326,7 @@ func matchingHooks(hooks []*internal.Hook, rawurl string) *internal.Hook {
return nil
}
for _, hook := range hooks {
hookurl, err := url.Parse(hook.Url)
hookurl, err := url.Parse(hook.URL)
if err == nil && hookurl.Host == link.Host {
return hook
}

4
server/remote/bitbucket/bitbucket_test.go
View File

@@ -234,14 +234,14 @@ func Test_bitbucket(t *testing.T) {
g.Describe("Given a list of hooks", func() {
g.It("Should return the matching hook", func() {
hooks := []*internal.Hook{
{Url: "http://127.0.0.1/hook"},
{URL: "http://127.0.0.1/hook"},
}
hook := matchingHooks(hooks, "http://127.0.0.1/")
g.Assert(hook).Equal(hooks[0])
})
g.It("Should handle no matches", func() {
hooks := []*internal.Hook{
{Url: "http://localhost/hook"},
{URL: "http://localhost/hook"},
}
hook := matchingHooks(hooks, "http://127.0.0.1/")
g.Assert(hook).IsNil()

8
server/remote/bitbucket/convert.go
View File

@@ -81,7 +81,7 @@ func convertRepo(from *internal.Repo) *model.Repo {
Owner: strings.Split(from.FullName, "/")[0],
Name: strings.Split(from.FullName, "/")[1],
FullName: from.FullName,
Link: from.Links.Html.Href,
Link: from.Links.HTML.Href,
IsSCMPrivate: from.IsPrivate,
Avatar: from.Owner.Links.Avatar.Href,
SCMKind: model.SCMKind(from.Scm),
@@ -110,7 +110,7 @@ func cloneLink(repo *internal.Repo) string {
// if no repository name is provided, we use the Html link. this excludes the
// .git suffix, but will still clone the repo.
if len(clone) == 0 {
clone = repo.Links.Html.Href
clone = repo.Links.HTML.Href
}
// if bitbucket tries to automatically populate the user in the url we must
@@ -167,7 +167,7 @@ func convertPullHook(from *internal.PullRequestHook) *model.Build {
from.PullRequest.Dest.Branch.Name,
),
Remote: fmt.Sprintf("https://bitbucket.org/%s", from.PullRequest.Source.Repo.FullName),
Link: from.PullRequest.Links.Html.Href,
Link: from.PullRequest.Links.HTML.Href,
Branch: from.PullRequest.Dest.Branch.Name,
Message: from.PullRequest.Desc,
Avatar: from.Actor.Links.Avatar.Href,
@@ -182,7 +182,7 @@ func convertPullHook(from *internal.PullRequestHook) *model.Build {
func convertPushHook(hook *internal.PushHook, change *internal.Change) *model.Build {
build := &model.Build{
Commit: change.New.Target.Hash,
Link: change.New.Target.Links.Html.Href,
Link: change.New.Target.Links.HTML.Href,
Branch: change.New.Name,
Message: change.New.Target.Message,
Avatar: hook.Actor.Links.Avatar.Href,

18
server/remote/bitbucket/convert_test.go
View File

@@ -68,7 +68,7 @@ func Test_helper(t *testing.T) {
Scm: "hg",
}
from.Owner.Links.Avatar.Href = "http://..."
from.Links.Html.Href = "https://bitbucket.org/foo/bar"
from.Links.HTML.Href = "https://bitbucket.org/foo/bar"
to := convertRepo(from)
g.Assert(to.Avatar).Equal(from.Owner.Links.Avatar.Href)
@@ -78,8 +78,8 @@ func Test_helper(t *testing.T) {
g.Assert(to.Branch).Equal("default")
g.Assert(string(to.SCMKind)).Equal(from.Scm)
g.Assert(to.IsSCMPrivate).Equal(from.IsPrivate)
g.Assert(to.Clone).Equal(from.Links.Html.Href)
g.Assert(to.Link).Equal(from.Links.Html.Href)
g.Assert(to.Clone).Equal(from.Links.HTML.Href)
g.Assert(to.Link).Equal(from.Links.HTML.Href)
})
g.It("should convert team", func() {
@@ -127,7 +127,7 @@ func Test_helper(t *testing.T) {
g.It("should build clone url", func() {
repo := &internal.Repo{}
repo.Links.Html.Href = "https://foo:bar@bitbucket.org/foo/bar.git"
repo.Links.HTML.Href = "https://foo:bar@bitbucket.org/foo/bar.git"
link := cloneLink(repo)
g.Assert(link).Equal("https://bitbucket.org/foo/bar.git")
})
@@ -138,10 +138,10 @@ func Test_helper(t *testing.T) {
hook.Actor.Links.Avatar.Href = "https://..."
hook.PullRequest.Dest.Commit.Hash = "73f9c44d"
hook.PullRequest.Dest.Branch.Name = "master"
hook.PullRequest.Dest.Repo.Links.Html.Href = "https://bitbucket.org/foo/bar"
hook.PullRequest.Dest.Repo.Links.HTML.Href = "https://bitbucket.org/foo/bar"
hook.PullRequest.Source.Branch.Name = "change"
hook.PullRequest.Source.Repo.FullName = "baz/bar"
hook.PullRequest.Links.Html.Href = "https://bitbucket.org/foo/bar/pulls/5"
hook.PullRequest.Links.HTML.Href = "https://bitbucket.org/foo/bar/pulls/5"
hook.PullRequest.Desc = "updated README"
hook.PullRequest.Updated = time.Now()
@@ -151,7 +151,7 @@ func Test_helper(t *testing.T) {
g.Assert(build.Avatar).Equal(hook.Actor.Links.Avatar.Href)
g.Assert(build.Commit).Equal(hook.PullRequest.Dest.Commit.Hash)
g.Assert(build.Branch).Equal(hook.PullRequest.Dest.Branch.Name)
g.Assert(build.Link).Equal(hook.PullRequest.Links.Html.Href)
g.Assert(build.Link).Equal(hook.PullRequest.Links.HTML.Href)
g.Assert(build.Ref).Equal("refs/heads/master")
g.Assert(build.Refspec).Equal("change:master")
g.Assert(build.Remote).Equal("https://bitbucket.org/baz/bar")
@@ -163,7 +163,7 @@ func Test_helper(t *testing.T) {
change := internal.Change{}
change.New.Target.Hash = "73f9c44d"
change.New.Name = "master"
change.New.Target.Links.Html.Href = "https://bitbucket.org/foo/bar/commits/73f9c44d"
change.New.Target.Links.HTML.Href = "https://bitbucket.org/foo/bar/commits/73f9c44d"
change.New.Target.Message = "updated README"
change.New.Target.Date = time.Now()
change.New.Target.Author.Raw = "Test <test@domain.tld>"
@@ -179,7 +179,7 @@ func Test_helper(t *testing.T) {
g.Assert(build.Avatar).Equal(hook.Actor.Links.Avatar.Href)
g.Assert(build.Commit).Equal(change.New.Target.Hash)
g.Assert(build.Branch).Equal(change.New.Name)
g.Assert(build.Link).Equal(change.New.Target.Links.Html.Href)
g.Assert(build.Link).Equal(change.New.Target.Links.HTML.Href)
g.Assert(build.Ref).Equal("refs/heads/master")
g.Assert(build.Message).Equal(change.New.Target.Message)
g.Assert(build.Timestamp).Equal(change.New.Target.Date.Unix())

3
server/remote/bitbucket/internal/client.go
View File

@@ -171,9 +171,8 @@ func (c *Client) GetPermission(fullName string) (*RepoPerm, error) {
if len(out.Values) == 0 {
return nil, fmt.Errorf("no permissions in repository %s", fullName)
} else {
return out.Values[0], nil
}
return out.Values[0], nil
}
func (c *Client) do(rawurl, method string, in, out interface{}) (*string, error) {

8
server/remote/bitbucket/internal/types.go
View File

@@ -39,7 +39,7 @@ type BuildStatus struct {
State string `json:"state"`
Key string `json:"key"`
Name string `json:"name,omitempty"`
Url string `json:"url"`
URL string `json:"url"`
Desc string `json:"description,omitempty"`
}
@@ -58,9 +58,9 @@ type EmailResp struct {
}
type Hook struct {
Uuid string `json:"uuid,omitempty"`
UUID string `json:"uuid,omitempty"`
Desc string `json:"description"`
Url string `json:"url"`
URL string `json:"url"`
Events []string `json:"events"`
Active bool `json:"active"`
}
@@ -75,7 +75,7 @@ type HookResp struct {
type Links struct {
Avatar Link `json:"avatar"`
Html Link `json:"html"`
HTML Link `json:"html"`
Clone []Link `json:"clone"`
}

2
server/remote/bitbucketserver/bitbucketserver.go
View File

@@ -191,7 +191,7 @@ func (c *Config) Status(ctx context.Context, u *model.User, r *model.Repo, b *mo
Desc: convertDesc(b.Status),
Name: fmt.Sprintf("Woodpecker #%d - %s", b.Number, b.Branch),
Key: "Woodpecker",
Url: link,
URL: link,
}
client := internal.NewClientWithToken(ctx, c.URL, c.Consumer, u.Token)

14
server/remote/bitbucketserver/internal/client.go
View File

@@ -32,7 +32,7 @@ import (
)
const (
currentUserId = "%s/plugins/servlet/applinks/whoami"
currentUserID = "%s/plugins/servlet/applinks/whoami"
pathUser = "%s/rest/api/1.0/users/%s"
pathRepo = "%s/rest/api/1.0/projects/%s/repos/%s"
pathRepos = "%s/rest/api/1.0/repos?start=%s&limit=%s"
@@ -69,15 +69,15 @@ func NewClientWithToken(ctx context.Context, url string, consumer *oauth.Consume
}
func (c *Client) FindCurrentUser() (*User, error) {
CurrentUserIdResponse, err := c.doGet(fmt.Sprintf(currentUserId, c.base))
if CurrentUserIdResponse != nil {
defer CurrentUserIdResponse.Body.Close()
CurrentUserIDResponse, err := c.doGet(fmt.Sprintf(currentUserID, c.base))
if CurrentUserIDResponse != nil {
defer CurrentUserIDResponse.Body.Close()
}
if err != nil {
return nil, err
}
bits, err := ioutil.ReadAll(CurrentUserIdResponse.Body)
bits, err := ioutil.ReadAll(CurrentUserIDResponse.Body)
if err != nil {
return nil, err
}
@@ -299,8 +299,8 @@ func (c *Client) doPost(url string, status *BuildStatus) error {
//Helper function to get repos paginated
func (c *Client) paginatedRepos(start int) ([]*Repo, error) {
limit := 1000
requestUrl := fmt.Sprintf(pathRepos, c.base, strconv.Itoa(start), strconv.Itoa(limit))
response, err := c.doGet(requestUrl)
requestURL := fmt.Sprintf(pathRepos, c.base, strconv.Itoa(start), strconv.Itoa(limit))
response, err := c.doGet(requestURL)
if response != nil {
defer response.Body.Close()
}

2
server/remote/bitbucketserver/internal/types.go
View File

@@ -42,7 +42,7 @@ type BuildStatus struct {
State string `json:"state"`
Key string `json:"key"`
Name string `json:"name,omitempty"`
Url string `json:"url"`
URL string `json:"url"`
Desc string `json:"description,omitempty"`
}

4
server/remote/coding/coding.go
View File

@@ -175,7 +175,7 @@ func (c *Coding) Repo(ctx context.Context, u *model.User, owner, name string) (*
Avatar: c.resourceLink(project.Icon),
Link: c.resourceLink(project.DepotPath),
SCMKind: model.RepoGit,
Clone: project.HttpsURL,
Clone: project.HTTPSURL,
Branch: depot.DefaultBranch,
IsSCMPrivate: !project.IsPublic,
}, nil
@@ -202,7 +202,7 @@ func (c *Coding) Repos(ctx context.Context, u *model.User) ([]*model.Repo, error
Avatar: c.resourceLink(project.Icon),
Link: c.resourceLink(project.DepotPath),
SCMKind: model.RepoGit,
Clone: project.HttpsURL,
Clone: project.HTTPSURL,
Branch: depot.DefaultBranch,
IsSCMPrivate: !project.IsPublic,
}

14
server/remote/coding/hook.go
View File

@@ -39,8 +39,8 @@ type User struct {
type Repository struct {
Name string `json:"name"`
HttpsURL string `json:"https_url"`
SshURL string `json:"ssh_url"`
HTTPSURL string `json:"https_url"`
SSHURL string `json:"ssh_url"`
WebURL string `json:"web_url"`
Owner *User `json:"owner"`
}
@@ -131,9 +131,9 @@ func findLastCommit(commits []*Commit, sha string) *Commit {
func convertRepository(repo *Repository) (*model.Repo, error) {
// tricky stuff for a team project without a team owner instead of a user owner
re := regexp.MustCompile(`git@.+:([^/]+)/.+\.git`)
matches := re.FindStringSubmatch(repo.SshURL)
matches := re.FindStringSubmatch(repo.SSHURL)
if len(matches) != 2 {
return nil, fmt.Errorf("Unable to resolve owner from ssh url %q", repo.SshURL)
return nil, fmt.Errorf("Unable to resolve owner from ssh url %q", repo.SSHURL)
}
return &model.Repo{
@@ -173,7 +173,7 @@ func parsePushHook(raw []byte) (*model.Repo, *model.Build, error) {
Email: lastCommit.Committer.Email,
Avatar: hook.User.Avatar,
Author: hook.User.GlobalKey,
Remote: hook.Repository.HttpsURL,
Remote: hook.Repository.HTTPSURL,
}
return repo, build, nil
}
@@ -203,7 +203,7 @@ func parsePullRequestHook(raw []byte) (*model.Repo, *model.Build, error) {
Author: hook.PullRequest.User.GlobalKey,
Avatar: hook.PullRequest.User.Avatar,
Title: hook.PullRequest.Title,
Remote: hook.Repository.HttpsURL,
Remote: hook.Repository.HTTPSURL,
Refspec: fmt.Sprintf("%s:%s", hook.PullRequest.SourceBranch, hook.PullRequest.TargetBranch),
}
@@ -236,7 +236,7 @@ func parseMergeReuqestHook(raw []byte) (*model.Repo, *model.Build, error) {
Author: hook.MergeRequest.User.GlobalKey,
Avatar: hook.MergeRequest.User.Avatar,
Title: hook.MergeRequest.Title,
Remote: hook.Repository.HttpsURL,
Remote: hook.Repository.HTTPSURL,
Refspec: fmt.Sprintf("%s:%s", hook.MergeRequest.SourceBranch, hook.MergeRequest.TargetBranch),
}
return repo, build, nil

4
server/remote/coding/hook_test.go
View File

@@ -83,8 +83,8 @@ func Test_hook(t *testing.T) {
g.It("Should convert repository", func() {
repository := &Repository{
Name: "test_project",
HttpsURL: "https://git.coding.net/kelvin/test_project.git",
SshURL: "git@git.coding.net:kelvin/test_project.git",
HTTPSURL: "https://git.coding.net/kelvin/test_project.git",
SSHURL: "git@git.coding.net:kelvin/test_project.git",
WebURL: "https://coding.net/u/kelvin/p/test_project",
Owner: &User{
GlobalKey: "kelvin",

2
server/remote/coding/internal/project.go
View File

@@ -24,7 +24,7 @@ type Project struct {
Owner string `json:"owner_user_name"`
Name string `json:"name"`
DepotPath string `json:"depot_path"`
HttpsURL string `json:"https_url"`
HTTPSURL string `json:"https_url"`
IsPublic bool `json:"is_public"`
Icon string `json:"icon"`
Role string `json:"current_user_role"`

6
server/remote/coding/internal/webhook.go
View File

@@ -21,7 +21,7 @@ import (
)
type Webhook struct {
Id int `json:"id"`
ID int `json:"id"`
HookURL string `json:"hook_url"`
}
@@ -46,7 +46,7 @@ func (c *Client) AddWebhook(globalKey, projectName, link string) error {
}
webhook := matchingHooks(webhooks, link)
if webhook != nil {
u := fmt.Sprintf("/user/%s/project/%s/git/hook/%d", globalKey, projectName, webhook.Id)
u := fmt.Sprintf("/user/%s/project/%s/git/hook/%d", globalKey, projectName, webhook.ID)
params := url.Values{}
params.Set("hook_url", link)
params.Set("type_pust", "true")
@@ -82,7 +82,7 @@ func (c *Client) RemoveWebhook(globalKey, projectName, link string) error {
return nil
}
u := fmt.Sprintf("/user/%s/project/%s/git/hook/%d", globalKey, projectName, webhook.Id)
u := fmt.Sprintf("/user/%s/project/%s/git/hook/%d", globalKey, projectName, webhook.ID)
_, err = c.Do("DELETE", u, nil)
if err != nil {
return APIClientErr{"fail to remove webhook", u, err}

18
server/remote/gitlab/convert.go
View File

@@ -26,20 +26,20 @@ import (
"github.com/woodpecker-ci/woodpecker/server/model"
)
func (g *Gitlab) convertGitlabRepo(repo_ *gitlab.Project) (*model.Repo, error) {
parts := strings.Split(repo_.PathWithNamespace, "/")
func (g *Gitlab) convertGitlabRepo(_repo *gitlab.Project) (*model.Repo, error) {
parts := strings.Split(_repo.PathWithNamespace, "/")
// TODO: save repo id (support nested repos)
var owner = parts[0]
var name = parts[1]
repo := &model.Repo{
Owner: owner,
Name: name,
FullName: repo_.PathWithNamespace,
Avatar: repo_.AvatarURL,
Link: repo_.WebURL,
Clone: repo_.HTTPURLToRepo,
Branch: repo_.DefaultBranch,
Visibility: model.RepoVisibly(repo_.Visibility),
FullName: _repo.PathWithNamespace,
Avatar: _repo.AvatarURL,
Link: _repo.WebURL,
Clone: _repo.HTTPURLToRepo,
Branch: _repo.DefaultBranch,
Visibility: model.RepoVisibly(_repo.Visibility),
}
if len(repo.Branch) == 0 { // TODO: do we need that?
@@ -53,7 +53,7 @@ func (g *Gitlab) convertGitlabRepo(repo_ *gitlab.Project) (*model.Repo, error) {
if g.PrivateMode {
repo.IsSCMPrivate = true
} else {
repo.IsSCMPrivate = !repo_.Public
repo.IsSCMPrivate = !_repo.Public
}
return repo, nil

42
server/remote/gitlab/gitlab.go
View File

@@ -91,7 +91,7 @@ func New(opts Opts) (remote.Remote, error) {
// remote user details.
func (g *Gitlab) Login(ctx context.Context, res http.ResponseWriter, req *http.Request) (*model.User, error) {
var config = &oauth2.Config{
ClientId: g.ClientID,
ClientID: g.ClientID,
ClientSecret: g.ClientSecret,
Scope: defaultScope,
AuthURL: fmt.Sprintf("%s/oauth/authorize", g.URL),
@@ -119,12 +119,12 @@ func (g *Gitlab) Login(ctx context.Context, res http.ResponseWriter, req *http.R
TLSClientConfig: &tls.Config{InsecureSkipVerify: g.SkipVerify},
Proxy: http.ProxyFromEnvironment,
}}
var token_, err = trans.Exchange(code)
var token, err = trans.Exchange(code)
if err != nil {
return nil, fmt.Errorf("Error exchanging token. %s", err)
}
client, err := newClient(g.URL, token_.AccessToken, g.SkipVerify)
client, err := newClient(g.URL, token.AccessToken, g.SkipVerify)
if err != nil {
return nil, err
}
@@ -138,8 +138,8 @@ func (g *Gitlab) Login(ctx context.Context, res http.ResponseWriter, req *http.R
Login: login.Username,
Email: login.Email,
Avatar: login.AvatarURL,
Token: token_.AccessToken,
Secret: token_.RefreshToken,
Token: token.AccessToken,
Secret: token.RefreshToken,
}
if !strings.HasPrefix(user.Avatar, "http") {
user.Avatar = g.URL + "/" + login.AvatarURL
@@ -214,12 +214,12 @@ func (g *Gitlab) Repo(ctx context.Context, user *model.User, owner, name string)
return nil, err
}
repo_, err := g.getProject(ctx, client, owner, name)
_repo, err := g.getProject(ctx, client, owner, name)
if err != nil {
return nil, err
}
return g.convertGitlabRepo(repo_)
return g.convertGitlabRepo(_repo)
}
// Repos fetches a list of repos from the remote system.
@@ -291,11 +291,11 @@ func (g *Gitlab) File(ctx context.Context, user *model.User, repo *model.Repo, b
if err != nil {
return nil, err
}
repo_, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
if err != nil {
return nil, err
}
file, _, err := client.RepositoryFiles.GetRawFile(repo_.ID, fileName, &gitlab.GetRawFileOptions{Ref: &build.Commit}, gitlab.WithContext(ctx))
file, _, err := client.RepositoryFiles.GetRawFile(_repo.ID, fileName, &gitlab.GetRawFileOptions{Ref: &build.Commit}, gitlab.WithContext(ctx))
return file, err
}
@@ -307,7 +307,7 @@ func (g *Gitlab) Dir(ctx context.Context, user *model.User, repo *model.Repo, bu
}
files := make([]*remote.FileMeta, 0, perPage)
repo_, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
if err != nil {
return nil, err
}
@@ -320,7 +320,7 @@ func (g *Gitlab) Dir(ctx context.Context, user *model.User, repo *model.Repo, bu
for i := 1; true; i++ {
opts.Page = 1
batch, _, err := client.Repositories.ListTree(repo_.ID, opts, gitlab.WithContext(ctx))
batch, _, err := client.Repositories.ListTree(_repo.ID, opts, gitlab.WithContext(ctx))
if err != nil {
return nil, err
}
@@ -354,12 +354,12 @@ func (g *Gitlab) Status(ctx context.Context, user *model.User, repo *model.Repo,
return err
}
repo_, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
if err != nil {
return err
}
_, _, err = client.Commits.SetCommitStatus(repo_.ID, build.Commit, &gitlab.SetCommitStatusOptions{
_, _, err = client.Commits.SetCommitStatus(_repo.ID, build.Commit, &gitlab.SetCommitStatusOptions{
Ref: gitlab.String(strings.ReplaceAll(build.Ref, "refs/heads/", "")),
State: getStatus(build.Status),
Description: gitlab.String(getDesc(build.Status)),
@@ -401,16 +401,16 @@ func (g *Gitlab) Activate(ctx context.Context, user *model.User, repo *model.Rep
return err
}
token := uri.Query().Get("access_token")
webUrl := fmt.Sprintf("%s://%s", uri.Scheme, uri.Host)
webURL := fmt.Sprintf("%s://%s", uri.Scheme, uri.Host)
repo_, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
if err != nil {
return err
}
// TODO: "WoodpeckerCIService"
_, err = client.Services.SetDroneCIService(repo_.ID, &gitlab.SetDroneCIServiceOptions{
_, err = client.Services.SetDroneCIService(_repo.ID, &gitlab.SetDroneCIServiceOptions{
Token: &token,
DroneURL: &webUrl,
DroneURL: &webURL,
EnableSSLVerification: gitlab.Bool(!g.SkipVerify),
}, gitlab.WithContext(ctx))
return err
@@ -424,12 +424,12 @@ func (g *Gitlab) Deactivate(ctx context.Context, user *model.User, repo *model.R
return err
}
repo_, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
if err != nil {
return err
}
// TODO: "WoodpeckerCIService"
_, err = client.Services.DeleteDroneCIService(repo_.ID, gitlab.WithContext(ctx))
_, err = client.Services.DeleteDroneCIService(_repo.ID, gitlab.WithContext(ctx))
return err
}
@@ -441,12 +441,12 @@ func (g *Gitlab) Branches(ctx context.Context, user *model.User, repo *model.Rep
return nil, err
}
repo_, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
if err != nil {
return nil, err
}
gitlabBranches, _, err := client.Branches.ListBranches(repo_.ID, &gitlab.ListBranchesOptions{}, gitlab.WithContext(ctx))
gitlabBranches, _, err := client.Branches.ListBranches(_repo.ID, &gitlab.ListBranchesOptions{}, gitlab.WithContext(ctx))
if err != nil {
return nil, err
}

8
server/remote/gitlab/gitlab_test.go
View File

@@ -30,15 +30,15 @@ import (
)
func load(config string) *Gitlab {
url_, err := url.Parse(config)
_url, err := url.Parse(config)
if err != nil {
panic(err)
}
params := url_.Query()
url_.RawQuery = ""
params := _url.Query()
_url.RawQuery = ""
gitlab := Gitlab{}
gitlab.URL = url_.String()
gitlab.URL = _url.String()
gitlab.ClientID = params.Get("client_id")
gitlab.ClientSecret = params.Get("client_secret")
gitlab.SkipVerify, _ = strconv.ParseBool(params.Get("skip_verify"))

10
server/router/middleware/session/repo.go
View File

@@ -41,13 +41,13 @@ func Repo(c *gin.Context) *model.Repo {
func SetRepo() gin.HandlerFunc {
return func(c *gin.Context) {
var (
store_ = store.FromContext(c)
_store = store.FromContext(c)
owner = c.Param("owner")
name = c.Param("name")
user = User(c)
)
repo, err := store_.GetRepoName(owner + "/" + name)
repo, err := _store.GetRepoName(owner + "/" + name)
if err == nil {
c.Set("repo", repo)
c.Next()
@@ -83,7 +83,7 @@ func Perm(c *gin.Context) *model.Perm {
func SetPerm() gin.HandlerFunc {
return func(c *gin.Context) {
store_ := store.FromContext(c)
_store := store.FromContext(c)
user := User(c)
repo := Repo(c)
perm := new(model.Perm)
@@ -91,7 +91,7 @@ func SetPerm() gin.HandlerFunc {
switch {
case user != nil:
var err error
perm, err = store_.PermFind(user, repo)
perm, err = _store.PermFind(user, repo)
if err != nil {
log.Error().Msgf("Error fetching permission for %s %s. %s",
user.Login, repo.FullName, err)
@@ -103,7 +103,7 @@ func SetPerm() gin.HandlerFunc {
perm.Repo = repo.FullName
perm.UserID = user.ID
perm.Synced = time.Now().Unix()
if err := store_.PermUpsert(perm); err != nil {
if err := _store.PermUpsert(perm); err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
return
}

4
server/router/middleware/token/token.go
View File

@@ -36,8 +36,8 @@ func Refresh(c *gin.Context) {
// check if the remote includes the ability to
// refresh the user token.
remote_ := server.Config.Services.Remote
refresher, ok := remote_.(remote.Refresher)
_remote := server.Config.Services.Remote
refresher, ok := _remote.(remote.Refresher)
if !ok {
c.Next()
return

8
server/shared/buildStatus_test.go
View File

@@ -50,7 +50,7 @@ func TestUpdateToStatusPending(t *testing.T) {
if model.StatusPending != build.Status {
t.Errorf("Build status not equals '%s' != '%s'", model.StatusPending, build.Status)
} else if "Reviewer" != build.Reviewer {
} else if build.Reviewer != "Reviewer" {
t.Errorf("Reviewer not equals 'Reviewer' != '%s'", build.Reviewer)
} else if now > build.Reviewed {
t.Errorf("Reviewed not updated %d !< %d", now, build.Reviewed)
@@ -66,7 +66,7 @@ func TestUpdateToStatusDeclined(t *testing.T) {
if model.StatusDeclined != build.Status {
t.Errorf("Build status not equals '%s' != '%s'", model.StatusDeclined, build.Status)
} else if "Reviewer" != build.Reviewer {
} else if build.Reviewer != "Reviewer" {
t.Errorf("Reviewer not equals 'Reviewer' != '%s'", build.Reviewer)
} else if now > build.Reviewed {
t.Errorf("Reviewed not updated %d !< %d", now, build.Reviewed)
@@ -78,7 +78,7 @@ func TestUpdateToStatusToDone(t *testing.T) {
build, _ := UpdateStatusToDone(&mockUpdateBuildStore{}, model.Build{}, "status", int64(1))
if "status" != build.Status {
if build.Status != "status" {
t.Errorf("Build status not equals 'status' != '%s'", build.Status)
} else if int64(1) != build.Finished {
t.Errorf("Build finished not equals 1 != %d", build.Finished)
@@ -92,7 +92,7 @@ func TestUpdateToStatusError(t *testing.T) {
build, _ := UpdateToStatusError(&mockUpdateBuildStore{}, model.Build{}, errors.New("error"))
if "error" != build.Error {
if build.Error != "error" {
t.Errorf("Build error not equals 'error' != '%s'", build.Error)
} else if model.StatusError != build.Status {
t.Errorf("Build status not equals '%s' != '%s'", model.StatusError, build.Status)

34
server/shared/configFetcher.go
View File

@@ -13,19 +13,23 @@ import (
"github.com/woodpecker-ci/woodpecker/server/remote"
)
type configFetcher struct {
remote_ remote.Remote
user *model.User
repo *model.Repo
build *model.Build
type ConfigFetcher interface {
Fetch(ctx context.Context) (files []*remote.FileMeta, err error)
}
func NewConfigFetcher(remote remote.Remote, user *model.User, repo *model.Repo, build *model.Build) *configFetcher {
type configFetcher struct {
remote remote.Remote
user *model.User
repo *model.Repo
build *model.Build
}
func NewConfigFetcher(remote remote.Remote, user *model.User, repo *model.Repo, build *model.Build) ConfigFetcher {
return &configFetcher{
remote_: remote,
user: user,
repo: repo,
build: build,
remote: remote,
user: user,
repo: repo,
build: build,
}
}
@@ -58,7 +62,7 @@ func (cf *configFetcher) fetch(c context.Context, timeout time.Duration, config
log.Trace().Msgf("ConfigFetch[%s]: use user config '%s'", cf.repo.FullName, config)
// either a file
if !strings.HasSuffix(config, "/") {
file, err := cf.remote_.File(ctx, cf.user, cf.repo, cf.build, config)
file, err := cf.remote.File(ctx, cf.user, cf.repo, cf.build, config)
if err == nil && len(file) != 0 {
log.Trace().Msgf("ConfigFetch[%s]: found file '%s'", cf.repo.FullName, config)
return []*remote.FileMeta{{
@@ -69,7 +73,7 @@ func (cf *configFetcher) fetch(c context.Context, timeout time.Duration, config
}
// or a folder
files, err := cf.remote_.Dir(ctx, cf.user, cf.repo, cf.build, strings.TrimSuffix(config, "/"))
files, err := cf.remote.Dir(ctx, cf.user, cf.repo, cf.build, strings.TrimSuffix(config, "/"))
if err == nil && len(files) != 0 {
log.Trace().Msgf("ConfigFetch[%s]: found %d files in '%s'", cf.repo.FullName, len(files), config)
return filterPipelineFiles(files), nil
@@ -84,7 +88,7 @@ func (cf *configFetcher) fetch(c context.Context, timeout time.Duration, config
// test .woodpecker/ folder
// if folder is not supported we will get a "Not implemented" error and continue
config = ".woodpecker"
files, err := cf.remote_.Dir(ctx, cf.user, cf.repo, cf.build, config)
files, err := cf.remote.Dir(ctx, cf.user, cf.repo, cf.build, config)
files = filterPipelineFiles(files)
if err == nil && len(files) != 0 {
log.Trace().Msgf("ConfigFetch[%s]: found %d files in '%s'", cf.repo.FullName, len(files), config)
@@ -92,7 +96,7 @@ func (cf *configFetcher) fetch(c context.Context, timeout time.Duration, config
}
config = ".woodpecker.yml"
file, err := cf.remote_.File(ctx, cf.user, cf.repo, cf.build, config)
file, err := cf.remote.File(ctx, cf.user, cf.repo, cf.build, config)
if err == nil && len(file) != 0 {
log.Trace().Msgf("ConfigFetch[%s]: found file '%s'", cf.repo.FullName, config)
return []*remote.FileMeta{{
@@ -102,7 +106,7 @@ func (cf *configFetcher) fetch(c context.Context, timeout time.Duration, config
}
config = ".drone.yml"
file, err = cf.remote_.File(ctx, cf.user, cf.repo, cf.build, config)
file, err = cf.remote.File(ctx, cf.user, cf.repo, cf.build, config)
if err == nil && len(file) != 0 {
log.Trace().Msgf("ConfigFetch[%s]: found file '%s'", cf.repo.FullName, config)
return []*remote.FileMeta{{

4
server/shared/procBuilder.go
View File

@@ -88,7 +88,7 @@ func (b *ProcBuilder) Build() ([]*BuildItem, error) {
environ := b.environmentVariables(metadata, axis)
// substitute vars
substituted, err := b.envsubst_(string(y.Data), environ)
substituted, err := b.envsubst(string(y.Data), environ)
if err != nil {
return nil, err
}
@@ -175,7 +175,7 @@ func containsItemWithName(name string, items []*BuildItem) bool {
return false
}
func (b *ProcBuilder) envsubst_(y string, environ map[string]string) (string, error) {
func (b *ProcBuilder) envsubst(y string, environ map[string]string) (string, error) {
return envsubst.Eval(y, func(name string) string {
env := environ[name]
if strings.Contains(env, "\n") {

4
server/shared/procBuilder_test.go
View File

@@ -332,7 +332,7 @@ depends_on: [ zerostep ]
if len(buildItems) != 1 {
t.Fatal("Zerostep and the step that depends on it should not generate a build item")
}
if "justastep" != buildItems[0].Proc.Name {
if buildItems[0].Proc.Name != "justastep" {
t.Fatal("justastep should have been generated")
}
}
@@ -386,7 +386,7 @@ depends_on: [ shouldbefiltered ]
if len(buildItems) != 1 {
t.Fatal("Zerostep and the step that depends on it, and the one depending on it should not generate a build item")
}
if "justastep" != buildItems[0].Proc.Name {
if buildItems[0].Proc.Name != "justastep" {
t.Fatal("justastep should have been generated")
}
}

6
server/shared/userSyncer.go
View File

@@ -45,11 +45,7 @@ func NamespaceFilter(namespaces map[string]bool) FilterFunc {
return noopFilter
}
return func(repo *model.Repo) bool {
if namespaces[repo.Owner] {
return true
} else {
return false
}
return namespaces[repo.Owner]
}
}

1
server/store/datastore/init_cgo.go
View File

@@ -18,6 +18,7 @@
package datastore
import (
// blank imports to register the sql drivers
_ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"

6
server/store/datastore/permission.go
View File

@@ -51,11 +51,11 @@ func (s storage) permUpsert(sess *xorm.Session, perm *model.Perm) error {
// lookup repo based on name if possible
if perm.RepoID == 0 && len(perm.Repo) != 0 {
if r, err := s.getRepoName(sess, perm.Repo); err != nil {
r, err := s.getRepoName(sess, perm.Repo)
if err != nil {
return err
} else {
perm.RepoID = r.ID
}
perm.RepoID = r.ID
}
exist, err := sess.Where("perm_user_id = ? AND perm_repo_id = ?", perm.UserID, perm.RepoID).

2
server/web/web.go
View File

@@ -36,7 +36,7 @@ func New() *gin.Engine {
e.Use(setupCache)
h := http.FileServer(web.HttpFS())
h := http.FileServer(web.HTTPFS())
e.GET("/favicon.svg", gin.WrapH(h))
e.GET("/assets/*filepath", gin.WrapH(h))

6
shared/httputil/httputil.go
View File

@@ -19,11 +19,11 @@ import (
"strings"
)
// IsHttps is a helper function that evaluates the http.Request
// IsHTTPS is a helper function that evaluates the http.Request
// and returns True if the Request uses HTTPS. It is able to detect,
// using the X-Forwarded-Proto, if the original request was HTTPS and
// routed through a reverse proxy with SSL termination.
func IsHttps(r *http.Request) bool {
func IsHTTPS(r *http.Request) bool {
switch {
case r.URL.Scheme == "https":
return true
@@ -46,7 +46,7 @@ func SetCookie(w http.ResponseWriter, r *http.Request, name, value string) {
Path: "/",
Domain: r.URL.Host,
HttpOnly: true,
Secure: IsHttps(r),
Secure: IsHTTPS(r),
MaxAge: 2147483647, // the cooke value (token) is responsible for expiration
}

30
shared/oauth2/oauth2.go
View File

@@ -104,9 +104,9 @@ func (f CacheFile) PutToken(tok *Token) error {
// Config is the configuration of an OAuth consumer.
type Config struct {
// ClientId is the OAuth client identifier used when communicating with
// ClientID is the OAuth client identifier used when communicating with
// the configured OAuth provider.
ClientId string
ClientID string
// ClientSecret is the OAuth client secret used when communicating with
// the configured OAuth provider.
@@ -214,28 +214,28 @@ func (t *Transport) transport() http.RoundTripper {
// AuthCodeURL returns a URL that the end-user should be redirected to,
// so that they may obtain an authorization code.
func (c *Config) AuthCodeURL(state string) string {
url_, err := url.Parse(c.AuthURL)
_url, err := url.Parse(c.AuthURL)
if err != nil {
panic("AuthURL malformed: " + err.Error())
}
if err := url_.Query().Get("error"); err != "" {
if err := _url.Query().Get("error"); err != "" {
panic("AuthURL contains error: " + err)
}
q := url.Values{
"response_type": {"code"},
"client_id": {c.ClientId},
"client_id": {c.ClientID},
"state": condVal(state),
"scope": condVal(c.Scope),
"redirect_uri": condVal(c.RedirectURL),
"access_type": condVal(c.AccessType),
"approval_prompt": condVal(c.ApprovalPrompt),
}.Encode()
if url_.RawQuery == "" {
url_.RawQuery = q
if _url.RawQuery == "" {
_url.RawQuery = q
} else {
url_.RawQuery += "&" + q
_url.RawQuery += "&" + q
}
return url_.String()
return _url.String()
}
func condVal(v string) []string {
@@ -382,7 +382,7 @@ func (t *Transport) AuthenticateClient() error {
// updateToken mutates both tok and v.
func (t *Transport) updateToken(tok *Token, v url.Values) error {
v.Set("client_id", t.ClientId)
v.Set("client_id", t.ClientID)
v.Set("client_secret", t.ClientSecret)
client := &http.Client{Transport: t.transport()}
req, err := http.NewRequest("POST", t.TokenURL, strings.NewReader(v.Encode()))
@@ -390,7 +390,7 @@ func (t *Transport) updateToken(tok *Token, v url.Values) error {
return err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.SetBasicAuth(t.ClientId, t.ClientSecret)
req.SetBasicAuth(t.ClientID, t.ClientSecret)
r, err := client.Do(req)
if err != nil {
return err
@@ -403,7 +403,7 @@ func (t *Transport) updateToken(tok *Token, v url.Values) error {
Access string `json:"access_token"`
Refresh string `json:"refresh_token"`
ExpiresIn int64 `json:"expires_in"` // seconds
Id string `json:"id_token"`
ID string `json:"id_token"`
}
body, err := ioutil.ReadAll(io.LimitReader(r.Body, 1<<20))
@@ -422,7 +422,7 @@ func (t *Transport) updateToken(tok *Token, v url.Values) error {
b.Access = vals.Get("access_token")
b.Refresh = vals.Get("refresh_token")
b.ExpiresIn, _ = strconv.ParseInt(vals.Get("expires_in"), 10, 64)
b.Id = vals.Get("id_token")
b.ID = vals.Get("id_token")
default:
if err = json.Unmarshal(body, &b); err != nil {
return fmt.Errorf("got bad response from server: %q", body)
@@ -441,11 +441,11 @@ func (t *Transport) updateToken(tok *Token, v url.Values) error {
} else {
tok.Expiry = time.Now().Add(time.Duration(b.ExpiresIn) * time.Second)
}
if b.Id != "" {
if b.ID != "" {
if tok.Extra == nil {
tok.Extra = make(map[string]string)
}
tok.Extra["id_token"] = b.Id
tok.Extra["id_token"] = b.ID
}
return nil
}

2
shared/yml/yml.go
View File

@@ -50,7 +50,7 @@ func convertMapI2MapS(v interface{}) interface{} {
return v
}
func LoadYmlFileAsJson(path string) ([]byte, error) {
func LoadYmlFileAsJSON(path string) ([]byte, error) {
data, err := os.ReadFile(path)
if err != nil {
return nil, err

4
web/web.go
View File

@@ -10,7 +10,7 @@ import (
//go:embed dist/*
var webFiles embed.FS
func HttpFS() http.FileSystem {
func HTTPFS() http.FileSystem {
httpFS, err := fs.Sub(webFiles, "dist")
if err != nil {
panic(err)
@@ -20,7 +20,7 @@ func HttpFS() http.FileSystem {
}
func Lookup(path string) (buf []byte, err error) {
file, err := HttpFS().Open(path)
file, err := HTTPFS().Open(path)
if err != nil {
return nil, err
}