Merge branch 'snapshots-list-add-message' into 'dle-4-0'

fix: add message field to snapshots list

See merge request postgres-ai/database-lab!1013

Author: bogdan-ts

engine/internal/cloning/snapshots.go

@@ -51,6 +51,7 @@ func (c *Base) fetchSnapshots() error {
 			Branch:       entry.Branch,
 			NumClones:    len(cloneList),
 			Clones:       cloneList,
+			Message:      entry.Message,
 		}
 
 		snapshots[entry.ID] = currentSnapshot

engine/internal/provision/resources/resources.go

@@ -40,6 +40,7 @@ type Snapshot struct {
 	LogicalReferenced uint64    `json:"logicalReferenced"`
 	Pool              string    `json:"pool"`
 	Branch            string    `json:"branch"`
+	Message           string    `json:"message"`
 }
 
 // SessionState defines current state of a Session.

engine/internal/provision/thinclones/zfs/snapshots_filter.go

@@ -42,6 +42,7 @@ var defaultFields = snapshotFields{
 	"usedbychildren",
 	dataStateAtLabel,
 	branchProp,
+	messageProp,
 }
 
 var defaultSorting = snapshotSorting{

engine/internal/provision/thinclones/zfs/zfs.go

@@ -6,6 +6,7 @@
 package zfs
 
 import (
+	"encoding/base64"
 	"fmt"
 	"path"
 	"strconv"
@@ -120,6 +121,9 @@ type ListEntry struct {
 
 	// Branch to which the snapshot belongs.
 	Branch string
+
+	// Message associated with the snapshot.
+	Message string
 }
 
 type setFunc func(s string) error
@@ -700,6 +704,7 @@ func (m *Manager) getSnapshots() ([]resources.Snapshot, error) {
 			LogicalReferenced: entry.LogicalReferenced,
 			Pool:              m.config.Pool.Name,
 			Branch:            entry.Branch,
+			Message:           entry.Message,
 		}
 
 		snapshots = append(snapshots, snapshot)
@@ -825,7 +830,7 @@ func (m *Manager) listDetails(filter snapshotFilter) ([]*ListEntry, error) {
 		return nil, NewEmptyPoolError(filter.dsType, filter.pool)
 	}
 
-	numberFields := len([]string(filter.fields)) // 15
+	numberFields := len([]string(filter.fields)) // 16
 	entries := make([]*ListEntry, len(lines)-headerOffset)
 
 	for i := headerOffset; i < len(lines); i++ {
@@ -865,6 +870,7 @@ func (m *Manager) listDetails(filter snapshotFilter) ([]*ListEntry, error) {
 			{field: fields[11], setFunc: zfsListEntry.setUsedBySnapshots},
 			{field: fields[12], setFunc: zfsListEntry.setUsedByChildren},
 			{field: fields[13], setFunc: zfsListEntry.setDataStateAt},
+			{field: fields[15], setFunc: zfsListEntry.setMessage},
 		}
 
 		for _, rule := range setRules {
@@ -996,6 +1002,22 @@ func (z *ListEntry) setDataStateAt(field string) error {
 	return nil
 }
 
+func (z *ListEntry) setMessage(field string) error {
+	if field == empty || field == "" {
+		z.Message = field
+		return nil
+	}
+
+	decoded, err := base64.StdEncoding.DecodeString(field)
+	if err != nil {
+		return err
+	}
+
+	z.Message = string(decoded)
+
+	return nil
+}
+
 // PoolMappings provides a mapping of pool name and mount point directory.
 func PoolMappings(runner runners.Runner, mountDir, preSnapshotSuffix string) (map[string]string, error) {
 	listCmd := "zfs list -Ho name,mountpoint -t filesystem | grep -v " + preSnapshotSuffix

engine/pkg/models/snapshot.go

@@ -15,6 +15,7 @@ type Snapshot struct {
 	NumClones    int        `json:"numClones"`
 	Clones       []string   `json:"clones"`
 	Branch       string     `json:"branch"`
+	Message      string     `json:"message"`
 }
 
 // SnapshotView represents a view of snapshot.