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

refactor: rename to actions

Browse Source
This commit is contained in:
Jason Song
2022-12-06 15:16:25 +08:00
parent 56368f3963
commit 223782ca4c
50 changed files with 247 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/actions/actions.go
View File

@@ -13,7 +13,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/models/webhook"
bots_module "code.gitea.io/gitea/modules/actions"
actions_module "code.gitea.io/gitea/modules/actions"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/queue"
@@ -21,7 +21,7 @@ import (
)
func Init() {
jobEmitterQueue = queue.CreateUniqueQueue("bots_ready_job", jobEmitterQueueHandle, new(jobUpdate))
jobEmitterQueue = queue.CreateUniqueQueue("actions_ready_job", jobEmitterQueueHandle, new(jobUpdate))
go graceful.GetManager().RunWithShutdownFns(jobEmitterQueue.Run)
}
@@ -34,19 +34,19 @@ func DeleteResourceOfRepository(ctx context.Context, repo *repo_model.Repository
if err := db.WithTx(ctx, func(ctx context.Context) error {
e := db.GetEngine(ctx)
if _, err := e.Delete(&actions_model.ActionTaskStep{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots task steps of repo %d: %w", repo.ID, err)
return fmt.Errorf("delete actions task steps of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&actions_model.ActionTask{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots tasks of repo %d: %w", repo.ID, err)
return fmt.Errorf("delete actions tasks of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&actions_model.ActionRunJob{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots run jobs of repo %d: %w", repo.ID, err)
return fmt.Errorf("delete actions run jobs of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&actions_model.ActionRun{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots runs of repo %d: %w", repo.ID, err)
return fmt.Errorf("delete actions runs of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&actions_model.ActionRunner{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots runner of repo %d: %w", repo.ID, err)
return fmt.Errorf("delete actions runner of repo %d: %w", repo.ID, err)
}
return nil
}); err != nil {
@@ -55,7 +55,7 @@ func DeleteResourceOfRepository(ctx context.Context, repo *repo_model.Repository
// remove logs file after tasks have been deleted, to avoid new log files
for _, task := range tasks {
err := bots_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename)
err := actions_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename)
if err != nil {
log.Error("remove log file %q: %v", task.LogFilename, err)
// go on

6
services/auth/basic.go
View File

@@ -113,10 +113,10 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
if err == nil && task != nil {
log.Trace("Basic Authorization: Valid AccessToken for task[%d]", task.ID)
store.GetData()["IsBotToken"] = true
store.GetData()["BotTaskID"] = task.ID
store.GetData()["IsActionsToken"] = true
store.GetData()["ActionsTaskID"] = task.ID
return user_model.NewBotUser()
return user_model.NewActionsUser()
}
if !setting.Service.EnableBasicAuth {

8
services/auth/oauth2.go
View File

@@ -98,10 +98,10 @@ func (o *OAuth2) userIDFromToken(req *http.Request, store DataStore) int64 {
if err == nil && task != nil {
log.Trace("Basic Authorization: Valid AccessToken for task[%d]", task.ID)
store.GetData()["IsBotToken"] = true
store.GetData()["BotTaskID"] = task.ID
store.GetData()["IsActionsToken"] = true
store.GetData()["ActionsTaskID"] = task.ID
return user_model.BotUserID
return user_model.ActionsUserID
}
} else if !auth_model.IsErrAccessTokenNotExist(err) && !auth_model.IsErrAccessTokenEmpty(err) {
log.Error("GetAccessTokenBySHA: %v", err)
@@ -130,7 +130,7 @@ func (o *OAuth2) Verify(req *http.Request, w http.ResponseWriter, store DataStor
}
id := o.userIDFromToken(req, store)
if id == -1 || id <= -3 { // -2 means bots, so we need to allow it.
if id == -1 || id <= -3 { // -2 means actions, so we need to allow it.
return nil
}
log.Trace("OAuth2 Authorization: Found token for user[%d]", id)

2
services/cron/cron.go
View File

@@ -30,7 +30,7 @@ func NewContext(original context.Context) {
_, _, finished := process.GetManager().AddTypedContext(graceful.GetManager().ShutdownContext(), "Service: Cron", process.SystemProcessType, true)
initBasicTasks()
initExtendedTasks()
initBotsTasks()
initActionsTasks()
lock.Lock()
for _, task := range tasks {

2
services/cron/tasks_actions.go
View File

@@ -10,7 +10,7 @@ import (
actions_service "code.gitea.io/gitea/services/actions"
)
func initBotsTasks() {
func initActionsTasks() {
registerStopZombieTasks()
registerStopEndlessTasks()
registerCancelAbandonedJobs()

2
services/forms/repo_form.go
View File

@@ -147,7 +147,7 @@ type RepoSettingForm struct {
EnableProjects bool
EnablePackages bool
EnablePulls bool
EnableBots bool
EnableActions bool
PullsIgnoreWhitespace bool
PullsAllowMerge bool
PullsAllowRebase bool

8
services/repository/push.go
View File

@@ -108,8 +108,8 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
}
if opts.IsTag() { // If is tag reference
if pusher == nil || pusher.ID != opts.PusherID {
if opts.PusherID == user_model.BotUserID {
pusher = user_model.NewBotUser()
if opts.PusherID == user_model.ActionsUserID {
pusher = user_model.NewActionsUser()
} else {
var err error
if pusher, err = user_model.GetUserByID(ctx, opts.PusherID); err != nil {
@@ -152,8 +152,8 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
}
} else if opts.IsBranch() { // If is branch reference
if pusher == nil || pusher.ID != opts.PusherID {
if opts.PusherID == user_model.BotUserID {
pusher = user_model.NewBotUser()
if opts.PusherID == user_model.ActionsUserID {
pusher = user_model.NewActionsUser()
} else {
var err error
if pusher, err = user_model.GetUserByID(ctx, opts.PusherID); err != nil {

4
services/repository/repository.go
View File

@@ -52,9 +52,9 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod
return err
}
// deletes bots resource after the repo has been deleted, to avoid new bots tasks
// deletes actions resource after the repo has been deleted, to avoid new tasks
if err := actions_service.DeleteResourceOfRepository(ctx, repo); err != nil {
log.Error("delete bots resource failed: %v", err)
log.Error("delete actions resource failed: %v", err)
}
return packages_model.UnlinkRepositoryFromAllPackages(ctx, repo.ID)