From ed97ff839832117b62cbd33f57ab0f6ce6906b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enver=20Bi=C5=A1evac?= Date: Fri, 26 Apr 2024 23:51:26 +0000 Subject: [PATCH] [code-1822-maint] minor requested changes (#2017) --- app/api/openapi/repo.go | 9 ++++----- app/api/request/archive.go | 4 ++-- app/router/api.go | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/api/openapi/repo.go b/app/api/openapi/repo.go index d2bf30416..c623ac65b 100644 --- a/app/api/openapi/repo.go +++ b/app/api/openapi/repo.go @@ -542,11 +542,10 @@ var queryParamArchivePaths = openapi3.ParameterOrRef{ var queryParamArchivePrefix = openapi3.ParameterOrRef{ Parameter: &openapi3.Parameter{ - Name: request.QueryParamArchivePrefix, - In: openapi3.ParameterInQuery, - Description: ptr.String("Prepend / to paths in the archive. Can be repeated; its rightmost value" + - " is used for all tracked files."), - Required: ptr.Bool(false), + Name: request.QueryParamArchivePrefix, + In: openapi3.ParameterInQuery, + Description: ptr.String("Prepend / to paths in the archive."), + Required: ptr.Bool(false), Schema: &openapi3.SchemaOrRef{ Schema: &openapi3.Schema{ Type: ptrSchemaType(openapi3.SchemaTypeString), diff --git a/app/api/request/archive.go b/app/api/request/archive.go index 47256d660..2a3aefb06 100644 --- a/app/api/request/archive.go +++ b/app/api/request/archive.go @@ -25,7 +25,7 @@ import ( ) const ( - PathParamArchiveRefs = "*" + PathParamArchiveGitRef = "*" QueryParamArchivePaths = "path" QueryParamArchivePrefix = "prefix" QueryParamArchiveAttributes = "attributes" @@ -37,7 +37,7 @@ func ParseArchiveParams(r *http.Request) (api.ArchiveParams, string) { // separate rev and ref part from url, for example: // api/v1/repos/root/demo/+/archive/refs/heads/main.zip // will produce rev=refs/heads and ref=main.zip - rev, filename := filepath.Split(PathParamOrEmpty(r, PathParamArchiveRefs)) + rev, filename := filepath.Split(PathParamOrEmpty(r, PathParamArchiveGitRef)) // use ext as format specifier ext := filepath.Ext(filename) // get name of the ref from filename diff --git a/app/router/api.go b/app/router/api.go index 370faa96a..28a2ab531 100644 --- a/app/router/api.go +++ b/app/router/api.go @@ -354,7 +354,7 @@ func setupRepos(r chi.Router, r.Get("/codeowners/validate", handlerrepo.HandleCodeOwnersValidate(repoCtrl)) - r.Get(fmt.Sprintf("/archive/%s", request.PathParamArchiveRefs), handlerrepo.HandleArchive(repoCtrl)) + r.Get(fmt.Sprintf("/archive/%s", request.PathParamArchiveGitRef), handlerrepo.HandleArchive(repoCtrl)) SetupPullReq(r, pullreqCtrl)