feat(deisctl) : add hooks and units dirs to constants

Author: smothiki

constants/constants.go

@@ -0,0 +1,8 @@
+package constant
+
+const (
+	UnitsDir  = "/var/lib/deis/units/"
+	HooksDir  = "/var/lib/deis/hooks/"
+	Version   = "/etc/deis-version"
+	MachineId = "/etc/machine-id"
+)

deisctl.go

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"github.com/deis/deisctl/client"
 	"github.com/deis/deisctl/cmd"
+	"github.com/deis/deisctl/constants"
 	"github.com/deis/deisctl/updatectl"
+	"github.com/deis/deisctl/utils"
 	docopt "github.com/docopt/docopt-go"
 	"os"
 	"strconv"
@@ -34,7 +36,13 @@ func Update(args []string) {
 		"--min-sleep=5",
 		"--max-sleep=10",
 	}
+	if err := utils.Execute(constant.HooksDir + "pre-update.sh"); err != nil {
+		fmt.Println("pre-updatehook failed")
+	}
 	updatectl.Update(Args)
+	if err := utils.Execute(constant.HooksDir + "post-update.sh"); err != nil {
+		fmt.Println("post-updatehook failed")
+	}
 }
 
 func setGlobalFlags(args map[string]interface{}) {

updatectl/instance.go

@@ -9,6 +9,7 @@ import (
 	update "github.com/coreos/updatectl/client/update/v1"
 	"github.com/deis/deisctl/client"
 	"github.com/deis/deisctl/cmd"
+	"github.com/deis/deisctl/constants"
 	"github.com/deis/deisctl/utils"
 	"io"
 	"log"
@@ -20,12 +21,6 @@ import (
 	"time"
 )
 
-const (
-	initialInterval = time.Second * 10
-	maxInterval     = time.Minute * 7
-	downloadDir     = "/home/core/deis/systemd/"
-)
-
 var (
 	instanceFlags struct {
 		groupId       string
@@ -103,7 +98,7 @@ func (c *Client) getCodebaseUrl(uc *omaha.UpdateCheck) string {
 
 func (c *Client) updateservice() {
 	fmt.Println("starting systemd units")
-	files, _ := utils.ListFiles(downloadDir + "*.service")
+	files, _ := utils.ListFiles(constant.UnitsDir + "*.service")
 	fmt.Println(files)
 	deis, _ := client.NewClient()
 	localServices := deis.GetLocaljobs()
@@ -125,9 +120,9 @@ func (c *Client) updateservice() {
 			}
 		}
 		if count == 0 {
-			go func() {
-				_ = cmd.PullImage(service)
-			}()
+			if err := cmd.PullImage(service); err != nil {
+				fmt.Println("pulling Image failed for " + service)
+			}
 		}
 	}
 
@@ -143,7 +138,7 @@ func (c *Client) downloadFromUrl(url, fileName string) (err error) {
 	fmt.Printf("Downloading %s to %s", url, fileName)
 
 	// TODO: check file existence first with io.IsExist
-	output, err := os.Create(downloadDir + fileName)
+	output, err := os.Create(constant.UnitsDir + fileName)
 	if err != nil {
 		fmt.Println("Error while creating", fileName, "-", err)
 		return
@@ -239,13 +234,15 @@ func (c *Client) SetVersion(resp *omaha.Response) {
 	url := c.getCodebaseUrl(uc)
 	c.MakeRequest("13", "1", false, false)
 	c.downloadFromUrl(url, "deis.tar.gz")
-	utils.Extract(downloadDir+"deis.tar.gz", downloadDir)
+	utils.Extract(constant.UnitsDir+"deis.tar.gz", constant.UnitsDir)
 	c.MakeRequest("14", "1", false, false)
 	c.updateservice()
+	fmt.Println("Installation done")
+	c.MakeRequest("2", "1", false, false)
 	fmt.Println("updated done")
 	c.MakeRequest("3", "1", false, false)
 	// installed
-	fmt.Println("updated done")
+
 	// simulate reboot lock for a while
 	for c.pingsRemaining > 0 {
 		c.MakeRequest("", "", false, true)

utils/utils.go

@@ -6,6 +6,7 @@ import (
 	_ "bufio"
 	"bytes"
 	"fmt"
+	"github.com/deis/deisctl/constants"
 	"github.com/docker/docker/api/client"
 	"github.com/satori/go.uuid"
 	"io"
@@ -38,7 +39,7 @@ func GetNewClient() (
 }
 
 func PullImage(cli *client.DockerCli, args ...string) error {
-	fmt.Println("pulling image :" + args[0])
+	fmt.Println("pulling image : " + args[0])
 	err := cli.CmdPull(args...)
 	return err
 }
@@ -61,7 +62,7 @@ func GetServices() []string {
 }
 
 func GetMachineID(root string) string {
-	fullPath := filepath.Join(root, "/etc/machine-id")
+	fullPath := filepath.Join(root, constant.MachineId)
 	id, err := ioutil.ReadFile(fullPath)
 	if err != nil {
 		return ""
@@ -70,7 +71,7 @@ func GetMachineID(root string) string {
 }
 
 func GetVersion() string {
-	id, err := ioutil.ReadFile("/home/core/deis/systemd/version")
+	id, err := ioutil.ReadFile(constant.Version)
 	if err != nil {
 		return ""
 	}
@@ -192,6 +193,7 @@ func getExitCode(err error) (int, error) {
 }
 
 // RunCommandWithStdoutStderr execs a command and returns its output.
+
 func RunCommandWithStdoutStderr(cmd *exec.Cmd) (bytes.Buffer, bytes.Buffer, error) {
 	var stdout, stderr bytes.Buffer
 	stderrPipe, err := cmd.StderrPipe()
@@ -223,6 +225,15 @@ func RunCommandWithStdoutStderr(cmd *exec.Cmd) (bytes.Buffer, bytes.Buffer, erro
 	return stdout, stderr, err
 }
 
+func Execute(script string) error {
+	cmdl := exec.Command("sh", "-c", script)
+	if _, _, err := RunCommandWithStdoutStderr(cmdl); err != nil {
+		fmt.Println("(Error )")
+		return err
+	}
+	return nil
+}
+
 func runCommandWithOutput(cmd *exec.Cmd) (output string, exitCode int, err error) {
 	exitCode = 0
 	out, err := cmd.CombinedOutput()