feat: add version to /status endpoint

Signed-off-by: guillaume <[email protected]>

internal/server/handlers_login.go

@@ -12,7 +12,7 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-func expireAfter(hours int) int64 {
+func expireAfter() int64 {
 	return time.Now().Add(time.Hour * 1).Unix()
 }
 
@@ -39,7 +39,7 @@ func generateJWT(id int, username string, jwtSecret []byte, permissions int) (st
 		Username:    username,
 		Permissions: permissions,
 		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: expireAfter(1),
+			ExpiresAt: expireAfter(),
 		},
 	})
 	tokenString, err := token.SignedString(jwtSecret)

internal/server/handlers_status.go

@@ -2,10 +2,13 @@ package server
 
 import (
 	"net/http"
+
+	"github.com/canonical/notary/version"
 )
 
 type StatusResponse struct {
-	Initialized bool `json:"initialized"`
+	Initialized bool   `json:"initialized"`
+	Version     string `json:"version"`
 }
 
 // the GET status endpoint returns a http.StatusOK alongside info about the server
@@ -19,6 +22,7 @@ func GetStatus(env *HandlerConfig) http.HandlerFunc {
 		}
 		statusResponse := StatusResponse{
 			Initialized: numUsers > 0,
+			Version:     version.GetVersion(),
 		}
 		w.WriteHeader(http.StatusOK)
 		err = writeJSON(w, statusResponse)

internal/server/handlers_status_test.go

@@ -7,7 +7,8 @@ import (
 )
 
 type GetStatusResponseResult struct {
-	Initialized bool `json:"initialized"`
+	Initialized bool   `json:"initialized"`
+	Version     string `json:"version"`
 }
 
 type GetStatusResponse struct {
@@ -58,6 +59,10 @@ func TestStatus(t *testing.T) {
 		if statusResponse.Result.Initialized {
 			t.Fatalf("expected initialized to be false")
 		}
+
+		if statusResponse.Result.Version == "" {
+			t.Fatalf("expected version to be set")
+		}
 	})
 
 	var adminToken string
@@ -81,5 +86,9 @@ func TestStatus(t *testing.T) {
 		if !statusResponse.Result.Initialized {
 			t.Fatalf("expected initialized to be true")
 		}
+
+		if statusResponse.Result.Version == "" {
+			t.Fatalf("expected version to be set")
+		}
 	})
 }

rockcraft.yaml

@@ -1,7 +1,7 @@
 name: notary
 base: bare
 build-base: [email protected]
-version: '0.0.3'
+adopt-info: notary-release-data
 summary: A certificate management tool
 description: |
   A certificate management tool.
@@ -32,3 +32,10 @@ parts:
       - ca-certificates_data
       - libc6_libs
       - base-files_lib
+
+  notary-release-data:
+    plugin: nil
+    source: .
+    override-build: |
+      version="$(cat version/VERSION)"
+      craftctl set version="$version"

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: notary
 base: core24
-version: '0.0.3'
+adopt-info: notary-release-data
 summary: Notary is a certificate management tool.
 license: Apache-2.0
 description: |
@@ -43,6 +43,13 @@ parts:
       npm run build --prefix ui
       craftctl default
 
+  notary-release-data:
+    plugin: nil
+    source: .
+    override-build: |
+      version="$(cat version/VERSION)"
+      craftctl set version="$version"
+
   service-files:
     plugin: dump
     source: service

version/VERSION

@@ -0,0 +1 @@
+0.0.3

version/version.go

@@ -0,0 +1,12 @@
+package version
+
+import (
+	_ "embed"
+)
+
+//go:embed VERSION
+var version string
+
+func GetVersion() string {
+	return version
+}