Skip to content

Commit 9204813

Browse files
KN4CK3R6543
andauthored
Keep download count on Container tag overwrite (#20728)
Co-authored-by: 6543 <[email protected]>
1 parent 1b2cd4c commit 9204813

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

integrations/api_packages_container_test.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,23 @@ func TestPackageContainer(t *testing.T) {
276276
}
277277
}
278278

279-
// Overwrite existing tag
279+
req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag))
280+
addTokenAuthHeader(req, userToken)
281+
MakeRequest(t, req, http.StatusOK)
282+
283+
pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag)
284+
assert.NoError(t, err)
285+
assert.EqualValues(t, 1, pv.DownloadCount)
286+
287+
// Overwrite existing tag should keep the download count
280288
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent))
281289
addTokenAuthHeader(req, userToken)
282290
req.Header.Set("Content-Type", oci.MediaTypeDockerManifest)
283291
MakeRequest(t, req, http.StatusCreated)
292+
293+
pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag)
294+
assert.NoError(t, err)
295+
assert.EqualValues(t, 1, pv.DownloadCount)
284296
})
285297

286298
t.Run("HeadManifest", func(t *testing.T) {

routers/api/packages/container/manifest.go

+3
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,9 @@ func createPackageAndVersion(ctx context.Context, mci *manifestCreationInfo, met
312312
return nil, err
313313
}
314314

315+
// keep download count on overwrite
316+
_pv.DownloadCount = pv.DownloadCount
317+
315318
if pv, err = packages_model.GetOrInsertVersion(ctx, _pv); err != nil {
316319
log.Error("Error inserting package: %v", err)
317320
return nil, err

0 commit comments

Comments
 (0)