Status: add DirectoryPath & ContentPath

Author: cdevienne

pkg/vendir/cmd/status.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"maps"
 	"os"
 
 	"github.com/cppforlife/go-cli-ui/ui"
@@ -90,8 +89,8 @@ func fullStatus(
 	syncOpts ctldir.SyncOpts,
 	existingLockConfig ctlconf.LockConfig,
 	ui ui.UI,
-) (ctlstatus.StatusMap, error) {
-	status := ctlstatus.StatusMap{}
+) (ctlstatus.StatusList, error) {
+	status := ctlstatus.StatusList{}
 	for _, dirConf := range conf.Directories {
 		dirExistingLockConf, _ := existingLockConfig.FindDirectory(dirConf.Path)
 		directory := ctldir.NewDirectory(dirConf, dirExistingLockConf, ui)
@@ -101,7 +100,7 @@ func fullStatus(
 			return nil, fmt.Errorf("Reading directory '%s': %s", dirConf.Path, err)
 		}
 
-		maps.Copy(status, dirStatus)
+		status = append(status, dirStatus...)
 	}
 
 	return status, nil

pkg/vendir/directory/status.go

@@ -8,8 +8,8 @@ import (
 	ctlstatus "carvel.dev/vendir/pkg/vendir/status"
 )
 
-func (d *Directory) Status(syncOpts SyncOpts) (map[string]*ctlstatus.Status, error) {
-	res := map[string]*ctlstatus.Status{}
+func (d *Directory) Status(syncOpts SyncOpts) (ctlstatus.StatusList, error) {
+	var res ctlstatus.StatusList
 
 	for _, contents := range d.opts.Contents {
 		path := path.Join(d.opts.Path, contents.Path)
@@ -23,7 +23,9 @@ func (d *Directory) Status(syncOpts SyncOpts) (map[string]*ctlstatus.Status, err
 			}
 
 			if gitStatus != nil {
-				res[path] = gitStatus
+				gitStatus.DirectoryPath = d.opts.Path
+				gitStatus.ContentPath = contents.Path
+				res = append(res, gitStatus)
 			}
 		case contents.Hg != nil:
 			hgSync := ctlhg.NewSync(
@@ -35,7 +37,9 @@ func (d *Directory) Status(syncOpts SyncOpts) (map[string]*ctlstatus.Status, err
 			}
 
 			if hgStatus != nil {
-				res[path] = hgStatus
+				hgStatus.DirectoryPath = d.opts.Path
+				hgStatus.ContentPath = contents.Path
+				res = append(res, hgStatus)
 			}
 		}
 	}

pkg/vendir/status/status.go

@@ -16,6 +16,8 @@ type CompleteReference struct {
 }
 
 type Status struct {
+	DirectoryPath     string
+	ContentPath       string
 	TargetRef         string
 	Ref               CompleteReference
 	UncommitedChanges []string
@@ -49,14 +51,14 @@ func (s Status) String() string {
 	return strings.Join(messages, ", ")
 }
 
-type StatusMap map[string]*Status
+type StatusList []*Status
 
-func (sm StatusMap) String() string {
+func (sm StatusList) String() string {
 	var s string
 
 	s += "Detailled status:\n"
-	for dir, status := range sm {
-		s += "- " + dir + ": " + status.String() + "\n"
+	for _, status := range sm {
+		s += "- " + status.DirectoryPath + "/" + status.ContentPath + ": " + status.String() + "\n"
 	}
 
 	if !sm.IsSafe() {
@@ -66,7 +68,7 @@ func (sm StatusMap) String() string {
 	return s
 }
 
-func (sm StatusMap) IsSafe() bool {
+func (sm StatusList) IsSafe() bool {
 	isSafe := true
 	for _, status := range sm {
 		if !status.IsSafe() {