feat(ps): add pod logs support

Author: duanhongyi

cmd/apps.go

@@ -237,7 +237,7 @@ func (d *DryccCmd) AppLogs(appID string, lines int, follow bool, timeout int) er
 }
 
 // AppRun runs a one time command in the app.
-func (d *DryccCmd) AppRun(appID, command string, volumeVars []string) error {
+func (d *DryccCmd) AppRun(appID, command string, volumeVars []string, timeout, expires uint32) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {
@@ -250,7 +250,7 @@ func (d *DryccCmd) AppRun(appID, command string, volumeVars []string) error {
 		return err
 	}
 
-	if err := apps.Run(s.Client, appID, command, volumeMap); d.checkAPICompatibility(s.Client, err) != nil {
+	if err := apps.Run(s.Client, appID, command, volumeMap, timeout, expires); d.checkAPICompatibility(s.Client, err) != nil {
 		return err
 	}
 	return nil

cmd/cmd.go

@@ -14,7 +14,7 @@ type Commander interface {
 	AppInfo(string) error
 	AppOpen(string) error
 	AppLogs(string, int, bool, int) error
-	AppRun(string, string, []string) error
+	AppRun(string, string, []string, uint32, uint32) error
 	AppDestroy(string, string) error
 	AppTransfer(string, string) error
 	AutoscaleList(string) error

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-20240301062701-f528b91c1759
+	github.com/drycc/controller-sdk-go v0.0.0-20240304053455-0352ebbb02dc
 	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-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/controller-sdk-go v0.0.0-20240304053455-0352ebbb02dc h1:tRMSrNX3qFzQsfVhij1pO2pwHIWTdSvCbrAcsX+wwrQ=
+github.com/drycc/controller-sdk-go v0.0.0-20240304053455-0352ebbb02dc/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

@@ -213,6 +213,10 @@ Arguments:
 Options:
   -a --app=<app>
     the uniquely identifiable name for the application.
+  --timeout=<timeout>
+    the timeout for command run, default to 3600 seconds.
+  --expires=<expires>
+    retention time of running records, default to 3600 seconds.
 `
 
 	args, err := docopt.ParseArgs(usage, argv, "")
@@ -222,9 +226,11 @@ Options:
 	}
 
 	app := safeGetString(args, "--app")
+	timeout := uint32(safeGetInt(args, "--timeout"))
+	expires := uint32(safeGetInt(args, "--expires"))
 	command := strings.Join(args["<command>"].([]string), " ")
 	mounts := args["--mount"].([]string)
-	return cmdr.AppRun(app, command, mounts)
+	return cmdr.AppRun(app, command, mounts, timeout, expires)
 }
 
 func appDestroy(argv []string, cmdr cmd.Commander) error {

parser/apps_test.go

@@ -32,7 +32,7 @@ func (d FakeDryccCmd) AppLogs(string, int, bool, int) error {
 	return errors.New("apps:logs")
 }
 
-func (d FakeDryccCmd) AppRun(string, string, []string) error {
+func (d FakeDryccCmd) AppRun(string, string, []string, uint32, uint32) error {
 	return errors.New("apps:run")
 }
 

parser/volumes.go

@@ -85,7 +85,7 @@ Options:
 	app := safeGetString(args, "--app")
 	vType := safeGetValue(args, "--type", "csi")
 	name := safeGetString(args, "<name>")
-	size := safeGetValue(args, "<size>", "0G")
+	size := safeGetString(args, "<size>")
 	parameters := map[string]interface{}{}
 	if vType == "nfs" {
 		server := safeGetString(args, "--nfs-server")