deisctl working with updater

Author: smothiki

client/list.go

@@ -114,8 +114,8 @@ func (c *FleetClient) List() (err error) {
 	}
 	for _, j := range jj {
 		if strings.HasPrefix(j.Name, "deis-") {
-			j.
-				sortable = append(sortable, j.Name)
+			jobs[j.Name] = j
+			sortable = append(sortable, j.Name)
 		}
 	}
 	sortable.Sort()
@@ -124,16 +124,13 @@ func (c *FleetClient) List() (err error) {
 }
 
 func (c *FleetClient) GetLocaljobs() sort.StringSlice {
-	cols := strings.Split(defaultListUnitFields, ",")
-	var jobs map[string]job.Job
 	var sortable sort.StringSlice
-	jobs = make(map[string]job.Job, 0)
 	jj, err := c.Fleet.Jobs()
 	if err != nil {
-		return err
+		return sortable
 	}
 	for _, j := range jj {
-		if strings.HasPrefix(j.Name, "deis-") && j.UnitState.MachineID == utils.GetMachineID() {
+		if strings.HasPrefix(j.Name, "deis-") && j.UnitState.MachineID == utils.GetMachineID("/") {
 			sortable = append(sortable, j.Name)
 		}
 	}

cmd/cmd.go

@@ -17,10 +17,11 @@ func List(c client.Client) error {
 func PullImage(service string) error {
 	dockercli, _, _ := utils.GetNewClient()
 	fmt.Println("pulling image :" + strings.Split(service, ".")[0])
-	err := utils.CmdPull(dockercli, strings.Split(service, ".")[0])
+	err := utils.PullImage(dockercli, strings.Split(service, ".")[0])
 	if err != nil {
 		return err
 	}
+	return nil
 }
 
 func Scale(c client.Client, targets []string) error {
@@ -94,31 +95,6 @@ func Install(c client.Client, targets []string) error {
 	return nil
 }
 
-func Update(args []string) {
-
-	if len(args) != 4 {
-		fmt.Println("unsufficient args")
-		fmt.Println("usage:  updatectl update instance deis")
-		return
-	}
-	if args[2] != "instance" && args[3] != "deis" {
-		fmt.Println("wrong args ")
-		fmt.Println("usage:  updatectl update instance deis")
-		return
-	}
-	Args := []string{
-		"instance",
-		"deis",
-		"--clients-per-app=1",
-		"--min-sleep=5",
-		"--max-sleep=10",
-		"--app-id=329cd607-06fe-4bde-8ecd-613b58c6945f",
-		"--group-id=bee2027e-29a4-4135-bffb-b2864234dd15",
-		"--version=1.1.0",
-	}
-	updatectl.Update(Args)
-}
-
 func installDataContainers(c client.Client) error {
 	// data containers
 	dataContainers := []string{

deisctl.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/deis/deisctl/client"
 	"github.com/deis/deisctl/cmd"
+	"github.com/deis/deisctl/updatectl"
 	docopt "github.com/docopt/docopt-go"
 )
 
@@ -15,6 +16,31 @@ func exit(err error, code int) {
 	os.Exit(code)
 }
 
+func Update(args []string) {
+
+	if len(args) != 4 {
+		fmt.Println("unsufficient args")
+		fmt.Println("usage:  updatectl update instance deis")
+		return
+	}
+	if args[2] != "instance" && args[3] != "deis" {
+		fmt.Println("wrong args ")
+		fmt.Println("usage:  updatectl update instance deis")
+		return
+	}
+	Args := []string{
+		"instance",
+		"deis",
+		"--clients-per-app=1",
+		"--min-sleep=5",
+		"--max-sleep=10",
+		"--app-id=329cd607-06fe-4bde-8ecd-613b58c6945f",
+		"--group-id=bee2027e-29a4-4135-bffb-b2864234dd15",
+		"--version=1.1.0",
+	}
+	updatectl.Update(Args)
+}
+
 func setGlobalFlags(args map[string]interface{}) {
 	client.Flags.Debug = args["--debug"].(bool)
 	verbosity, _ := strconv.Atoi(args["--verbosity"].(string))
@@ -86,7 +112,7 @@ Options:
 	case "uninstall":
 		err = cmd.Uninstall(c, targets)
 	case "update":
-		cmd.Update(os.Args)
+		Update(os.Args)
 	default:
 		fmt.Printf(usage)
 		os.Exit(2)

updatectl/instance.go

@@ -15,6 +15,7 @@ import (
 	"math/rand"
 	"net/http"
 	"os"
+	"strings"
 	"text/tabwriter"
 	"time"
 )
@@ -104,16 +105,16 @@ func (c *Client) updateservice() {
 	fmt.Println("starting systemd units")
 	files, _ := utils.ListFiles(downloadDir + "*.service")
 	fmt.Println(files)
-	deis, err := client.NewClient()
+	deis, _ := client.NewClient()
 	localServices := deis.GetLocaljobs()
 	Services := utils.GetServices()
-	if len(localService) == 0 {
+	if localServices.Len() == 0 {
 		fmt.Println("no local services")
 		return
 	}
 	for _, service := range localServices {
-		cmd.Unisntall(deis, strings.Split(strings.Split(service, "-")[1], ".")[0])
-		cmd.Install(deis, strings.Split(strings.Split(service, "-")[1], ".")[0])
+		cmd.Uninstall(deis, []string{strings.Split(strings.Split(service, "-")[1], ".")[0]})
+		cmd.Install(deis, []string{strings.Split(strings.Split(service, "-")[1], ".")[0]})
 	}
 	var count int
 	for _, service := range Services {
@@ -125,7 +126,7 @@ func (c *Client) updateservice() {
 		}
 		if count == 0 {
 			go func() {
-				cmd.PullImage(service)
+				_ = cmd.PullImage(service)
 			}()
 		}
 	}