Merge pull request #2224 from ibuildthecloud/main

Make dev logging be able to be capture and not go to stdout/err

Author: ibuildthecloud

go.mod

@@ -13,7 +13,7 @@ replace (
 require (
 	cuelang.org/go v0.6.0
 	github.com/AlecAivazis/survey/v2 v2.3.6
-	github.com/acorn-io/aml v0.0.0-20231002033428-fffd2918563a
+	github.com/acorn-io/aml v0.0.0-20231005222512-6a3f6ee06953
 	github.com/acorn-io/aml/cli v0.0.0-20231002033428-fffd2918563a
 	github.com/acorn-io/aml/legacy v0.0.0-20230929081514-1e9f3394432e
 	github.com/acorn-io/baaah v0.0.0-20230831185433-be0115009281
@@ -41,7 +41,7 @@ require (
 	github.com/hexops/autogold/v2 v2.2.1
 	github.com/hexops/valast v1.4.4
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
-	github.com/loft-sh/devspace v1.1.1-0.20221217093921-7604c5857f98
+	github.com/loft-sh/devspace v1.1.1-0.20230918143357-5f97e998676e
 	github.com/moby/buildkit v0.11.6
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.0-rc4
@@ -188,8 +188,8 @@ require (
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect
 	github.com/lithammer/fuzzysearch v1.1.5 // indirect
-	github.com/loft-sh/loft-util v0.0.9-alpha // indirect
 	github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee // indirect
+	github.com/loft-sh/utils v0.0.16 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

go.sum

@@ -102,8 +102,8 @@ github.com/ThalesIgnite/crypto11 v1.2.5 h1:1IiIIEqYmBvUYFeMnHqRft4bwf/O36jryEUpY
 github.com/ThalesIgnite/crypto11 v1.2.5/go.mod h1:ILDKtnCKiQ7zRoNxcp36Y1ZR8LBPmR2E23+wTQe/MlE=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
-github.com/acorn-io/aml v0.0.0-20231002033428-fffd2918563a h1:vfo2HyUI+9OhHEDgOuQvpVjpS2z8RVwur2SSrDZw860=
-github.com/acorn-io/aml v0.0.0-20231002033428-fffd2918563a/go.mod h1:I1qN++bfN+6sOV/FiACluqj2Eu5YaHOy82cTAnjLMf0=
+github.com/acorn-io/aml v0.0.0-20231005222512-6a3f6ee06953 h1:uftFqiE7iD8B3gZkSiqvd53ny9Kf6YJbZxpt8bSDGsA=
+github.com/acorn-io/aml v0.0.0-20231005222512-6a3f6ee06953/go.mod h1:I1qN++bfN+6sOV/FiACluqj2Eu5YaHOy82cTAnjLMf0=
 github.com/acorn-io/aml/cli v0.0.0-20231002033428-fffd2918563a h1:0oMIx6lH47ImOakNyTDCfJGOonJHH1k5s0N1bLinCEU=
 github.com/acorn-io/aml/cli v0.0.0-20231002033428-fffd2918563a/go.mod h1:x7Y6lLMTqMD65KWjgVaGem5tQP2ZeevOQiaps9epJj4=
 github.com/acorn-io/aml/legacy v0.0.0-20230929081514-1e9f3394432e h1:W67DG9AcoNvBwIOR9OFUCZlSJBaHuvM2kXQ2+C6EnLk=
@@ -693,12 +693,12 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lithammer/fuzzysearch v1.1.5 h1:Ag7aKU08wp0R9QCfF4GoGST9HbmAIeLP7xwMrOBEp1c=
 github.com/lithammer/fuzzysearch v1.1.5/go.mod h1:1R1LRNk7yKid1BaQkmuLQaHruxcC4HmAH30Dh61Ih1Q=
-github.com/loft-sh/devspace v1.1.1-0.20221217093921-7604c5857f98 h1:EdaHnOWn24TBX08Yuhjr2p2bqS4R0K0TiljMYMJFgac=
-github.com/loft-sh/devspace v1.1.1-0.20221217093921-7604c5857f98/go.mod h1:TWJTlQAUCM0+r21Yeo8ILOvBuWypy2L459arjwwIRHA=
-github.com/loft-sh/loft-util v0.0.9-alpha h1:kGcyTQWxWHWy7bbjhS8Hsq/JRdlSztAU++anV6P+sqk=
-github.com/loft-sh/loft-util v0.0.9-alpha/go.mod h1:lsjG5Exh5iEf7Z/87nqwkxx3GRQTizFRLGuS1knF6Cg=
+github.com/loft-sh/devspace v1.1.1-0.20230918143357-5f97e998676e h1:1io5eZaWJ5mLrO0VDOkvlaXnGPJ7iAPVFFgJTKJ2oUA=
+github.com/loft-sh/devspace v1.1.1-0.20230918143357-5f97e998676e/go.mod h1:ZkURPkP4R3O8TGlnoY/GCw79LHmWIIFyUfzrXrV+yk0=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee h1:hZ79+pKEbCBrH1dVmgZ4jtFrrDPxgM4zqEP1lHlSnvI=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee/go.mod h1:pq83B8lgfCY7tKdegTTXU6DZxGQkcWMowUTOTpTQmqk=
+github.com/loft-sh/utils v0.0.16 h1:XnD6Sb6gRWIHgM34U94dHcQ5MtxN5kAGZQ5eddAxC+c=
+github.com/loft-sh/utils v0.0.16/go.mod h1:n2L3X4i7d8kb2NF+q5duKa41N+N6fBde6XY2AolgSBI=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

integration/dev/dev_test.go

@@ -81,7 +81,9 @@ func TestDev(t *testing.T) {
 	}
 
 	_, err = appWatcher.ByName(ctx, project.Name, "test-app", func(app *v1.AppInstance) (bool, error) {
-		return app.Spec.Image == oldImage && app.Status.DevSession != nil && app.Status.DevSession.SpecOverride.Image != "", nil
+		return app.Spec.Image == oldImage && app.Status.DevSession != nil &&
+			app.Status.DevSession.SpecOverride.Image != "" &&
+			app.Status.DevSession.SpecOverride.Image != oldImage, nil
 	})
 	if err != nil {
 		t.Fatal(err)

integration/log/log_test.go

@@ -118,7 +118,9 @@ func TestContainerLog(t *testing.T) {
 	})
 
 	output, err := c.AppLog(ctx, app.Name, &client.LogOptions{
-		ContainerReplica: replicas[0].Name,
+		LogOptions: apiv1.LogOptions{
+			ContainerReplica: replicas[0].Name,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -176,7 +178,9 @@ func TestSidecarContainerLog(t *testing.T) {
 	})
 
 	output, err := c.AppLog(ctx, app.Name, &client.LogOptions{
-		ContainerReplica: replicas[1].Name,
+		LogOptions: apiv1.LogOptions{
+			ContainerReplica: replicas[1].Name,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -223,7 +227,9 @@ func TestLogDuringDeletion(t *testing.T) {
 	})
 
 	output, err := c.AppLog(ctx, app.Name, &client.LogOptions{
-		Follow: true,
+		LogOptions: apiv1.LogOptions{
+			Follow: true,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)

pkg/cli/log.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"fmt"
 
+	apiv1 "github.com/acorn-io/runtime/pkg/apis/api.acorn.io/v1"
 	cli "github.com/acorn-io/runtime/pkg/cli/builder"
 	"github.com/acorn-io/runtime/pkg/client"
 	"github.com/acorn-io/runtime/pkg/log"
@@ -52,9 +53,11 @@ func (s *Logs) Run(cmd *cobra.Command, args []string) error {
 		tailLines = &s.Tail
 	}
 	return log.Output(cmd.Context(), c, args[0], &client.LogOptions{
-		Follow:    s.Follow,
-		Container: s.Container,
-		Tail:      tailLines,
-		Since:     s.Since,
+		LogOptions: apiv1.LogOptions{
+			Follow:    s.Follow,
+			Container: s.Container,
+			Tail:      tailLines,
+			Since:     s.Since,
+		},
 	})
 }

pkg/client/app.go

@@ -222,7 +222,7 @@ func (c *DefaultClient) appUpdate(ctx context.Context, name string, opts *AppUpd
 			},
 			Spec: v1.DevSessionInstanceSpec{
 				Client:                *opts.DevSessionClient,
-				SessionTimeoutSeconds: 60,
+				SessionTimeoutSeconds: 360,
 				SessionStartTime:      metav1.Now(),
 				SessionRenewTime:      metav1.Now(),
 				SpecOverride:          &app.Spec,
@@ -308,7 +308,7 @@ func (c *DefaultClient) AppLog(ctx context.Context, name string, opts *LogOption
 		Resource("apps").
 		Name(targetName).
 		SubResource("log").
-		VersionedParams((*apiv1.LogOptions)(opts), scheme.ParameterCodec).
+		VersionedParams(&opts.LogOptions, scheme.ParameterCodec).
 		URL()
 
 	conn, _, err := c.Dialer.DialWebsocket(ctx, url.String(), nil)

pkg/client/client.go

@@ -112,7 +112,15 @@ type AppUpdateOptions struct {
 	DevSessionClient    *v1.DevSessionInstanceClient
 }
 
-type LogOptions apiv1.LogOptions
+type ContainerLogsWriter interface {
+	Container(timeStamp metav1.Time, containerName, line string)
+}
+
+type LogOptions struct {
+	apiv1.LogOptions
+
+	Logger ContainerLogsWriter
+}
 
 type AppRunOptions struct {
 	Name                string

pkg/controller/appstatus/ready.go

@@ -60,6 +60,11 @@ func ReadyStatus(req router.Request, resp router.Response) error {
 		}
 	}
 
+	app.Status.Summary.ErrorMessages = errorMessages.List()
+	app.Status.Summary.TransitioningMessages = transitioning.List()
+	emptyMessage := len(app.Status.Summary.ErrorMessages) == 0 &&
+		len(app.Status.Summary.TransitioningMessages) == 0
+
 	var state string
 	if !app.DeletionTimestamp.IsZero() {
 		state = "removing"
@@ -68,12 +73,13 @@ func ReadyStatus(req router.Request, resp router.Response) error {
 			state = "stopped"
 		} else {
 			state = "stopping"
+			if emptyMessage {
+				app.Status.Summary.TransitioningMessages = append(app.Status.Summary.TransitioningMessages, "Stopping")
+			}
 		}
 	} else if errorMessages.Len() > 0 {
-		app.Status.Summary.ErrorMessages = []string{errorMessages.List()[0]}
 		state = "error"
 	} else if transitioning.Len() > 0 {
-		app.Status.Summary.TransitioningMessages = []string{transitioning.List()[0]}
 		state = "provisioning"
 	} else if app.Status.Ready {
 		if app.Status.AppStatus.Completed {
@@ -83,6 +89,9 @@ func ReadyStatus(req router.Request, resp router.Response) error {
 		}
 	} else {
 		state = "not ready"
+		if emptyMessage {
+			app.Status.Summary.TransitioningMessages = append(app.Status.Summary.TransitioningMessages, "Waiting")
+		}
 	}
 
 	app.Status.Summary.State = state