mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-16 21:46:32 +00:00
Code Issues Projects Releases Wiki Activity

fix: addon JSON pointers (#4508)

Browse source 
Signed-off-by: jolheiser <git@jolheiser.com>
This commit is contained in:
John Olheiser 2024-12-03 12:58:42 -06:00 committed by GitHub
parent db45794091
commit 9f0611d1a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/docs/30-administration/11-forges/100-addon.md
View file

@ -38,7 +38,7 @@ Addons use RPC to communicate to the server and are implemented using the [`go-p
This example will use the Go language. This example will use the Go language.
Directly import Woodpecker's Go packages (`go.woodpecker-ci.org/woodpecker/woodpecker/v2`) and use the interfaces and types defined there. Directly import Woodpecker's Go packages (`go.woodpecker-ci.org/woodpecker/v2`) and use the interfaces and types defined there.
In the `main` function, just call `"go.woodpecker-ci.org/woodpecker/v2/server/forge/addon".Serve` with a `"go.woodpecker-ci.org/woodpecker/v2/server/forge".Forge` as argument. In the `main` function, just call `"go.woodpecker-ci.org/woodpecker/v2/server/forge/addon".Serve` with a `"go.woodpecker-ci.org/woodpecker/v2/server/forge".Forge` as argument.
This will take care of connecting the addon forge to the server. This will take care of connecting the addon forge to the server.

4
server/forge/addon/client.go
View file

@ -139,8 +139,8 @@ func (g *RPC) Repo(_ context.Context, u *model.User, remoteID model.ForgeRemoteI
return nil, err return nil, err
} }
var resp *modelRepo var resp modelRepo
err = json.Unmarshal(jsonResp, resp) err = json.Unmarshal(jsonResp, &resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }

14
server/forge/addon/server.go
View file

@ -54,8 +54,8 @@ func (s *RPCServer) URL(_ []byte, resp *string) error {
} }
func (s *RPCServer) Teams(args []byte, resp *[]byte) error { func (s *RPCServer) Teams(args []byte, resp *[]byte) error {
var a *modelUser var a modelUser
err := json.Unmarshal(args, a) err := json.Unmarshal(args, &a)
if err != nil { if err != nil {
return err return err
} }
@ -82,8 +82,8 @@ func (s *RPCServer) Repo(args []byte, resp *[]byte) error {
} }
func (s *RPCServer) Repos(args []byte, resp *[]byte) error { func (s *RPCServer) Repos(args []byte, resp *[]byte) error {
var a *modelUser var a modelUser
err := json.Unmarshal(args, a) err := json.Unmarshal(args, &a)
if err != nil { if err != nil {
return err return err
} }
@ -261,12 +261,12 @@ func (s *RPCServer) Hook(args []byte, resp *[]byte) error {
} }
func (s *RPCServer) Login(args []byte, resp *[]byte) error { func (s *RPCServer) Login(args []byte, resp *[]byte) error {
var a *types.OAuthRequest var a types.OAuthRequest
err := json.Unmarshal(args, a) err := json.Unmarshal(args, &a)
if err != nil { if err != nil {
return err return err
} }
user, red, err := s.Impl.Login(mkCtx(), a) user, red, err := s.Impl.Login(mkCtx(), &a)
if err != nil { if err != nil {
return err return err
} }

2
server/services/config/forge.go
View file

@ -140,9 +140,9 @@ func (f *forgeFetcherContext) checkPipelineFile(c context.Context, config string
func (f *forgeFetcherContext) getFirstAvailableConfig(c context.Context, configs []string) ([]*types.FileMeta, error) { func (f *forgeFetcherContext) getFirstAvailableConfig(c context.Context, configs []string) ([]*types.FileMeta, error) {
var forgeErr []error var forgeErr []error
for _, fileOrFolder := range configs { for _, fileOrFolder := range configs {
log.Trace().Msgf("fetching %s from forge", fileOrFolder)
if strings.HasSuffix(fileOrFolder, "/") { if strings.HasSuffix(fileOrFolder, "/") {
// config is a folder // config is a folder
log.Trace().Msgf("fetching %s from forge", fileOrFolder)
files, err := f.forge.Dir(c, f.user, f.repo, f.pipeline, strings.TrimSuffix(fileOrFolder, "/")) files, err := f.forge.Dir(c, f.user, f.repo, f.pipeline, strings.TrimSuffix(fileOrFolder, "/"))
// if folder is not supported we will get a "Not implemented" error and continue // if folder is not supported we will get a "Not implemented" error and continue
if err != nil { if err != nil {