Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions client/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"io"
"net"
"net/url"
"strings"

"github.com/alibaba/pouch/apis/types"
)
Expand Down Expand Up @@ -100,24 +99,6 @@ func (client *APIClient) ContainerUpgrade(ctx context.Context, name string, conf
return err
}

// ContainerTop shows process information from within a container.
func (client *APIClient) ContainerTop(ctx context.Context, name string, arguments []string) (types.ContainerProcessList, error) {
response := types.ContainerProcessList{}
query := url.Values{}
if len(arguments) > 0 {
query.Set("ps_args", strings.Join(arguments, " "))
}

resp, err := client.get(ctx, "/containers/"+name+"/top", query, nil)
if err != nil {
return response, err
}

err = decodeBody(&response, resp.Body)
ensureCloseReader(resp)
return response, err
}

// ContainerLogs return the logs generated by a container in an io.ReadCloser.
func (client *APIClient) ContainerLogs(ctx context.Context, name string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
query := url.Values{}
Expand Down
27 changes: 27 additions & 0 deletions client/container_top.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package client

import (
"context"
"net/url"
"strings"

"github.com/alibaba/pouch/apis/types"
)

// ContainerTop shows process information from within a container.
func (client *APIClient) ContainerTop(ctx context.Context, name string, arguments []string) (types.ContainerProcessList, error) {
response := types.ContainerProcessList{}
query := url.Values{}
if len(arguments) > 0 {
query.Set("ps_args", strings.Join(arguments, " "))
}

resp, err := client.get(ctx, "/containers/"+name+"/top", query, nil)
if err != nil {
return response, err
}

err = decodeBody(&response, resp.Body)
ensureCloseReader(resp)
return response, err
}
68 changes: 68 additions & 0 deletions client/container_top_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings"
"testing"

"github.com/alibaba/pouch/apis/types"
)

func TestContainerTopError(t *testing.T) {
client := &APIClient{
HTTPCli: newMockClient(errorMockResponse(http.StatusInternalServerError, "Server error")),
}
_, err := client.ContainerTop(context.Background(), "nothing", []string{})
if err == nil || !strings.Contains(err.Error(), "Server error") {
t.Fatalf("expected a Server Error, got %v", err)
}
}

func TestContainerTop(t *testing.T) {
expectedURL := "/containers/container_id/top"

httpClient := newMockClient(func(req *http.Request) (*http.Response, error) {
if !strings.HasPrefix(req.URL.Path, expectedURL) {
return nil, fmt.Errorf("expected URL '%s', got '%s'", expectedURL, req.URL)
}
query := req.URL.Query()
args := query.Get("ps_args")
if args != "arg1 arg2" {
return nil, fmt.Errorf("args not set in URL properly. Expected 'arg1 arg2', got %s", args)
}
psListJSON := types.ContainerProcessList{
Processes: [][]string{{"bar11", "bar12"}, {"bar21", "bar22"}},
Titles: []string{"foo1", "foo2"},
}
b, err := json.Marshal(psListJSON)
if err != nil {
return nil, err
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader([]byte(b))),
}, nil
})
client := &APIClient{
HTTPCli: httpClient,
}
psList, err := client.ContainerTop(context.Background(), "container_id", []string{"arg1", "arg2"})
if err != nil {
t.Fatal(err)
}

if len(psList.Titles) != 2 {
t.Fatalf("expected 2 titles, got %v", len(psList.Titles))
}
for _, ps := range psList.Processes {
if len(ps) != len(psList.Titles) {
t.Fatalf("expected 2 values, got %v", len(ps))
break
}
}
}