Merge pull request #4061 from Joshua-Anderson/add-ps

feat(client-go): added ps endpoint

Author: carmstrong

client-go/cmd/ps.go

@@ -0,0 +1,144 @@
+package cmd
+
+import (
+	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/deis/deis/client-go/controller/api"
+	"github.com/deis/deis/client-go/controller/models/ps"
+)
+
+// PsList lists an app's processes.
+func PsList(appID string) error {
+	c, appID, err := load(appID)
+
+	if err != nil {
+		return err
+	}
+
+	processes, err := ps.List(c, appID)
+
+	if err != nil {
+		return err
+	}
+
+	printProcesses(appID, processes)
+
+	return nil
+}
+
+// PsScale scales an app's processes.
+func PsScale(appID string, targets []string) error {
+	c, appID, err := load(appID)
+
+	if err != nil {
+		return err
+	}
+
+	targetMap := make(map[string]int)
+	regex := regexp.MustCompile("^([A-z]+)=([0-9]+)$")
+
+	for _, target := range targets {
+		if regex.MatchString(target) {
+			captures := regex.FindStringSubmatch(target)
+			targetMap[captures[1]], err = strconv.Atoi(captures[2])
+
+			if err != nil {
+				return err
+			}
+		} else {
+			fmt.Printf("'%s' does not match the pattern 'type=num', ex: web=2\n", target)
+		}
+	}
+
+	fmt.Printf("Scaling processes... but first, %s!\n", drinkOfChoice())
+	startTime := time.Now()
+	quit := progress()
+
+	err = ps.Scale(c, appID, targetMap)
+
+	quit <- true
+	<-quit
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("done in %ds\n", int(time.Since(startTime).Seconds()))
+
+	processes, err := ps.List(c, appID)
+
+	if err != nil {
+		return err
+	}
+
+	printProcesses(appID, processes)
+	return nil
+}
+
+// PsRestart restarts an app's processes.
+func PsRestart(appID, target string) error {
+	c, appID, err := load(appID)
+
+	if err != nil {
+		return err
+	}
+
+	psType := ""
+	psNum := -1
+
+	if target != "" {
+		if strings.Contains(target, ".") {
+			parts := strings.Split(target, ".")
+			psType = parts[0]
+			psNum, err = strconv.Atoi(parts[1])
+
+			if err != nil {
+				return err
+			}
+		} else {
+			psType = target
+		}
+	}
+
+	fmt.Printf("Restarting processes... but first, %s!\n", drinkOfChoice())
+	startTime := time.Now()
+	quit := progress()
+
+	_, err = ps.Restart(c, appID, psType, psNum)
+
+	quit <- true
+	<-quit
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("done in %ds\n", int(time.Since(startTime).Seconds()))
+
+	processes, err := ps.List(c, appID)
+
+	if err != nil {
+		return err
+	}
+
+	printProcesses(appID, processes)
+	return nil
+}
+
+func printProcesses(appID string, processes []api.Process) {
+	psMap := ps.ByType(processes)
+
+	fmt.Printf("=== %s Processes\n", appID)
+
+	for psType, procs := range psMap {
+		fmt.Printf("--- %s:\n", psType)
+
+		for _, proc := range procs {
+			fmt.Printf("%s.%d %s (%s)\n", proc.Type, proc.Num, proc.State, proc.Release)
+		}
+	}
+}

client-go/cmd/utils.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"strings"
 	"time"
 
@@ -66,3 +67,13 @@ func load(appID string) (*client.Client, string, error) {
 
 	return c, appID, nil
 }
+
+func drinkOfChoice() string {
+	drink := os.Getenv("DEIS_DRINK_OF_CHOICE")
+
+	if drink == "" {
+		drink = "coffee"
+	}
+
+	return drink
+}

client-go/controller/api/ps.go

@@ -0,0 +1,22 @@
+package api
+
+// Process defines the structure of a process.
+type Process struct {
+	Owner   string `json:"owner"`
+	App     string `json:"app"`
+	Release string `json:"release"`
+	Created string `json:"created"`
+	Updated string `json:"updated"`
+	UUID    string `json:"uuid"`
+	Type    string `json:"type"`
+	Num     int    `json:"num"`
+	State   string `json:"state"`
+}
+
+// Processes defines the structure of processes.
+type Processes struct {
+	Count     int       `json:"count"`
+	Next      int       `json:"next"`
+	Previous  int       `json:"previous"`
+	Processes []Process `json:"results"`
+}

client-go/controller/models/ps/ps.go

@@ -0,0 +1,98 @@
+package ps
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strconv"
+
+	"github.com/deis/deis/client-go/controller/api"
+	"github.com/deis/deis/client-go/controller/client"
+)
+
+// List an app's processes.
+func List(c *client.Client, appID string) ([]api.Process, error) {
+	u := fmt.Sprintf("/v1/apps/%s/containers/", appID)
+	body, status, err := c.BasicRequest("GET", u, nil)
+
+	if err != nil {
+		return []api.Process{}, err
+	}
+
+	if status != 200 {
+		return []api.Process{}, errors.New(body)
+	}
+
+	procs := api.Processes{}
+	if err = json.Unmarshal([]byte(body), &procs); err != nil {
+		return []api.Process{}, err
+	}
+
+	return procs.Processes, nil
+}
+
+// Scale an app's processes.
+func Scale(c *client.Client, appID string, targets map[string]int) error {
+	u := fmt.Sprintf("/v1/apps/%s/scale/", appID)
+
+	body, err := json.Marshal(targets)
+
+	if err != nil {
+		return err
+	}
+
+	resBody, status, err := c.BasicRequest("POST", u, body)
+
+	if err != nil {
+		return err
+	}
+
+	if status != 204 {
+		return errors.New(resBody)
+	}
+
+	return nil
+}
+
+// Restart an app's processes.
+func Restart(c *client.Client, appID string, procType string, num int) ([]api.Process, error) {
+	u := fmt.Sprintf("/v1/apps/%s/containers/", appID)
+
+	if procType == "" {
+		u += "restart/"
+	} else {
+		if num == -1 {
+			u += procType + "/restart/"
+		} else {
+			u += procType + "/" + strconv.Itoa(num) + "/restart/"
+		}
+	}
+
+	body, status, err := c.BasicRequest("POST", u, nil)
+
+	if err != nil {
+		return []api.Process{}, err
+	}
+
+	if status != 200 {
+		return []api.Process{}, errors.New(body)
+	}
+
+	procs := []api.Process{}
+	if err = json.Unmarshal([]byte(body), &procs); err != nil {
+		return []api.Process{}, err
+	}
+
+	return procs, nil
+}
+
+// ByType organizes processes of an app by process type.
+func ByType(processes []api.Process) map[string][]api.Process {
+	psMap := make(map[string][]api.Process)
+
+	for _, ps := range processes {
+		psMap[ps.Type] = append(psMap[ps.Type], ps)
+	}
+
+	return psMap
+}