chore(ps): add pod logs support

Author: duanhongyi

api/apps.go

@@ -30,12 +30,8 @@ type AppUpdateRequest struct {
 type AppRunRequest struct {
 	Command string                 `json:"command"`
 	Volumes map[string]interface{} `json:"volumes,omitempty"`
-}
-
-// AppRunResponse is the definition of /v2/apps/<app id>/run.
-type AppRunResponse struct {
-	Output     string `json:"output"`
-	ReturnCode int    `json:"exit_code"`
+	Timeout uint32                 `json:"timeout,omitempty"`
+	Expires uint32                 `json:"expires,omitempty"`
 }
 
 // AppLogsRequest is the definition of websocket /v2/apps/<app id>/logs

api/ps.go

@@ -40,6 +40,13 @@ type PodType struct {
 // PodTypes holds groups of pods organized by type.
 type PodTypes []PodType
 
+// AppLogsRequest is the definition of websocket /v2/apps/<app id>/logs
+type PodLogsRequest struct {
+	Lines     int    `json:"lines"`
+	Follow    bool   `json:"follow"`
+	Container string `json:"container"`
+}
+
 // Start is the definition of POST /v2/apps/<app_id>/stop or POST /v2/apps/<app_id>/start.
 type Types struct {
 	Types []string `json:"types,omitempty"`

apps/apps.go

@@ -119,31 +119,28 @@ func Logs(c *drycc.Client, appID string, request api.AppLogsRequest) (*websocket
 
 // Run a one-time command in your app. This will start a kubernetes job with the
 // same container image and environment as the rest of the app.
-func Run(c *drycc.Client, appID string, command string, volumes map[string]interface{}) (api.AppRunResponse, error) {
+func Run(c *drycc.Client, appID string, command string, volumes map[string]interface{}, timeout, expires uint32) error {
 	req := api.AppRunRequest{
 		Command: command,
 		Volumes: volumes,
+		Timeout: timeout,
+		Expires: expires,
 	}
 	body, err := json.Marshal(req)
 
 	if err != nil {
-		return api.AppRunResponse{}, err
+		return err
 	}
 
 	u := fmt.Sprintf("/v2/apps/%s/run", appID)
 
 	res, reqErr := c.Request("POST", u, body)
-	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
-		return api.AppRunResponse{}, reqErr
-	}
-
-	arr := api.AppRunResponse{}
 
-	if err = json.NewDecoder(res.Body).Decode(&arr); err != nil {
-		return api.AppRunResponse{}, err
+	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
+		return reqErr
 	}
-
-	return arr, reqErr
+	defer res.Body.Close()
+	return reqErr
 }
 
 // Delete an app.

apps/apps_test.go

@@ -43,7 +43,7 @@ const appsFixture string = `
 }`
 
 const appCreateExpected string = `{"id":"example-go"}`
-const appRunExpected string = `{"command":"echo hi"}`
+const appRunExpected string = `{"command":"echo hi","timeout":3600,"expires":3600}`
 const appTransferExpected string = `{"owner":"test"}`
 
 type fakeHTTPServer struct {
@@ -227,11 +227,6 @@ func TestAppsDestroy(t *testing.T) {
 func TestAppsRun(t *testing.T) {
 	t.Parallel()
 
-	expected := api.AppRunResponse{
-		Output:     "hi\n",
-		ReturnCode: 0,
-	}
-
 	handler := fakeHTTPServer{}
 	server := httptest.NewServer(&handler)
 	defer server.Close()
@@ -241,15 +236,9 @@ func TestAppsRun(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	actual, err := Run(drycc, "example-go", "echo hi", nil)
-
-	if err != nil {
+	if err := Run(drycc, "example-go", "echo hi", nil, 3600, 3600); err != nil {
 		t.Fatal(err)
 	}
-
-	if !reflect.DeepEqual(expected, actual) {
-		t.Errorf("Expected %v, Got %v", expected, actual)
-	}
 }
 
 func TestAppsList(t *testing.T) {

auth/auth.go

@@ -4,14 +4,15 @@ package auth
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
+
 	drycc "github.com/drycc/controller-sdk-go"
 	"github.com/drycc/controller-sdk-go/api"
-	"net/http"
 )
 
 // Login to the controller and get a oauth url
 func Login(c *drycc.Client) (string, error) {
-	c.HTTPClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+	c.HTTPClient.CheckRedirect = func(*http.Request, []*http.Request) error {
 		return http.ErrUseLastResponse
 	}
 	res, reqErr := c.Request("POST", "/v2/auth/login/", nil)

ps/ps.go

@@ -30,12 +30,12 @@ func List(c *drycc.Client, appID string, results int) (api.PodsList, int, error)
 }
 
 // Exec a command in a container.
-func Exec(c *drycc.Client, app, pod string, command api.Command) (*websocket.Conn, error) {
+func Exec(c *drycc.Client, appID, podID string, command api.Command) (*websocket.Conn, error) {
 	scheme := "ws"
 	if c.ControllerURL.Scheme == "https" {
 		scheme = "wss"
 	}
-	path := fmt.Sprintf("v2/apps/%s/pods/%s/exec/", app, pod)
+	path := fmt.Sprintf("v2/apps/%s/pods/%s/exec/", appID, podID)
 	u := url.URL{Scheme: scheme, Host: c.ControllerURL.Host, Path: path}
 	config, err := websocket.NewConfig(u.String(), c.ControllerURL.String())
 	if err != nil {
@@ -54,6 +54,35 @@ func Exec(c *drycc.Client, app, pod string, command api.Command) (*websocket.Con
 	return conn, nil
 }
 
+// Logs retrieves logs from an pod. The number of log lines fetched can be set by the lines
+func Logs(c *drycc.Client, appID, podID string, request api.PodLogsRequest) (*websocket.Conn, error) {
+	scheme := "ws"
+	if c.ControllerURL.Scheme == "https" {
+		scheme = "wss"
+	}
+	path := fmt.Sprintf("v2/apps/%s/pods/%s/logs/", appID, podID)
+	endpoint := url.URL{Scheme: scheme, Host: c.ControllerURL.Host, Path: path}
+
+	config, err := websocket.NewConfig(endpoint.String(), c.ControllerURL.String())
+	if err != nil {
+		return nil, err
+	}
+	config.Header = http.Header{
+		"User-Agent":           {c.UserAgent},
+		"Authorization":        {"token " + c.Token},
+		"X-Drycc-Builder-Auth": {c.HooksToken},
+	}
+	conn, err := websocket.DialConfig(config)
+	if err != nil {
+		return nil, err
+	}
+	err = websocket.JSON.Send(conn, request)
+	if err != nil {
+		return nil, err
+	}
+	return conn, nil
+}
+
 // Scale increases or decreases an app's processes. The processes are specified in the target argument,
 // a key-value map, where the key is the process name and the value is the number of replicas
 func Scale(c *drycc.Client, appID string, targets map[string]int) error {
@@ -66,6 +95,9 @@ func Scale(c *drycc.Client, appID string, targets map[string]int) error {
 	}
 
 	res, err := c.Request("POST", u, body)
+	if err != nil && !drycc.IsErrAPIMismatch(err) {
+		return err
+	}
 	defer res.Body.Close()
 	return err
 }
@@ -83,6 +115,9 @@ func Restart(c *drycc.Client, appID string, procType string) error {
 	}
 
 	res, err := c.Request("POST", u, nil)
+	if err != nil && !drycc.IsErrAPIMismatch(err) {
+		return err
+	}
 	defer res.Body.Close()
 	return err
 }

ps/ps_test.go

@@ -156,6 +156,47 @@ func TestExec(t *testing.T) {
 	}
 }
 
+func TestPodLogs(t *testing.T) {
+	var once sync.Once
+	var addr string
+
+	once.Do(func() {
+		http.Handle(
+			"/v2/apps/example-go/pods/example-go-web-111/logs/",
+			websocket.Handler(func(conn *websocket.Conn) {
+				io.Copy(conn, conn)
+			}),
+		)
+		server := httptest.NewServer(nil)
+		addr = server.Listener.Addr().String()
+		log.Print("Test WebSocket server listening on ", addr)
+	})
+
+	drycc, err := drycc.New(false, addr, "abc")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := api.PodLogsRequest{
+		Lines:     100,
+		Follow:    true,
+		Container: "runner",
+	}
+
+	conn, err := Logs(drycc, "example-go", "example-go-web-111", expected)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var actual api.PodLogsRequest
+	err = websocket.JSON.Receive(conn, &actual)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(actual, expected) {
+		t.Errorf("Expected: %v, Got %v", expected, actual)
+	}
+}
+
 type testExpected struct {
 	Name     string
 	Type     string

tls/tls_test.go

@@ -84,16 +84,15 @@ func (fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 			res.WriteHeader(http.StatusCreated)
 			res.Write([]byte(issuerFixture))
 			return
-		} else {
-			fmt.Printf("Expected '%s', %s or '%s', Got '%s'\n",
-				tlsEnableExpected,
-				tlsDisableExpected,
-				issuerExpected,
-				body)
-			res.WriteHeader(http.StatusInternalServerError)
-			res.Write(nil)
-			return
 		}
+		fmt.Printf("Expected '%s', %s or '%s', Got '%s'\n",
+			tlsEnableExpected,
+			tlsDisableExpected,
+			issuerExpected,
+			body)
+		res.WriteHeader(http.StatusInternalServerError)
+		res.Write(nil)
+		return
 	}
 
 	fmt.Printf("Unrecongized URL %s\n", req.URL)
@@ -132,15 +131,14 @@ func (badJSONFakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Reques
 			res.WriteHeader(http.StatusCreated)
 			res.Write([]byte(issuerFixture + "blarg"))
 			return
-		} else {
-			fmt.Printf("Expected '%s' or '%s', Got '%s'\n",
-				tlsEnableExpected,
-				tlsDisableExpected,
-				body)
-			res.WriteHeader(http.StatusInternalServerError)
-			res.Write(nil)
-			return
 		}
+		fmt.Printf("Expected '%s' or '%s', Got '%s'\n",
+			tlsEnableExpected,
+			tlsDisableExpected,
+			body)
+		res.WriteHeader(http.StatusInternalServerError)
+		res.Write(nil)
+		return
 	}
 
 	fmt.Printf("Unrecongized URL %s\n", req.URL)