Allow multiple metadata files for Maven packages (#20674)
* Allow file overwrite for meta files. * Added tests. * lint Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
parent
d890f0d38c
commit
baf374a3a4
@ -42,6 +42,7 @@ func TestPackageMaven(t *testing.T) {
|
|||||||
defer PrintCurrentTest(t)()
|
defer PrintCurrentTest(t)()
|
||||||
|
|
||||||
putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusCreated)
|
putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusCreated)
|
||||||
|
putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusBadRequest)
|
||||||
putFile(t, "/maven-metadata.xml", "test", http.StatusOK)
|
putFile(t, "/maven-metadata.xml", "test", http.StatusOK)
|
||||||
|
|
||||||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeMaven)
|
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeMaven)
|
||||||
@ -135,12 +136,14 @@ func TestPackageMaven(t *testing.T) {
|
|||||||
pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[0].ID)
|
pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[0].ID)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, pfs, 2)
|
assert.Len(t, pfs, 2)
|
||||||
i := 0
|
for _, pf := range pfs {
|
||||||
if strings.HasSuffix(pfs[1].Name, ".pom") {
|
if strings.HasSuffix(pf.Name, ".pom") {
|
||||||
i = 1
|
assert.Equal(t, filename+".pom", pf.Name)
|
||||||
|
assert.True(t, pf.IsLead)
|
||||||
|
} else {
|
||||||
|
assert.False(t, pf.IsLead)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
assert.Equal(t, filename+".pom", pfs[i].Name)
|
|
||||||
assert.True(t, pfs[i].IsLead)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("DownloadPOM", func(t *testing.T) {
|
t.Run("DownloadPOM", func(t *testing.T) {
|
||||||
@ -202,4 +205,13 @@ func TestPackageMaven(t *testing.T) {
|
|||||||
assert.Equal(t, checksum, resp.Body.String())
|
assert.Equal(t, checksum, resp.Body.String())
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("UploadSnapshot", func(t *testing.T) {
|
||||||
|
snapshotVersion := packageVersion + "-SNAPSHOT"
|
||||||
|
|
||||||
|
putFile(t, fmt.Sprintf("/%s/%s", snapshotVersion, filename), "test", http.StatusCreated)
|
||||||
|
putFile(t, "/maven-metadata.xml", "test", http.StatusOK)
|
||||||
|
putFile(t, fmt.Sprintf("/%s/maven-metadata.xml", snapshotVersion), "test", http.StatusCreated)
|
||||||
|
putFile(t, fmt.Sprintf("/%s/maven-metadata.xml", snapshotVersion), "test-overwrite", http.StatusCreated)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
@ -268,6 +268,7 @@ func UploadPackageFile(ctx *context.Context) {
|
|||||||
},
|
},
|
||||||
Data: buf,
|
Data: buf,
|
||||||
IsLead: false,
|
IsLead: false,
|
||||||
|
OverwriteExisting: params.IsMeta,
|
||||||
}
|
}
|
||||||
|
|
||||||
// If it's the package pom file extract the metadata
|
// If it's the package pom file extract the metadata
|
||||||
|
Loading…
Reference in New Issue
Block a user