ddmt/gitdts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use ctx in models

Browse Source
This commit is contained in:
Jason Song
2022-12-06 14:15:48 +08:00
parent c07d0c1768
commit 56368f3963
14 changed files with 87 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
routers/api/actions/runner/runner.go
View File

@@ -42,7 +42,7 @@ func (s *Service) Register(
return nil, errors.New("missing runner token, name")
}
runnerToken, err := actions_model.GetRunnerToken(req.Msg.Token)
runnerToken, err := actions_model.GetRunnerToken(ctx, req.Msg.Token)
if err != nil {
return nil, errors.New("runner token not found")
}
@@ -65,7 +65,7 @@ func (s *Service) Register(
}
// create new runner
if err := actions_model.NewRunner(ctx, runner); err != nil {
if err := actions_model.CreateRunner(ctx, runner); err != nil {
return nil, errors.New("can't create new runner")
}
@@ -146,7 +146,7 @@ func (s *Service) UpdateTask(
}), nil
}
task, err = actions_model.UpdateTaskByState(req.Msg.State)
task, err = actions_model.UpdateTaskByState(ctx, req.Msg.State)
if err != nil {
return nil, status.Errorf(codes.Internal, "update task: %v", err)
}

6
routers/api/actions/runner/unary.go
View File

@@ -6,12 +6,14 @@ package runner
import (
"context"
"crypto/subtle"
"errors"
"strings"
actions_model "code.gitea.io/gitea/models/actions"
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/bufbuild/connect-go"
"google.golang.org/grpc/codes"
@@ -31,9 +33,9 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar
}
uuid := request.Header().Get(uuidHeaderKey)
token := request.Header().Get(tokenHeaderKey)
runner, err := actions_model.GetRunnerByUUID(uuid)
runner, err := actions_model.GetRunnerByUUID(ctx, uuid)
if err != nil {
if _, ok := err.(actions_model.ErrRunnerNotExist); ok {
if errors.Is(err, util.ErrNotExist) {
return nil, status.Error(codes.Unauthenticated, "unregistered runner")
}
return nil, status.Error(codes.Internal, err.Error())