feat(apps): change drycc run to async

Author: duanhongyi

cmd/apps.go

@@ -250,18 +250,9 @@ func (d *DryccCmd) AppRun(appID, command string, volumeVars []string) error {
 		return err
 	}
 
-	out, err := apps.Run(s.Client, appID, command, volumeMap)
-	if d.checkAPICompatibility(s.Client, err) != nil {
+	if err := apps.Run(s.Client, appID, command, volumeMap); d.checkAPICompatibility(s.Client, err) != nil {
 		return err
 	}
-
-	if out.ReturnCode == 0 {
-		d.Print(out.Output)
-	} else {
-		d.PrintErr(out.Output)
-	}
-
-	os.Exit(out.ReturnCode)
 	return nil
 }
 

cmd/cmd.go

@@ -78,6 +78,7 @@ type Commander interface {
 	PermCreate(string, string, bool) error
 	PermDelete(string, string, bool) error
 	PsList(string, int) error
+	PsLogs(string, string, int, bool, string) error
 	PsExec(string, string, bool, bool, []string) error
 	PsScale(string, []string) error
 	PsRestart(string, string) error

cmd/ps.go

@@ -5,13 +5,16 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"os"
 	"regexp"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/containerd/console"
 	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/controller-sdk-go/ps"
+	"github.com/drycc/workflow-cli/pkg/logging"
 	"golang.org/x/net/websocket"
 	yaml "gopkg.in/yaml.v3"
 )
@@ -45,6 +48,37 @@ func (d *DryccCmd) PsList(appID string, results int) error {
 	return nil
 }
 
+// PodLogs returns the logs from an pod.
+func (d *DryccCmd) PsLogs(appID, podID string, lines int, follow bool, container string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+	request := api.PodLogsRequest{
+		Lines:     lines,
+		Follow:    follow,
+		Container: container,
+	}
+	conn, err := ps.Logs(s.Client, appID, podID, request)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+	for {
+		var message string
+		err := websocket.Message.Receive(conn, &message)
+		if err != nil {
+			if err != io.EOF {
+				log.Printf("error: %v", err)
+			}
+			break
+		}
+		logging.PrintLog(os.Stdout, strings.TrimRight(string(message), "\n"))
+	}
+	return nil
+}
+
 // PsList lists an app's processes.
 func (d *DryccCmd) PsExec(appID, podID string, tty, stdin bool, command []string) error {
 	s, appID, err := load(d.ConfigFile, appID)
@@ -173,12 +207,12 @@ func runRecvTask(conn *websocket.Conn, c console.Console, recvChan, sendChan cha
 				cancel()
 				break
 			}
-			if message, err := parseChannelMessage(data); err != nil {
+			message, err := parseChannelMessage(data)
+			if err != nil {
 				cancel()
 				break
-			} else {
-				recvChan <- message
 			}
+			recvChan <- message
 		}
 	}()
 	go func() {
@@ -272,12 +306,10 @@ func parseChannelMessage(data string) (string, error) {
 		if value, hasKey := data["message"]; hasKey {
 			if message, ok := value.(string); ok {
 				return message, nil
-			} else {
-				return "", fmt.Errorf("message is not string, type: %T", message)
 			}
-		} else {
-			return "", nil
+			return "", fmt.Errorf("message is not string, type: %T", message)
 		}
+		return "", nil
 	}
 	return message, nil
 }

cmd/ps_test.go

@@ -106,6 +106,25 @@ func TestPsExec(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+func TestPsLogs(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
+	server.Mux.Handle(
+		"/v2/apps/foo/pods/foo-web-111/logs/",
+		websocket.Handler(func(conn *websocket.Conn) {
+			conn.WriteClose(100)
+		}),
+	)
+	err = cmdr.PsLogs("foo", "foo-web-111", 300, true, "runner")
+	assert.NoError(t, err)
+}
+
 type psTargetCases struct {
 	Targets       []string
 	ExpectedError bool

go.mod

@@ -5,7 +5,7 @@ go 1.22
 require (
 	github.com/containerd/console v1.0.4
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/drycc/controller-sdk-go v0.0.0-20240222015357-c385680d03cd
+	github.com/drycc/controller-sdk-go v0.0.0-20240301062701-f528b91c1759
 	github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/stretchr/testify v1.8.4

go.sum

@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/drycc/controller-sdk-go v0.0.0-20240222015357-c385680d03cd h1:e0473hmWPUVROSR51wiIOWb3Jvt5GJb571q8BNAPInw=
-github.com/drycc/controller-sdk-go v0.0.0-20240222015357-c385680d03cd/go.mod h1:EAzlvB5kQq4pFP+h+zl0mx2q1GUlHgzdQ92tlYtDQfQ=
+github.com/drycc/controller-sdk-go v0.0.0-20240301062701-f528b91c1759 h1:yBhvNVINJ+FSwZupsik4QzJR/DXPiJ8SvUFrZ/89ISA=
+github.com/drycc/controller-sdk-go v0.0.0-20240301062701-f528b91c1759/go.mod h1:EAzlvB5kQq4pFP+h+zl0mx2q1GUlHgzdQ92tlYtDQfQ=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f h1:kgjvUQJeAszDoU1Vo4vTTE92KI8Av3JPb6Qn890niXg=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f/go.mod h1:n+QxGif6ha9CEoxVnlipxb9IdmerybcUSzTEDFkvjiA=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=

parser/apps.go

@@ -187,7 +187,7 @@ Options:
 	if lines <= 0 {
 		lines = 300
 	}
-	follow := args["--follow"].(bool)
+	follow := safeGetBool(args, "--follow")
 	timeout := safeGetInt(args, "--timeout")
 	if timeout <= 0 {
 		timeout = 300

parser/ps.go

@@ -14,6 +14,7 @@ func Ps(argv []string, cmdr cmd.Commander) error {
 Valid commands for processes:
 
 ps:list        list application processes
+ps:logs        print the logs for a container
 ps:exec        execute a command in a container
 ps:restart     restart an application or process type
 ps:scale       scale processes (e.g. web=4 worker=2)
@@ -24,6 +25,8 @@ Use 'drycc help [command]' to learn more.
 	switch argv[0] {
 	case "ps:list":
 		return psList(argv, cmdr)
+	case "ps:logs":
+		return psLogs(argv, cmdr)
 	case "ps:exec":
 		return psExec(argv, cmdr)
 	case "ps:restart":
@@ -65,6 +68,41 @@ Options:
 	return cmdr.PsList(safeGetString(args, "--app"), 1000)
 }
 
+func psLogs(argv []string, cmdr cmd.Commander) error {
+	usage := `
+Print the logs for a container in a pod or specified resource.
+
+Usage: drycc ps:logs <pod> [options]
+
+Options:
+  -a --app=<app>
+    the uniquely identifiable name for the application.
+  -n --lines=<lines>
+    the number of lines to display.
+  -f --follow
+    specify if the logs should be streamed.
+  -t --container=<container>
+    print the logs of this container.
+`
+
+	args, err := docopt.ParseArgs(usage, argv, "")
+
+	if err != nil {
+		return err
+	}
+
+	app := safeGetString(args, "--app")
+	lines := safeGetInt(args, "--lines")
+	if lines <= 0 {
+		lines = 300
+	}
+	follow := safeGetBool(args, "--follow")
+	podID := safeGetString(args, "<pod>")
+	container := safeGetString(args, "--container")
+
+	return cmdr.PsLogs(app, podID, lines, follow, container)
+}
+
 func psExec(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Execute a command in a container.

parser/ps_test.go

@@ -16,6 +16,10 @@ func (d FakeDryccCmd) PsList(string, int) error {
 	return errors.New("ps:list")
 }
 
+func (d FakeDryccCmd) PsLogs(string, string, int, bool, string) error {
+	return errors.New("ps:logs")
+}
+
 func (d FakeDryccCmd) PsExec(string, string, bool, bool, []string) error {
 	return errors.New("ps:exec")
 }
@@ -49,6 +53,10 @@ func TestPs(t *testing.T) {
 			args:     []string{"ps:list"},
 			expected: "",
 		},
+		{
+			args:     []string{"ps:logs", "myapp-web-111"},
+			expected: "",
+		},
 		{
 			args:     []string{"ps:restart", "web"},
 			expected: "",