From 56e6639396d32beb7096579ed073a98c1ce37a50 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 19 Mar 2023 18:32:19 +0100 Subject: [PATCH] Refactor nits (#1652) - https://github.com/woodpecker-ci/woodpecker/pull/1641/files#r1141405630 - https://github.com/woodpecker-ci/woodpecker/commit/ade8e6d010d2a1bebe08c17dfebca021c61b626d#r105091268 - https://github.com/woodpecker-ci/woodpecker/pull/1647/files#r1141410010 --------- Co-authored-by: Anbraten --- Makefile | 4 ++++ pipeline/rpc/proto/woodpecker_grpc.pb.go | 16 ++++++++++++---- server/api/agent.go | 1 + server/api/badge.go | 5 ++--- server/api/file.go | 1 + server/api/global_secret.go | 1 + server/api/helper.go | 2 +- server/api/login.go | 2 +- server/api/org_secret.go | 1 + server/api/repo_secret.go | 1 + server/api/users.go | 1 + server/forge/bitbucket/bitbucket.go | 3 +-- server/forge/bitbucketserver/bitbucketserver.go | 3 +-- server/forge/gogs/gogs.go | 3 +-- server/router/middleware/session/repo.go | 2 +- woodpecker-go/woodpecker/client.go | 15 +++++---------- 16 files changed, 35 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index f44308c14..f5281713c 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,10 @@ clean: ## Clean build artifacts rm -rf build @[ "1" != "$(shell docker image ls woodpecker/make:local -a | wc -l)" ] && docker image rm woodpecker/make:local || echo no docker image to clean +.PHONY: generate +generate: ## Run all code generations + go generate ./... + check-xgo: ## Check if xgo is installed @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) install src.techknowlogick.com/xgo@latest; \ diff --git a/pipeline/rpc/proto/woodpecker_grpc.pb.go b/pipeline/rpc/proto/woodpecker_grpc.pb.go index 229103f63..e1009b421 100644 --- a/pipeline/rpc/proto/woodpecker_grpc.pb.go +++ b/pipeline/rpc/proto/woodpecker_grpc.pb.go @@ -8,6 +8,7 @@ package proto import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -163,36 +164,44 @@ type WoodpeckerServer interface { } // UnimplementedWoodpeckerServer must be embedded to have forward compatible implementations. -type UnimplementedWoodpeckerServer struct { -} +type UnimplementedWoodpeckerServer struct{} func (UnimplementedWoodpeckerServer) Next(context.Context, *NextRequest) (*NextReply, error) { return nil, status.Errorf(codes.Unimplemented, "method Next not implemented") } + func (UnimplementedWoodpeckerServer) Init(context.Context, *InitRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Init not implemented") } + func (UnimplementedWoodpeckerServer) Wait(context.Context, *WaitRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Wait not implemented") } + func (UnimplementedWoodpeckerServer) Done(context.Context, *DoneRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Done not implemented") } + func (UnimplementedWoodpeckerServer) Extend(context.Context, *ExtendRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Extend not implemented") } + func (UnimplementedWoodpeckerServer) Update(context.Context, *UpdateRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Update not implemented") } + func (UnimplementedWoodpeckerServer) Upload(context.Context, *UploadRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Upload not implemented") } + func (UnimplementedWoodpeckerServer) Log(context.Context, *LogRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Log not implemented") } + func (UnimplementedWoodpeckerServer) RegisterAgent(context.Context, *RegisterAgentRequest) (*RegisterAgentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisterAgent not implemented") } + func (UnimplementedWoodpeckerServer) ReportHealth(context.Context, *ReportHealthRequest) (*Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method ReportHealth not implemented") } @@ -478,8 +487,7 @@ type WoodpeckerAuthServer interface { } // UnimplementedWoodpeckerAuthServer must be embedded to have forward compatible implementations. -type UnimplementedWoodpeckerAuthServer struct { -} +type UnimplementedWoodpeckerAuthServer struct{} func (UnimplementedWoodpeckerAuthServer) Auth(context.Context, *AuthRequest) (*AuthReply, error) { return nil, status.Errorf(codes.Unimplemented, "method Auth not implemented") diff --git a/server/api/agent.go b/server/api/agent.go index 52731a6b5..3582fd917 100644 --- a/server/api/agent.go +++ b/server/api/agent.go @@ -21,6 +21,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/api/badge.go b/server/api/badge.go index 4ff4f73ba..8d8bfc0a9 100644 --- a/server/api/badge.go +++ b/server/api/badge.go @@ -23,15 +23,14 @@ import ( "fmt" "net/http" - "github.com/rs/zerolog/log" - "github.com/woodpecker-ci/woodpecker/server/store/types" - "github.com/gin-gonic/gin" + "github.com/rs/zerolog/log" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/badges" "github.com/woodpecker-ci/woodpecker/server/ccmenu" "github.com/woodpecker-ci/woodpecker/server/store" + "github.com/woodpecker-ci/woodpecker/server/store/types" ) func GetBadge(c *gin.Context) { diff --git a/server/api/file.go b/server/api/file.go index 9bc47dee8..519903aea 100644 --- a/server/api/file.go +++ b/server/api/file.go @@ -23,6 +23,7 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/store" ) diff --git a/server/api/global_secret.go b/server/api/global_secret.go index fc90d2ffc..500ffe86f 100644 --- a/server/api/global_secret.go +++ b/server/api/global_secret.go @@ -18,6 +18,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/model" ) diff --git a/server/api/helper.go b/server/api/helper.go index e55572346..e51e2a3dc 100644 --- a/server/api/helper.go +++ b/server/api/helper.go @@ -20,13 +20,13 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "github.com/woodpecker-ci/woodpecker/server/store/types" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/forge" "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/pipeline" "github.com/woodpecker-ci/woodpecker/server/store" + "github.com/woodpecker-ci/woodpecker/server/store/types" ) func handlePipelineErr(c *gin.Context, err error) { diff --git a/server/api/login.go b/server/api/login.go index 9419b8025..f1f491a75 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -23,11 +23,11 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "github.com/woodpecker-ci/woodpecker/server/store/types" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store" + "github.com/woodpecker-ci/woodpecker/server/store/types" "github.com/woodpecker-ci/woodpecker/shared/httputil" "github.com/woodpecker-ci/woodpecker/shared/token" ) diff --git a/server/api/org_secret.go b/server/api/org_secret.go index e2204a208..900f5a579 100644 --- a/server/api/org_secret.go +++ b/server/api/org_secret.go @@ -18,6 +18,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/model" ) diff --git a/server/api/repo_secret.go b/server/api/repo_secret.go index bf5142d22..9c7b88850 100644 --- a/server/api/repo_secret.go +++ b/server/api/repo_secret.go @@ -19,6 +19,7 @@ import ( "strings" "github.com/gin-gonic/gin" + "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" diff --git a/server/api/users.go b/server/api/users.go index 60f52c7c4..fd610da00 100644 --- a/server/api/users.go +++ b/server/api/users.go @@ -20,6 +20,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store" ) diff --git a/server/forge/bitbucket/bitbucket.go b/server/forge/bitbucket/bitbucket.go index 5244b0f08..ba536b5f5 100644 --- a/server/forge/bitbucket/bitbucket.go +++ b/server/forge/bitbucket/bitbucket.go @@ -17,7 +17,6 @@ package bitbucket import ( "context" - "errors" "fmt" "net/http" "net/url" @@ -304,7 +303,7 @@ func (c *config) BranchHead(_ context.Context, _ *model.User, _ *model.Repo, _ s } func (c *config) PullRequests(_ context.Context, _ *model.User, _ *model.Repo, _ *model.PaginationData) ([]*model.PullRequest, error) { - return nil, errors.New("Bitbucket does not support pull requests yet") + return nil, forge_types.ErrNotImplemented } // Hook parses the incoming Bitbucket hook and returns the Repository and diff --git a/server/forge/bitbucketserver/bitbucketserver.go b/server/forge/bitbucketserver/bitbucketserver.go index 8112152df..c6d3528a1 100644 --- a/server/forge/bitbucketserver/bitbucketserver.go +++ b/server/forge/bitbucketserver/bitbucketserver.go @@ -24,7 +24,6 @@ import ( "crypto/tls" "crypto/x509" "encoding/pem" - "errors" "fmt" "net/http" "os" @@ -246,7 +245,7 @@ func (c *Config) BranchHead(_ context.Context, _ *model.User, _ *model.Repo, _ s } func (c *Config) PullRequests(_ context.Context, _ *model.User, _ *model.Repo, _ *model.PaginationData) ([]*model.PullRequest, error) { - return nil, errors.New("Bitbucket server does not support pull requests yet") + return nil, forge_types.ErrNotImplemented } func (c *Config) Deactivate(ctx context.Context, u *model.User, r *model.Repo, link string) error { diff --git a/server/forge/gogs/gogs.go b/server/forge/gogs/gogs.go index b7b97a52f..22781165e 100644 --- a/server/forge/gogs/gogs.go +++ b/server/forge/gogs/gogs.go @@ -18,7 +18,6 @@ package gogs import ( "context" "crypto/tls" - "errors" "fmt" "net" "net/http" @@ -301,7 +300,7 @@ func (c *client) BranchHead(_ context.Context, u *model.User, r *model.Repo, bra } func (c *client) PullRequests(_ context.Context, _ *model.User, _ *model.Repo, _ *model.PaginationData) ([]*model.PullRequest, error) { - return nil, errors.New("Gogs does not support pull requests yet") + return nil, forge_types.ErrNotImplemented } // Hook parses the incoming Gogs hook and returns the Repository and Pipeline diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go index 67c29c99e..36291d7ca 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -21,11 +21,11 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "github.com/woodpecker-ci/woodpecker/server/store/types" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store" + "github.com/woodpecker-ci/woodpecker/server/store/types" ) func Repo(c *gin.Context) *model.Repo { diff --git a/woodpecker-go/woodpecker/client.go b/woodpecker-go/woodpecker/client.go index a24d95cb6..c8976101c 100644 --- a/woodpecker-go/woodpecker/client.go +++ b/woodpecker-go/woodpecker/client.go @@ -295,7 +295,7 @@ func (c *client) PipelineLogs(owner, name string, num, step int) ([]*Logs, error func (c *client) Deploy(owner, name string, num int, env string, params map[string]string) (*Pipeline, error) { out := new(Pipeline) val := mapValues(params) - val.Set("event", "deployment") + val.Set("event", EventDeploy) val.Set("deploy_to", env) uri := fmt.Sprintf(pathPipeline, c.addr, owner, name, num) err := c.post(uri+"?"+val.Encode(), nil, out) @@ -521,27 +521,22 @@ func (c *client) CronGet(owner, repo string, cronID int64) (*Cron, error) { // helper function for making an http GET request. func (c *client) get(rawurl string, out interface{}) error { - return c.do(rawurl, "GET", nil, out) + return c.do(rawurl, http.MethodGet, nil, out) } // helper function for making an http POST request. func (c *client) post(rawurl string, in, out interface{}) error { - return c.do(rawurl, "POST", in, out) + return c.do(rawurl, http.MethodPost, in, out) } -// helper function for making an http PUT request. -// func (c *client) put(rawurl string, in, out interface{}) error { -// return c.do(rawurl, "PUT", in, out) -// } - // helper function for making an http PATCH request. func (c *client) patch(rawurl string, in, out interface{}) error { - return c.do(rawurl, "PATCH", in, out) + return c.do(rawurl, http.MethodPatch, in, out) } // helper function for making an http DELETE request. func (c *client) delete(rawurl string) error { - return c.do(rawurl, "DELETE", nil, nil) + return c.do(rawurl, http.MethodDelete, nil, nil) } // helper function to make an http request