feat(deisctl) : basic working version of updater

Author: smothiki

client/list.go

@@ -2,13 +2,13 @@ package client
 
 import (
 	"fmt"
+	"github.com/coreos/fleet/job"
+	"github.com/coreos/fleet/machine"
+	"github.com/deis/deisctl/utils"
 	"os"
 	"sort"
 	"strings"
 	"text/tabwriter"
-
-	"github.com/coreos/fleet/job"
-	"github.com/coreos/fleet/machine"
 )
 
 // initialize tabwriter on stdout
@@ -114,15 +114,32 @@ func (c *FleetClient) List() (err error) {
 	}
 	for _, j := range jj {
 		if strings.HasPrefix(j.Name, "deis-") {
-			jobs[j.Name] = j
-			sortable = append(sortable, j.Name)
+			j.
+				sortable = append(sortable, j.Name)
 		}
 	}
 	sortable.Sort()
 	printList(jobs, sortable)
 	return
 }
 
+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
+	}
+	for _, j := range jj {
+		if strings.HasPrefix(j.Name, "deis-") && j.UnitState.MachineID == utils.GetMachineID() {
+			sortable = append(sortable, j.Name)
+		}
+	}
+	return sortable
+}
+
 // printList writes units to stdout using a tabwriter
 func printList(jobs map[string]job.Job, sortable sort.StringSlice) {
 	cols := strings.Split(defaultListUnitFields, ",")

cmd/cmd.go

@@ -2,17 +2,28 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/deis/deis/tests/dockercli"
+	"github.com/deis/deisctl/client"
+	"github.com/deis/deisctl/updatectl"
 	"regexp"
 	"strconv"
-
-	"github.com/deis/deisctl/client"
+	"strings"
 )
 
 func List(c client.Client) error {
 	err := c.List()
 	return err
 }
 
+func PullImage(service string) error {
+	Dockercli, _, _ := dockercli.GetNewClient()
+	fmt.Println("pulling image :" + strings.Split(service, ".")[0])
+	err := cli.CmdPull(strings.Split(service, ".")[0])
+	if err != nil {
+		return err
+	}
+}
+
 func Scale(c client.Client, targets []string) error {
 	for _, target := range targets {
 		component, num, err := splitScaleTarget(target)
@@ -84,6 +95,31 @@ 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,7 +7,6 @@ import (
 
 	"github.com/deis/deisctl/client"
 	"github.com/deis/deisctl/cmd"
-	"github.com/deis/deisctl/updatectl"
 	docopt "github.com/docopt/docopt-go"
 )
 
@@ -87,7 +86,7 @@ Options:
 	case "uninstall":
 		err = cmd.Uninstall(c, targets)
 	case "update":
-		updatectl.Update(os.Args)
+		cmd.Update(os.Args)
 	default:
 		fmt.Printf(usage)
 		os.Exit(2)

updatectl/instance.go

@@ -7,6 +7,8 @@ import (
 	"fmt"
 	"github.com/coreos/go-omaha/omaha"
 	update "github.com/coreos/updatectl/client/update/v1"
+	"github.com/deis/deisctl/client"
+	"github.com/deis/deisctl/cmd"
 	"github.com/deis/deisctl/utils"
 	"io"
 	"log"
@@ -102,7 +104,37 @@ func (c *Client) updateservice() {
 	fmt.Println("starting systemd units")
 	files, _ := utils.ListFiles(downloadDir + "*.service")
 	fmt.Println(files)
+	deis, err := client.NewClient()
+	localServices := deis.GetLocaljobs()
+	Services := utils.GetServices()
+	if len(localService) == 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])
+	}
+	var count int
+	for _, service := range Services {
+		count = 0
+		for _, lserv := range localServices {
+			if strings.Contains(lserv, strings.Split(strings.Split(service, "-")[1], ".")[0]) {
+				count = count + 1
+			}
+		}
+		if count == 0 {
+			go func() {
+				cmd.PullImage(service)
+			}()
+		}
+	}
 
+	// pre-install hook (download all new docker images)
+	// use systemd to list local deis-* units, ignore -data units
+	// cmd.Unistall([]string{"router.3"})
+	// cmd.Install([]string{"router.3"})
+	// post-install hook (make sure upgrade was successful)
 }
 
 func (c *Client) downloadFromUrl(url, fileName string) (err error) {

updatectl/update.go

@@ -87,26 +87,7 @@ func init() {
 	globalFlagSet.StringVar(&globalFlags.Key, "key", os.Getenv("UPDATECTL_KEY"), "API Key")
 
 	commands = []*Command{
-		/*// admin.go
-		cmdAdminUser,
-		// app.go
-		cmdApp,
-		// channel.go
-		cmdChannel,
-		// database.go
-		cmdDatabase,
-		// group.go
-		cmdGroup,
-		// help.go
-		cmdHelp,
-		// instance.go*/
 		cmdInstance,
-		// pkg.go
-		/*cmdPackage,
-		// watch.go
-		cmdWatch,
-		// upstream.go
-		cmdUpstream,*/
 	}
 }
 
@@ -154,7 +135,6 @@ func findCommand(search string, args []string, commands []*Command) (cmd *Comman
 	if len(args) < 1 {
 		return
 	}
-	//fmt.Println(args)
 	if search == "" {
 		search = args[0]
 	} else {
@@ -170,7 +150,6 @@ func findCommand(search string, args []string, commands []*Command) (cmd *Comman
 			}
 			if len(cmd.Subcommands) != 0 {
 				subArgs := cmd.Flags.Args()
-				fmt.Println(subArgs)
 				var subCmd *Command
 				subCmd, name = findCommand(search, subArgs, cmd.Subcommands)
 				if subCmd != nil {
@@ -198,17 +177,14 @@ func Update(Args []string) {
 		fmt.Printf("Run '%v help' for usage.\n", cliName)
 		os.Exit(ERROR_NO_COMMAND)
 	}
-	fmt.Println(cmd)
 	if cmd.Run == nil {
 		//	printCommandUsage(cmd)
 		os.Exit(ERROR_USAGE)
 	} else {
-		fmt.Println("inside run")
 		exit := handle(cmd.Run)(&cmd.Flags)
 		if exit == ERROR_USAGE {
 			//	printCommandUsage(cmd)
 		}
-		fmt.Println("exiting")
 		os.Exit(exit)
 	}
 }

utils/utils.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net"
 	"os"
 	"os/exec"
@@ -26,6 +27,32 @@ func NewUuid() string {
 	return strings.Split(s1, "-")[0]
 }
 
+func GetServices() []string {
+	service := []string{
+		"deis-builder.service",
+		"deis-builder-data.service",
+		"deis-cache.service",
+		"deis-controller.service",
+		"deis-database.service",
+		"deis-database-data.service",
+		"deis-logger.service",
+		"deis-logger-data.service",
+		"deis-registry.service",
+		"deis-registry-data.service",
+		"deis-router.service",
+	}
+	return service
+}
+
+func GetMachineID(root string) string {
+	fullPath := filepath.Join(root, "/etc/machine-id")
+	id, err := ioutil.ReadFile(fullPath)
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(id))
+}
+
 // GetFileBytes returns a byte array of the contents of a file.
 func GetFileBytes(filename string) []byte {
 	file, _ := os.Open(filename)