diff options
Diffstat (limited to 'routers/api/packages/helm/helm.go')
| -rw-r--r-- | routers/api/packages/helm/helm.go | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index fb12daaa46..4c1b72d5c0 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -14,7 +14,6 @@ import ( packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/optional" packages_module "code.gitea.io/gitea/modules/packages" helm_module "code.gitea.io/gitea/modules/packages/helm" @@ -28,13 +27,12 @@ import ( ) func apiError(ctx *context.Context, status int, obj any) { - helper.LogAndProcessError(ctx, status, obj, func(message string) { - type Error struct { - Error string `json:"error"` - } - ctx.JSON(status, Error{ - Error: message, - }) + message := helper.ProcessErrorForUser(ctx, status, obj) + type Error struct { + Error string `json:"error"` + } + ctx.JSON(status, Error{ + Error: message, }) } @@ -87,16 +85,14 @@ func Index(ctx *context.Context) { } ctx.Resp.WriteHeader(http.StatusOK) - if err := yaml.NewEncoder(ctx.Resp).Encode(&Index{ + _ = yaml.NewEncoder(ctx.Resp).Encode(&Index{ APIVersion: "v1", Entries: entries, Generated: time.Now(), ServerInfo: &ServerInfo{ ContextPath: setting.AppSubURL + "/api/packages/" + url.PathEscape(ctx.Package.Owner.Name) + "/helm", }, - }); err != nil { - log.Error("YAML encode failed: %v", err) - } + }) } // DownloadPackageFile serves the content of a package @@ -122,12 +118,13 @@ func DownloadPackageFile(ctx *context.Context) { return } - s, u, pf, err := packages_service.GetFileStreamByPackageVersion( + s, u, pf, err := packages_service.OpenFileForDownloadByPackageVersion( ctx, pvs[0], &packages_service.PackageFileInfo{ Filename: filename, }, + ctx.Req.Method, ) if err != nil { if errors.Is(err, packages_model.ErrPackageFileNotExist) { |