unkinben
787de74b3d
ci/woodpecker/tag/docker Pipeline was successful
## Why
Local repos store uploaded files in the \`local_files\` table, whereas remote/proxy repos cache into the \`artifacts\` table. The shared **Cached Objects** page always queried the artifacts table via \`/api/v2/remotes/{name}/objects\`, so files uploaded to a local repo (e.g. an internal RPM) were fully stored and servable but showed as **0 objects** in the UI.
## Changes
- Add \`ListLocalArtifacts\`, joining \`local_files\` with \`blobs\` and returning \`models.Artifact\`-shaped rows (size from the blob; access/fetch counters zero and timestamps derived from \`created_at\`, since local files track no access).
- Add \`LocalRoutes\` to the objects handler: \`listLocal\` reads \`local_files\`, \`evictLocal\` deletes via \`DeleteLocalFile\`. Extract shared page/per_page parsing into \`pageBounds\`.
- Mount \`/api/v2/locals/{name}/objects\` (GET + DELETE) in the server.
- Add \`listLocalObjects\`/\`evictLocalObject\` to the UI client and route the Objects page to them when viewing a local repo.
- Cover the listing and eviction paths with a dockerised test.
## Notes
Generated \`repodata/*\` files are not listed — they are produced on the fly from \`rpm_metadata\` and never stored in \`local_files\`, which matches how the repo serves them.
Reviewed-on: #99
Co-authored-by: Ben Vincent <ben@unkin.net>
Co-committed-by: Ben Vincent <ben@unkin.net>
95 lines
2.4 KiB
Go
95 lines
2.4 KiB
Go
package v2
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"git.unkin.net/unkin/artifactapi/internal/database"
|
|
)
|
|
|
|
type ObjectsHandler struct {
|
|
db *database.DB
|
|
}
|
|
|
|
func NewObjectsHandler(db *database.DB) *ObjectsHandler {
|
|
return &ObjectsHandler{db: db}
|
|
}
|
|
|
|
func (h *ObjectsHandler) Routes() chi.Router {
|
|
r := chi.NewRouter()
|
|
r.Get("/", h.list)
|
|
r.Delete("/*", h.evict)
|
|
return r
|
|
}
|
|
|
|
// LocalRoutes lists and evicts objects for local repos, which live in the
|
|
// local_files table rather than the artifacts table used by remotes.
|
|
func (h *ObjectsHandler) LocalRoutes() chi.Router {
|
|
r := chi.NewRouter()
|
|
r.Get("/", h.listLocal)
|
|
r.Delete("/*", h.evictLocal)
|
|
return r
|
|
}
|
|
|
|
// pageBounds parses the shared page/per_page query params into a SQL limit and offset.
|
|
func pageBounds(r *http.Request) (limit, offset int) {
|
|
limit, _ = strconv.Atoi(r.URL.Query().Get("per_page"))
|
|
if limit <= 0 || limit > 5000 {
|
|
limit = 50
|
|
}
|
|
page, _ := strconv.Atoi(r.URL.Query().Get("page"))
|
|
if page <= 0 {
|
|
page = 1
|
|
}
|
|
return limit, (page - 1) * limit
|
|
}
|
|
|
|
func (h *ObjectsHandler) list(w http.ResponseWriter, r *http.Request) {
|
|
remoteName := chi.URLParam(r, "name")
|
|
limit, offset := pageBounds(r)
|
|
|
|
artifacts, err := h.db.ListArtifacts(r.Context(), remoteName, limit, offset)
|
|
if err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, artifacts)
|
|
}
|
|
|
|
func (h *ObjectsHandler) listLocal(w http.ResponseWriter, r *http.Request) {
|
|
repoName := chi.URLParam(r, "name")
|
|
limit, offset := pageBounds(r)
|
|
|
|
artifacts, err := h.db.ListLocalArtifacts(r.Context(), repoName, limit, offset)
|
|
if err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, artifacts)
|
|
}
|
|
|
|
func (h *ObjectsHandler) evictLocal(w http.ResponseWriter, r *http.Request) {
|
|
repoName := chi.URLParam(r, "name")
|
|
path := chi.URLParam(r, "*")
|
|
|
|
if err := h.db.DeleteLocalFile(r.Context(), repoName, path); err != nil {
|
|
http.Error(w, fmt.Sprintf("evict failed: %v", err), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
|
|
func (h *ObjectsHandler) evict(w http.ResponseWriter, r *http.Request) {
|
|
remoteName := chi.URLParam(r, "name")
|
|
path := chi.URLParam(r, "*")
|
|
|
|
if err := h.db.DeleteArtifact(r.Context(), remoteName, path); err != nil {
|
|
http.Error(w, fmt.Sprintf("evict failed: %v", err), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|