feat: show in API branch to which the snapshot belongs

Author: agneum

engine/internal/cloning/snapshots.go

@@ -48,6 +48,7 @@ func (c *Base) fetchSnapshots() error {
 			PhysicalSize: entry.Used,
 			LogicalSize:  entry.LogicalReferenced,
 			Pool:         entry.Pool,
+			Branch:       entry.Branch,
 			NumClones:    numClones,
 		}
 

engine/internal/provision/resources/resources.go

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

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

@@ -104,6 +104,8 @@ func (m *Manager) InitBranching() error {
 		return fmt.Errorf("failed to init main branch dataset: %w", err)
 	}
 
+	m.RefreshSnapshotList()
+
 	log.Msg("data branching has been successfully initialized")
 
 	return nil

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

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

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

@@ -116,6 +116,9 @@ type ListEntry struct {
 
 	// Data state timestamp.
 	DataStateAt time.Time
+
+	// Branch to which the snapshot belongs.
+	Branch string
 }
 
 type setFunc func(s string) error
@@ -671,6 +674,7 @@ func (m *Manager) getSnapshots() ([]resources.Snapshot, error) {
 			Used:              entry.Used,
 			LogicalReferenced: entry.LogicalReferenced,
 			Pool:              m.config.Pool.Name,
+			Branch:            entry.Branch,
 		}
 
 		snapshots = append(snapshots, snapshot)
@@ -796,7 +800,7 @@ func (m *Manager) listDetails(filter snapshotFilter) ([]*ListEntry, error) {
 		return nil, NewEmptyPoolError(filter.dsType, filter.pool)
 	}
 
-	numberFields := len([]string(filter.fields)) // 14
+	numberFields := len([]string(filter.fields)) // 15
 	entries := make([]*ListEntry, len(lines)-headerOffset)
 
 	for i := headerOffset; i < len(lines); i++ {
@@ -822,6 +826,7 @@ func (m *Manager) listDetails(filter snapshotFilter) ([]*ListEntry, error) {
 			MountPoint: fields[2],
 			Type:       fields[5],
 			Origin:     fields[6],
+			Branch:     fields[14],
 		}
 
 		setRules := []setTuple{

engine/pkg/models/snapshot.go

@@ -13,6 +13,7 @@ type Snapshot struct {
 	LogicalSize  uint64     `json:"logicalSize"`
 	Pool         string     `json:"pool"`
 	NumClones    int        `json:"numClones"`
+	Branch       string     `json:"branch"`
 }
 
 // SnapshotView represents a view of snapshot.