From 6fd1663d8c27fbfd5adc93a3aa973f78a2eeb719 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Sat, 22 Feb 2025 13:35:17 +0100 Subject: chore(tfstated): change database state id and version id formats to uuidv7 --- pkg/webui/version.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'pkg/webui/version.go') diff --git a/pkg/webui/version.go b/pkg/webui/version.go index a577d5f..62a0e22 100644 --- a/pkg/webui/version.go +++ b/pkg/webui/version.go @@ -1,13 +1,13 @@ package webui import ( - "fmt" "html/template" "net/http" - "strconv" + "path" "git.adyxax.org/adyxax/tfstated/pkg/database" "git.adyxax.org/adyxax/tfstated/pkg/model" + "go.n16f.net/uuid" ) var versionTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/version.html")) @@ -21,9 +21,8 @@ func handleVersionGET(db *database.DB) http.Handler { VersionData string } return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - versionIdStr := r.PathValue("id") - versionId, err := strconv.Atoi(versionIdStr) - if err != nil { + var versionId uuid.UUID + if err := versionId.Parse(r.PathValue("id")); err != nil { errorResponse(w, http.StatusBadRequest, err) return } @@ -49,7 +48,7 @@ func handleVersionGET(db *database.DB) http.Handler { versionData := string(version.Data[:]) render(w, versionTemplate, http.StatusOK, VersionsData{ Page: makePage(r, &Page{ - Precedent: fmt.Sprintf("/state/%d", state.Id), + Precedent: path.Join("/state/", state.Id.String()), Section: "states", Title: state.Path, }), -- cgit v1.2.3