enhance: Improve validation errors for secrets/variables (#39221)

Signed-off-by: Ross Golder <ross@golder.org>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

routers/web/admin/config.go

@@ -5,7 +5,6 @@
 package admin
 
 import (
-	"errors"
 	"net/http"
 
 	system_model "gitea.dev/models/system"
@@ -161,11 +160,7 @@ loop:
 
 		err := validateConfigKeyValue(key, value)
 		if err != nil {
-			if errors.Is(err, util.ErrInvalidArgument) {
-				ctx.JSONError(err.Error())
-			} else {
-				ctx.JSONError(ctx.Tr("admin.config.set_setting_failed", key))
-			}
+			ctx.JSONErrorAuto(err)
 			break loop
 		}
 		configSettings[key] = value

routers/web/org/members.go

@@ -10,7 +10,6 @@ import (
 
 	"gitea.dev/models/organization"
 	user_model "gitea.dev/models/user"
-	"gitea.dev/modules/log"
 	"gitea.dev/modules/setting"
 	"gitea.dev/modules/templates"
 	"gitea.dev/modules/util"
@@ -130,6 +129,5 @@ func MembersAction(ctx *context.Context) {
 		return
 	}
 
-	log.Error("Action(%s): %v", ctx.PathParam("action"), err)
-	ctx.JSONError(err.Error()) // FIXME: legacy logic, errors are handled together, it's not right, need to distinguish between different errors
+	ctx.JSONErrorAuto(err)
 }

routers/web/repo/pull.go

@@ -1319,14 +1319,8 @@ func CompareAndPullRequestPost(ctx *context.Context) {
 	repo := ctx.Repo.Repository
 	comparePageInfo := newComparePageInfo()
 	err := comparePageInfo.parseCompareInfo(ctx, ctx.PathParam("*"))
-	if errors.Is(err, util.ErrNotExist) {
-		ctx.JSONErrorNotFound()
-		return
-	} else if errors.Is(err, util.ErrInvalidArgument) {
-		ctx.JSONError(err.Error())
-		return
-	} else if err != nil {
-		ctx.ServerError("ParseCompareInfo", err)
+	if err != nil {
+		ctx.JSONErrorAuto(err)
 		return
 	}
 	ci := comparePageInfo.compareInfo

routers/web/repo/release.go

@@ -623,11 +623,7 @@ func EditReleasePost(ctx *context.Context) {
 	rel.IsPrerelease = form.Prerelease
 	if err = release_service.UpdateRelease(ctx, ctx.Doer, ctx.Repo.GitRepo,
 		rel, addAttachmentUUIDs, delAttachmentUUIDs, editAttachments); err != nil {
-		if upload.IsErrFileTypeForbidden(err) {
-			ctx.JSONError(err.Error())
-		} else {
-			ctx.ServerError("UpdateRelease", err)
-		}
+		ctx.JSONErrorAuto(err)
 		return
 	}
 	ctx.JSONRedirect(ctx.Repo.RepoLink + "/releases")

routers/web/shared/actions/variables.go

@@ -126,8 +126,7 @@ func VariableCreate(ctx *context.Context) {
 
 	v, err := actions_service.CreateVariable(ctx, vCtx.OwnerID, vCtx.RepoID, form.Name, form.Data, form.Description)
 	if err != nil {
-		log.Error("CreateVariable: %v", err)
-		ctx.JSONError(ctx.Tr("actions.variables.creation.failed"))
+		ctx.JSONErrorAuto(err)
 		return
 	}
 
@@ -159,9 +158,8 @@ func VariableUpdate(ctx *context.Context) {
 	variable.Data = form.Data
 	variable.Description = form.Description
 
-	if ok, err := actions_service.UpdateVariableNameData(ctx, variable); err != nil || !ok {
-		log.Error("UpdateVariable: %v", err)
-		ctx.JSONError(ctx.Tr("actions.variables.update.failed"))
+	if _, err := actions_service.UpdateVariableNameData(ctx, variable); err != nil {
+		ctx.JSONErrorAuto(err)
 		return
 	}
 	ctx.Flash.Success(ctx.Tr("actions.variables.update.success"))

routers/web/shared/secrets/secrets.go

@@ -31,8 +31,7 @@ func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL
 
 	s, _, err := secret_service.CreateOrUpdateSecret(ctx, ownerID, repoID, form.Name, util.NormalizeStringEOL(form.Data), form.Description)
 	if err != nil {
-		log.Error("CreateOrUpdateSecret failed: %v", err)
-		ctx.JSONError(ctx.Tr("secrets.save_failed"))
+		ctx.JSONErrorAuto(err)
 		return
 	}