aboutsummaryrefslogtreecommitdiffstats
path: root/services/actions
diff options
context:
space:
mode:
authorJason Song <i@wolfogre.com>2025-02-11 04:44:04 +0800
committerGitHub <noreply@github.com>2025-02-11 04:44:04 +0800
commitc422f179dd752b291d43508caf00ebe2fb052074 (patch)
tree15837d448c6ae7b1cb2fee933462beaa0bc5cd70 /services/actions
parente3adb686bb2e6f1ae3adc83a74f40cf1f621c620 (diff)
downloadgitea-c422f179dd752b291d43508caf00ebe2fb052074.tar.gz
gitea-c422f179dd752b291d43508caf00ebe2fb052074.zip
Enhance routers for the Actions variable operations (#33547)
- Find the variable before updating or deleting - Move the main logic from `routers/web/repo/setting/variables.go` to `routers/web/shared/actions/variables.go`. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'services/actions')
-rw-r--r--services/actions/variables.go15
1 files changed, 6 insertions, 9 deletions
diff --git a/services/actions/variables.go b/services/actions/variables.go
index 8dde9c4af5..95f088dbd3 100644
--- a/services/actions/variables.go
+++ b/services/actions/variables.go
@@ -6,7 +6,6 @@ package actions
import (
"context"
"regexp"
- "strings"
actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/modules/log"
@@ -31,20 +30,18 @@ func CreateVariable(ctx context.Context, ownerID, repoID int64, name, data strin
return v, nil
}
-func UpdateVariable(ctx context.Context, variableID int64, name, data string) (bool, error) {
- if err := secret_service.ValidateName(name); err != nil {
+func UpdateVariableNameData(ctx context.Context, variable *actions_model.ActionVariable) (bool, error) {
+ if err := secret_service.ValidateName(variable.Name); err != nil {
return false, err
}
- if err := envNameCIRegexMatch(name); err != nil {
+ if err := envNameCIRegexMatch(variable.Name); err != nil {
return false, err
}
- return actions_model.UpdateVariable(ctx, &actions_model.ActionVariable{
- ID: variableID,
- Name: strings.ToUpper(name),
- Data: util.ReserveLineBreakForTextarea(data),
- })
+ variable.Data = util.ReserveLineBreakForTextarea(variable.Data)
+
+ return actions_model.UpdateVariableCols(ctx, variable, "name", "data")
}
func DeleteVariableByID(ctx context.Context, variableID int64) error {