Stack listing options

api/rpc/stack/stack.go

@@ -615,10 +615,16 @@ func (s *Server) List(ctx context.Context, in *ListRequest) (*ListReply, error)
 	if err != nil {
 		return nil, err
 	}
-	listInfo := make([]*StackInfo, len(idList), len(idList))
+	listInfo := []*StackInfo{}
 	for i, ID := range idList {
-		obj, _ := ID.(*StackID)
-		listInfo[i] = s.getStackInfo(ctx, obj.Id)
+		if in.Limit == 0 || len(idList)-i <= int(in.Limit) {
+			obj, _ := ID.(*StackID)
+			info := s.getStackInfo(ctx, obj.Id)
+			fmt.Println("info", info)
+			if in.All || info.State == "Running" {
+				listInfo = append(listInfo, s.getStackInfo(ctx, obj.Id))
+			}
+		}
 	}
 	reply := ListReply{
 		List: listInfo,

api/rpc/stack/stack.proto

@@ -40,7 +40,9 @@ message StackReply {
 }
 
 // struct for list request function
-message ListRequest {  
+message ListRequest {
+  bool all = 1;
+  int64 limit = 2;
 }
 
 // struct for list reply function

cmd/amp/cli/cli_test.go

@@ -0,0 +1,107 @@
+package cli_test
+
+import (
+	"github.com/appcelerator/amp/api/server"
+	"gopkg.in/yaml.v2"
+	"io/ioutil"
+	"os/exec"
+	"path"
+	"strings"
+	"testing"
+	"time"
+)
+
+type TestSpec struct {
+	fileName string
+	contents []byte
+}
+
+type commandSpec struct {
+	Cmd     string   `yaml:"cmd"`
+	Args    []string `yaml:"args"`
+	Options []string `yaml:"options"`
+}
+
+var (
+	testDir          = "./test_samples"
+)
+
+func TestMain(t *testing.T) {
+	_, conn := server.StartTestServer()
+	t.Log(conn)
+}
+
+func TestCmds(t *testing.T) {
+	tests := loadFiles(t)
+	for _, test := range tests {
+		parse(t, test)
+	}
+}
+
+func loadFiles(t *testing.T) []*TestSpec {
+	tests := []*TestSpec{}
+	files, err := ioutil.ReadDir(testDir)
+	if err != nil {
+		t.Error(err)
+		return nil
+	}
+	for _, f := range files {
+		name := f.Name()
+		t.Log("Loading file:", name)
+		contents, err := ioutil.ReadFile(path.Join(testDir, name))
+		if err != nil {
+			t.Errorf("unable to load test sample: %s. Error: %v", name, err)
+		}
+		testSpec := &TestSpec{
+			fileName: name,
+			contents: contents,
+		}
+		tests = append(tests, testSpec)
+	}
+	return tests
+}
+
+func parse(t *testing.T, test *TestSpec) {
+	commandMap, err := parseCommandMap(test.contents)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	for _, spec := range commandMap {
+		cmdSplit := strings.Fields(spec.Cmd)
+		optionsSplit := []string{}
+		for _, val := range spec.Options {
+			optionsSplit = append(optionsSplit, strings.Fields(val)...)
+		}
+		commandFinal := append(cmdSplit, spec.Args...)
+		commandFinal = append(commandFinal, optionsSplit...)
+		t.Log(commandFinal, "Command passed.")
+		runCmd(t, commandFinal)
+	}
+}
+
+func runCmd(t *testing.T, cmdString []string) {
+	t.Log(cmdString, "Running...")
+	for i := 0; i < 10; i++ {
+		t.Log(cmdString, " Iteration:", i+1)
+		cmd := exec.Command(cmdString[0], cmdString[1:]...)
+		result, err := cmd.CombinedOutput()
+		if err != nil && i >= 9 {
+			t.Log(cmdString, " Error:", err)
+			t.Log(cmdString, " Command has failed, exiting.")
+			t.Fail()
+		} else if err != nil {
+			t.Log(cmdString, " Error:", err)
+			t.Log(cmdString, " Command failed, retrying.")
+			time.Sleep(1 * time.Second)
+		} else {
+			t.Log(cmdString, " Command result:\n", string(result))
+			break
+		}
+	}
+}
+
+func parseCommandMap(b []byte) (out map[string]commandSpec, err error) {
+	err = yaml.Unmarshal(b, &out)
+	return
+}

cmd/amp/cli/test_samples/01-create-service.yml

@@ -0,0 +1,7 @@
+create-service:
+  cmd: amp service create
+  args:
+    - appcelerator/pinger
+  options:
+    - --name pinger
+    - -p www:90:3000

cmd/amp/cli/test_samples/02-list-service.yml

@@ -0,0 +1,4 @@
+list-service:
+  cmd: docker service ls
+  args:
+  options:

cmd/amp/cli/test_samples/03-curl-service.yml

@@ -0,0 +1,5 @@
+curl-service:
+  cmd: curl
+  args:
+    - localhost:90/ping
+  options:

cmd/amp/cli/test_samples/04-remove-service.yml

@@ -0,0 +1,9 @@
+remove-service:
+  cmd: amp service rm
+  args:
+    - pinger
+  options:
+list-service:
+  cmd: docker service ls
+  args:
+  options:

cmd/amp/stack.go

@@ -76,14 +76,21 @@ var (
 			}
 		},
 	}
+	listQuiet  *bool
+	listAll    *bool
+	listLast   *int64
+	listLatest *bool
 )
 
 func init() {
 	RootCmd.AddCommand(StackCmd)
 	flags := upCmd.Flags()
 	flags.StringVarP(&stackfile, "file", "f", stackfile, "The name of the stackfile")
 	rmCmd.Flags().BoolP("force", "f", false, "Remove the stack whatever condition")
-	listCmd.Flags().BoolP("quiet", "q", false, "return only stack id to be use with grep")
+	listQuiet = listCmd.Flags().BoolP("quiet", "q", false, "Only display numeric IDs")
+	listAll = listCmd.Flags().BoolP("all", "a", false, "Show all stacks (default shows just running)")
+	listLast = listCmd.Flags().Int64P("last", "n", 0, "Show n last created stacks (includes all states)")
+	listLatest = listCmd.Flags().BoolP("latest", "l", false, "Show the latest created stack (includes all states)")
 	StackCmd.AddCommand(upCmd)
 	StackCmd.AddCommand(startCmd)
 	StackCmd.AddCommand(stopCmd)
@@ -204,14 +211,21 @@ func remove(amp *client.AMP, cmd *cobra.Command, args []string) error {
 }
 
 func list(amp *client.AMP, cmd *cobra.Command, args []string) error {
-	request := &stack.ListRequest{}
+	var limit = *listLast
+	if *listLatest {
+		limit = 1
+	}
+	request := &stack.ListRequest{
+		All:   *listAll,
+		Limit: limit,
+	}
 	client := stack.NewStackServiceClient(amp.Conn)
 	reply, err := client.List(context.Background(), request)
 	if err != nil {
 		return err
 	}
 	//Manage -q
-	if cmd.Flag("quiet").Value.String() == "true" {
+	if *listQuiet {
 		for _, info := range reply.List {
 			fmt.Println(info.Id)
 		}