Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lint errors

Browse Source
This commit is contained in:
dragon 2024-05-21 16:31:55 +08:00
parent a5a9166689
commit 09a0047fc4
3 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routers/api/packages/arch/arch.go
View File

@ -36,12 +36,12 @@ func Push(ctx *context.Context) {
sign = ctx.Params("sign")
)
upload, close, err := ctx.UploadStream()
upload, needToClose, err := ctx.UploadStream()
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
}
if close {
if needToClose {
defer upload.Close()
}

3
templates/package/content/arch.tmpl
View File

@ -163,7 +163,6 @@ Server = <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.O
{{$Distribution = .Value}}
{{end}}
{{end}}
<tbody>
<tr>
<td class="collapsing">
@ -211,4 +210,4 @@ Server = <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.O
</table>
</div>
{{end}}
{{end}}
{{end}}

35
tests/integration/api_packages_arch_test.go
View File

@ -8,7 +8,6 @@ import (
"bufio"
"bytes"
"compress/gzip"
"crypto/md5"
"encoding/hex"
"errors"
"fmt"
@ -91,8 +90,7 @@ func TestPackageArch(t *testing.T) {
user.Name, p.File, hex.EncodeToString(signdata),
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
pv, err := packages.GetVersionByNameAndVersion(
@ -126,8 +124,7 @@ func TestPackageArch(t *testing.T) {
user.Name, p.File,
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
pv, err := packages.GetVersionByNameAndVersion(
@ -153,8 +150,7 @@ func TestPackageArch(t *testing.T) {
"/api/packages/%s/arch/push/%s/artix/%s",
user.Name, p.File, hex.EncodeToString(signdata),
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
url = fmt.Sprintf(
@ -177,8 +173,7 @@ func TestPackageArch(t *testing.T) {
"/api/packages/%s/arch/push/%s/arco/%s",
user.Name, p.File, hex.EncodeToString(signdata),
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
url = fmt.Sprintf(
@ -201,16 +196,14 @@ func TestPackageArch(t *testing.T) {
"/api/packages/%s/arch/push/%s/manjaro/%s",
user.Name, p.File, hex.EncodeToString(signdata),
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
url = fmt.Sprintf(
"/api/packages/%s/arch/remove/%s/%s",
user.Name, p.Name, p.Ver,
)
req = NewRequest(t, "DELETE", url)
req = AddBasicAuthHeader(req, user.Name)
req = NewRequest(t, "DELETE", url).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
_, err := packages.GetVersionByNameAndVersion(
@ -228,8 +221,7 @@ func TestPackageArch(t *testing.T) {
"/api/packages/%s/arch/push/%s/ion/%s",
user.Name, p.File, hex.EncodeToString(signdata),
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
}
@ -243,8 +235,7 @@ func TestPackageArch(t *testing.T) {
"/api/packages/%s/arch/push/%s/ion/%s",
user.Name, p.File, hex.EncodeToString(signdata),
)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data))
req = AddBasicAuthHeader(req, user.Name)
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(p.Data)).AddBasicAuth(user.Name)
MakeRequest(t, req, http.StatusOK)
}
}
@ -346,7 +337,7 @@ func BuildArchPackage(t *testing.T, name, ver, architecture string) *TestArchPac
})
assert.NoError(t, errors.Join(mfile.Close(), archive.Close(), err))
md5, sha256, size := archPkgParams(buf.Bytes())
sha256, size := archPkgParams(buf.Bytes())
return &TestArchPackage{
Data: buf.Bytes(),
@ -362,7 +353,6 @@ func BuildArchPackage(t *testing.T, name, ver, architecture string) *TestArchPac
},
FileMetadata: arch.FileMetadata{
CompressedSize: size,
MD5: hex.EncodeToString(md5),
SHA256: hex.EncodeToString(sha256),
Arch: architecture,
},
@ -370,15 +360,14 @@ func BuildArchPackage(t *testing.T, name, ver, architecture string) *TestArchPac
}
}
func archPkgParams(b []byte) ([]byte, []byte, int64) {
md5 := md5.New()
func archPkgParams(b []byte) ([]byte, int64) {
sha256 := sha256.New()
c := counter{bytes.NewReader(b), 0}
br := bufio.NewReader(io.TeeReader(&c, io.MultiWriter(md5, sha256)))
br := bufio.NewReader(io.TeeReader(&c, io.MultiWriter(sha256)))
io.ReadAll(br)
return md5.Sum(nil), sha256.Sum(nil), int64(c.n)
return sha256.Sum(nil), int64(c.n)
}
type counter struct {