From 3b55815e5347fb9f853c3e96a659f8850eca04f4 Mon Sep 17 00:00:00 2001 From: dragon Date: Wed, 15 Jan 2025 15:21:26 +0800 Subject: [PATCH] add tests & fix lint --- modules/setting/packages.go | 4 +- services/packages/arch/repository.go | 14 +-- services/packages/arch/vercmp.go | 3 +- tests/integration/api_packages_arch_test.go | 95 ++++++++++++++------- 4 files changed, 76 insertions(+), 40 deletions(-) diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 12f7a459505df..f722cb5ee4c73 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -46,7 +46,7 @@ var ( DefaultRPMSignEnabled bool - DefaultMetaArchLatestVersion bool + RepoLatestVersionArch bool }{ Enabled: true, LimitTotalOwnerCount: -1, @@ -104,7 +104,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) - Packages.DefaultMetaArchLatestVersion = sec.Key("METADATA_ARCH_LATEST_VERSION").MustBool(false) + Packages.RepoLatestVersionArch = sec.Key("METADATA_ARCH_LATEST_VERSION").MustBool(false) return nil } diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 302ff8d520f4c..d7a3f88f02c27 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -236,7 +236,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return packages_service.DeletePackageFile(ctx, pf) } - vpfs := make(map[string]*entryOptions) + vpfs := make(map[int64]*entryOptions) for _, pf := range pfs { current := &entryOptions{ File: pf, @@ -246,17 +246,17 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package return err } - if setting.Packages.DefaultMetaArchLatestVersion { - old := vpfs[pf.Name] - if old != nil { + if setting.Packages.RepoLatestVersionArch { + if old, ok := vpfs[current.Version.PackageID]; ok { if compareVersions(old.Version.Version, current.Version.Version) == -1 { - vpfs[pf.Name] = current + vpfs[current.Version.PackageID] = current } } else { - vpfs[pf.Name] = current + vpfs[current.Version.PackageID] = current } } else { - vpfs[pf.Name] = current + // keep all files + vpfs[current.File.ID] = current } } diff --git a/services/packages/arch/vercmp.go b/services/packages/arch/vercmp.go index d11e3fb10f20a..7068d4e970d3d 100644 --- a/services/packages/arch/vercmp.go +++ b/services/packages/arch/vercmp.go @@ -46,9 +46,8 @@ func compareSegments(a, b []string) int { return 0 } else if l == lenA { return -1 - } else { - return 1 } + return 1 } func compare(a, b string) int { diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 9c7a9dd19dec1..e358ab448fbdf 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -17,6 +17,8 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" arch_module "code.gitea.io/gitea/modules/packages/arch" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/test" arch_service "code.gitea.io/gitea/services/packages/arch" "code.gitea.io/gitea/tests" @@ -79,6 +81,34 @@ license = MIT`) return buf.Bytes() } + readIndexContent := func(r io.Reader) (map[string]string, error) { + gzr, err := gzip.NewReader(r) + if err != nil { + return nil, err + } + + content := make(map[string]string) + + tr := tar.NewReader(gzr) + for { + hd, err := tr.Next() + if err == io.EOF { + break + } + if err != nil { + return nil, err + } + + buf, err := io.ReadAll(tr) + if err != nil { + return nil, err + } + + content[hd.Name] = string(buf) + } + + return content, nil + } compressions := []string{"gz", "xz", "zst"} repositories := []string{"main", "testing", "with/slash", ""} @@ -171,35 +201,6 @@ license = MIT`) MakeRequest(t, req, http.StatusConflict) }) - readIndexContent := func(r io.Reader) (map[string]string, error) { - gzr, err := gzip.NewReader(r) - if err != nil { - return nil, err - } - - content := make(map[string]string) - - tr := tar.NewReader(gzr) - for { - hd, err := tr.Next() - if err == io.EOF { - break - } - if err != nil { - return nil, err - } - - buf, err := io.ReadAll(tr) - if err != nil { - return nil, err - } - - content[hd.Name] = string(buf) - } - - return content, nil - } - t.Run("Index", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -299,4 +300,40 @@ license = MIT`) }) } } + t.Run("KeepLastVersion", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + defer test.MockVariableValue(&setting.Packages.RepoLatestVersionArch, true)() + pkgVer1 := createPackage("gz", "gitea-test", "1.0.0", "aarch64") + pkgVer2 := createPackage("gz", "gitea-test", "1.0.1", "aarch64") + req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer1)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusCreated) + req = NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer2)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusCreated) + + req = NewRequest(t, "GET", fmt.Sprintf("%s/aarch64/%s", rootURL, arch_service.IndexArchiveFilename)) + resp := MakeRequest(t, req, http.StatusOK) + + content, err := readIndexContent(resp.Body) + assert.NoError(t, err) + assert.Len(t, content, 2) + + _, has := content["gitea-test-1.0.0/desc"] + assert.False(t, has) + _, has = content["gitea-test-1.0.1/desc"] + assert.True(t, has) + + req = NewRequest(t, "DELETE", fmt.Sprintf("%s/gitea-test/1.0.1/aarch64", rootURL)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusNoContent) + + req = NewRequest(t, "GET", fmt.Sprintf("%s/aarch64/%s", rootURL, arch_service.IndexArchiveFilename)) + resp = MakeRequest(t, req, http.StatusOK) + content, err = readIndexContent(resp.Body) + assert.NoError(t, err) + assert.Len(t, content, 2) + _, has = content["gitea-test-1.0.0/desc"] + assert.True(t, has) + }) }