Change ps output to have the git commit and auto upgrade setting

Signed-off-by: Darren Shepherd <[email protected]>

pkg/apis/internal.acorn.io/v1/appimage.go

@@ -16,7 +16,12 @@ type AppImage struct {
 type VCS struct {
 	Remotes  []string `json:"remotes,omitempty"`
 	Revision string   `json:"revision,omitempty"`
-	Modified bool     `json:"modified,omitempty"`
+	// Clean a true value indicates the build contained no modified or untracked files according to git
+	Clean bool `json:"clean,omitempty"`
+	// Modified a true value indicates the build contained modified files according to git
+	Modified bool `json:"modified,omitempty"`
+	// Untracked a true value indicates the build contained untracked files according to git
+	Untracked bool `json:"untracked,omitempty"`
 }
 
 type Platform struct {

pkg/cli/builder/table/funcs.go

@@ -42,7 +42,7 @@ var (
 		"defaultMemory": DefaultMemory,
 		"ownerName":     OwnerReferenceName,
 		"imageName":     ImageName,
-		"imageDigest":   ImageDigest,
+		"imageCommit":   ImageCommit,
 	}
 )
 
@@ -62,6 +62,9 @@ func Trunc(s string) string {
 	if tags.SHAPattern.MatchString(s) && len(s) > 12 {
 		return s[:12]
 	}
+	if tags.CommitPattern.MatchString(s) && len(s) > 12 {
+		return s[:12]
+	}
 	return s
 }
 
@@ -302,17 +305,22 @@ func ImageName(obj metav1.Object) string {
 		return ""
 	}
 
+	suffix := ""
+	if app.Status.ObservedAutoUpgrade {
+		suffix = "*"
+	}
+
 	if original, exists := app.ObjectMeta.Annotations[labels.AcornOriginalImage]; exists {
-		return original
+		return original + suffix
 	}
-	return app.Status.AppImage.Name
+	return app.Status.AppImage.Name + suffix
 }
 
-func ImageDigest(obj metav1.Object) string {
+func ImageCommit(obj metav1.Object) string {
 	app, ok := obj.(*apiv1.App)
 	if !ok {
 		return ""
 	}
 
-	return strings.TrimPrefix(app.Status.AppImage.Digest, "sha256:")
+	return app.Status.AppImage.VCS.Revision
 }

pkg/cli/ps_test.go

@@ -48,7 +48,7 @@ func TestApp(t *testing.T) {
 				client: &testdata.MockClient{},
 			},
 			wantErr: false,
-			wantOut: "NAME      IMAGE     DIGEST    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE\nfound                                                292y ago               \n",
+			wantOut: "NAME      IMAGE     COMMIT    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE\nfound                                                292y ago               \n",
 		},
 		{
 			name: "acorn app found", fields: fields{
@@ -67,7 +67,7 @@ func TestApp(t *testing.T) {
 				client: &testdata.MockClient{},
 			},
 			wantErr: false,
-			wantOut: "NAME      IMAGE     DIGEST    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE\nfound                                                292y ago               \n",
+			wantOut: "NAME      IMAGE     COMMIT    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE\nfound                                                292y ago               \n",
 		},
 		{
 			name: "acorn app dne", fields: fields{

pkg/cli/testdata/all/all_test.txt

@@ -1,6 +1,6 @@
 
 ACORNS:
-NAME      IMAGE     DIGEST    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE
+NAME      IMAGE     COMMIT    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE
 found                                                292y ago               
 
 CONTAINERS:

pkg/cli/testdata/all/all_test_i.txt

@@ -1,6 +1,6 @@
 
 ACORNS:
-NAME      IMAGE     DIGEST    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE
+NAME      IMAGE     COMMIT    HEALTHY   UP-TO-DATE   CREATED    ENDPOINTS   MESSAGE
 found                                                292y ago               
 
 CONTAINERS:

pkg/tables/tables.go

@@ -10,7 +10,7 @@ var (
 	App = [][]string{
 		{"Name", "{{ . | name }}"},
 		{"Image", "{{ . | imageName | trunc }}"},
-		{"Digest", "{{ . | imageDigest | trunc }}"},
+		{"Commit", "{{ . | imageCommit | trunc }}"},
 		{"Healthy", "Status.Columns.Healthy"},
 		{"Up-To-Date", "Status.Columns.UpToDate"},
 		{"Created", "{{ago .CreationTimestamp}}"},

pkg/tags/tags.go

@@ -16,6 +16,7 @@ import (
 var (
 	SHAPermissivePrefixPattern = regexp.MustCompile(`^[a-f\d]{3,64}$`)
 	SHAPattern                 = regexp.MustCompile(`^[a-f\d]{64}$`)
+	CommitPattern              = regexp.MustCompile(`^[a-f\d]{40}$`)
 	DigestPattern              = regexp.MustCompile(`^sha256:[a-f\d]{64}$`)
 	// Can't use the NoDefaultRegistry const from the images packages without causing a dependency cycle
 	noDefaultRegistry = "xxx-no-reg"

pkg/vcs/vcs.go

@@ -25,9 +25,25 @@ func VCS(path string) (result v1.VCS) {
 		return
 	}
 
+	var (
+		modified, untracked bool
+	)
+	for _, status := range s {
+		if status.Worktree == git.Untracked {
+			untracked = true
+			continue
+		}
+		if status.Worktree != git.Unmodified || status.Staging != git.Unmodified {
+			modified = true
+			continue
+		}
+	}
+
 	result = v1.VCS{
-		Revision: head.Hash().String(),
-		Modified: !s.IsClean(),
+		Revision:  head.Hash().String(),
+		Clean:     !modified && !untracked,
+		Modified:  modified,
+		Untracked: untracked,
 	}
 
 	// Set optional remotes field