refactor(update): cleanup update logic, flags, remove dead code

Author: Gabriel Monroy

cmd/cmd.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"regexp"
 	"strconv"
-	"strings"
 
 	"github.com/deis/deisctl/client"
+	"github.com/deis/deisctl/constant"
+	"github.com/deis/deisctl/update"
 	"github.com/deis/deisctl/utils"
 )
 
@@ -20,16 +21,6 @@ func ListUnitFiles(c client.Client) error {
 	return err
 }
 
-func PullImage(service string) error {
-	//dockercli, _, _ := utils.GetNewClient()
-	fmt.Println("pulling image :" + strings.Replace(strings.Split(service, ".")[0], "-", "/", 1) + ":latest")
-	err := utils.PullImage(strings.Replace(strings.Split(service, ".")[0], "-", "/", 1) + ":latest")
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func Scale(c client.Client, targets []string) error {
 	for _, target := range targets {
 		component, num, err := splitScaleTarget(target)
@@ -221,3 +212,19 @@ func splitScaleTarget(target string) (c string, num int, err error) {
 	}
 	return
 }
+
+func Update() error {
+	if err := utils.Execute(constant.HooksDir + "pre-update"); err != nil {
+		fmt.Println("pre-updatehook failed")
+		return err
+	}
+	if err := update.Update(); err != nil {
+		fmt.Println("update engine failed")
+		return err
+	}
+	if err := utils.Execute(constant.HooksDir + "post-update"); err != nil {
+		fmt.Println("post-updatehook failed")
+		return err
+	}
+	return nil
+}

deisctl.go

@@ -7,9 +7,7 @@ import (
 
 	"github.com/deis/deisctl/client"
 	"github.com/deis/deisctl/cmd"
-	"github.com/deis/deisctl/constant"
-	"github.com/deis/deisctl/updatectl"
-	"github.com/deis/deisctl/utils"
+
 	docopt "github.com/docopt/docopt-go"
 )
 
@@ -18,34 +16,6 @@ func exit(err error, code int) {
 	os.Exit(code)
 }
 
-func Update(args []string) {
-
-	if len(args) != 4 {
-		fmt.Println("unsufficient args")
-		fmt.Println("usage:  deisctl update instance deis")
-		return
-	}
-	if args[2] != "instance" && args[3] != "deis" {
-		fmt.Println("wrong args ")
-		fmt.Println("usage:  deisctl update instance deis")
-		return
-	}
-	Args := []string{
-		"instance",
-		"deis",
-		"--clients-per-app=1",
-		"--min-sleep=5",
-		"--max-sleep=10",
-	}
-	if err := utils.Execute(constant.HooksDir + "pre-update"); err != nil {
-		fmt.Println("pre-updatehook failed")
-	}
-	updatectl.Update(Args)
-	if err := utils.Execute(constant.HooksDir + "post-update"); err != nil {
-		fmt.Println("post-updatehook failed")
-	}
-}
-
 func setGlobalFlags(args map[string]interface{}) {
 	client.Flags.Debug = args["--debug"].(bool)
 	client.Flags.Version = args["--version"].(bool)
@@ -133,7 +103,7 @@ Options:
 	case "uninstall":
 		err = cmd.Uninstall(c, targets)
 	case "update":
-		Update(os.Args)
+		err = cmd.Update()
 	default:
 		fmt.Printf(usage)
 		os.Exit(2)

systemd/deis-update.service

@@ -5,8 +5,8 @@ After=fleet.service
 
 [Service]
 EnvironmentFile=/etc/environment
-Environment="DEISCTL_SERVER=https://opdemand.update.core-os.net" "DEISCTL_APP_ID=0ccac0df-ca24-4f2b-bb7b-4a265bd0eb33" "DEISCTL_GROUP_ID=ad50b2ce-a425-4f94-802f-dbcb51281ef6"
-ExecStart=/opt/bin/deisctl update instance deis
+Environment="DEISCTL_GROUP_ID=2e87b742-68c9-4d08-8f37-5cb7bb2c9d3a"
+ExecStart=/opt/bin/deisctl update
 
 [Install]
 WantedBy=multi-user.target