tests(style): add syntax checking in make test-style

Author: mboersma

Makefile

@@ -6,16 +6,27 @@ build:
 installer:
 	rm -rf dist && mkdir -p dist
 	godep go build -a -o dist/deisctl .
-	command -v upx >/dev/null 2>&1 && upx --best --ultra-brute -q dist/deisctl
-	makeself.sh --current --nox11 dist \
+	makeself.sh --bzip2 --current --nox11 dist \
 		dist/deisctl-`cat deis-version`-`go env GOOS`-`go env GOARCH`.run \
 		"Deis Control CLI" "./deisctl refresh-units"
 
 install:
 	godep go install -v ./...
 
-test:
-	godep go test -v ./...
+setup-root-gotools:
+	sudo GOPATH=/tmp/tmpGOPATH go get -u -v code.google.com/p/go.tools/cmd/cover
+	sudo GOPATH=/tmp/tmpGOPATH go get -u -v code.google.com/p/go.tools/cmd/vet
+	sudo rm -rf /tmp/tmpGOPATH
+
+setup-gotools:
+	go get -v github.com/golang/lint/golint
+
+test-style:
+	go vet -x ./...
+	-golint *.go client/ cmd/ config/ constant/ hooks/ lock/ systemd/ units/ update/ utils/
+
+test: test-style
+	godep go test -v -cover ./...
 
 package:
 	rm -f package

client/registry.go

@@ -107,7 +107,7 @@ func getRegistryClient() (client.API, error) {
 	// 	fmt.Fprint(os.Stderr, msg)
 	// }
 
-	return &client.RegistryClient{reg}, nil
+	return &client.RegistryClient{Registry: reg}, nil
 }
 
 // checkVersion makes a best-effort attempt to verify that fleetctl is at least as new as the

client/unit.go

@@ -16,7 +16,7 @@ import (
 // path hierarchy for finding systemd service templates
 var rootPaths = []string{"/var/lib/deis/units", "~/.deisctl/units"}
 
-// getUnits returns a list of units filtered by target
+// Units returns a list of units filtered by target
 func (c *FleetClient) Units(target string) (units []string, err error) {
 	allUnits, err := c.Fleet.Units()
 	if err != nil {

cmd/cmd.go

@@ -268,7 +268,7 @@ func RefreshUnits() error {
 	}
 
 	// download and save the unit files to $HOME/.deisctl
-	rootUrl := "https://raw.githubusercontent.com/deis/deisctl/"
+	rootURL := "https://raw.githubusercontent.com/deis/deisctl/"
 	branch := "master"
 	units := []string{
 		"deis-builder.service",
@@ -284,7 +284,7 @@ func RefreshUnits() error {
 		"deis-router.service",
 	}
 	for _, unit := range units {
-		src := rootUrl + branch + "/units/" + unit
+		src := rootURL + branch + "/units/" + unit
 		dest := filepath.Join(dir, unit)
 		res, err := http.Get(src)
 		if err != nil {

constant/constants.go

@@ -6,7 +6,7 @@ const (
 	UnitsDir        = "/var/lib/deis/units/"
 	HooksDir        = "/var/lib/deis/hooks/"
 	Version         = "/etc/deis-version"
-	MachineId       = "/etc/machine-id"
+	MachineID       = "/etc/machine-id"
 	UpdatekeyDir    = "/deis/update/"
 	InitialInterval = time.Second * 10
 	MaxInterval     = time.Minute * 7

update/client.go

@@ -21,28 +21,28 @@ import (
 )
 
 type Client struct {
-	Id             string
-	SessionId      string
+	ID             string
+	SessionID      string
 	Version        string
-	AppId          string
+	AppID          string
 	Track          string
 	config         *serverConfig
 	errorRate      int
 	pingsRemaining int
 	lock           *lock.Lock
 }
 
-func (c *Client) Log(format string, v ...interface{}) {
-	format = c.Id + ": " + format
-	fmt.Printf(format, v...)
+func (c *Client) Logf(format string, args ...interface{}) {
+	format = c.ID + ": " + format
+	fmt.Printf(format, args...)
 }
 
 func (c *Client) failed(tag string, err error) {
-	c.Log("%s %v\n", tag, err)
+	c.Logf("%s %v\n", tag, err)
 	c.MakeRequest("3", "0", false, false)
 }
 
-func (c *Client) getCodebaseUrl(uc *omaha.UpdateCheck) string {
+func (c *Client) getCodebaseURL(uc *omaha.UpdateCheck) string {
 	return uc.Urls.Urls[0].CodeBase + uc.Manifest.Packages.Packages[0].Name
 }
 
@@ -61,9 +61,9 @@ func (c *Client) RequestLock() {
 
 func (c *Client) OmahaRequest(otype, result string, updateCheck, isPing bool) *omaha.Request {
 	req := omaha.NewRequest("lsb", "CoreOS", "", "")
-	app := req.AddApp(c.AppId, c.Version)
-	app.MachineID = c.Id
-	app.BootId = c.SessionId
+	app := req.AddApp(c.AppID, c.Version)
+	app.MachineID = c.ID
+	app.BootId = c.SessionID
 	app.Track = c.Track
 	app.OEM = Flags.OEM
 
@@ -113,15 +113,15 @@ func (c *Client) MakeRequest(otype, result string, updateCheck, isPing bool) (*o
 
 	if Flags.verbose {
 		raw, _ := xml.MarshalIndent(req, "", " ")
-		c.Log("request: %s\n", string(raw))
+		c.Logf("request: %s\n", string(raw))
 		raw, _ = xml.MarshalIndent(oresp, "", " ")
-		c.Log("response: %s\n", string(raw))
+		c.Logf("response: %s\n", string(raw))
 	}
 
 	return oresp, nil
 }
 
-// Sleep between n and m seconds
+// Loop between n and m seconds
 func (c *Client) Loop(n, m int) {
 	interval := constant.InitialInterval
 	for {
@@ -133,15 +133,15 @@ func (c *Client) Loop(n, m int) {
 		}
 		uc := resp.Apps[0].UpdateCheck
 		if uc.Status != "ok" {
-			c.Log("update check status: %s\n", uc.Status)
+			c.Logf("update check status: %s\n", uc.Status)
 		} else {
-			url := c.getCodebaseUrl(uc)
+			url := c.getCodebaseURL(uc)
 			if !strings.Contains(url, "deis") {
 				c.failed("Wrong Url", err)
 				continue
 			}
 			c.MakeRequest("13", "1", false, false)
-			err = c.downloadFromUrl(url, "/tmp/deis.tar.gz")
+			err = c.downloadFromURL(url, "/tmp/deis.tar.gz")
 			if err != nil {
 				c.failed("Download failed", err)
 				continue
@@ -181,7 +181,7 @@ func (c *Client) SetVersion(resp *omaha.Response) {
 	// A field can potentially be nil.
 	defer func() {
 		if err := recover(); err != nil {
-			c.Log("%s: error setting version: %v", c.Id, err)
+			c.Logf("%s: error setting version: %v", c.ID, err)
 		}
 	}()
 	uc := resp.Apps[0].UpdateCheck
@@ -191,9 +191,9 @@ func (c *Client) SetVersion(resp *omaha.Response) {
 		c.failed("update failed", err)
 		return
 	}
-	c.Log("Installation done ")
+	c.Logf("Installation done ")
 	c.MakeRequest("2", "1", false, false)
-	c.Log("Update done ")
+	c.Logf("Update done ")
 	c.MakeRequest("3", "1", false, false)
 	// installed
 
@@ -204,7 +204,7 @@ func (c *Client) SetVersion(resp *omaha.Response) {
 		time.Sleep(1 * time.Second)
 	}
 
-	c.Log("updated from %s to %s\n", c.Version, uc.Manifest.Version)
+	c.Logf("updated from %s to %s\n", c.Version, uc.Manifest.Version)
 
 	c.Version = uc.Manifest.Version
 	utils.PutVersion(c.Version)
@@ -214,7 +214,7 @@ func (c *Client) SetVersion(resp *omaha.Response) {
 		log.Println(err)
 	}
 
-	c.SessionId = uuid.New()
+	c.SessionID = uuid.New()
 }
 
 func (c *Client) Update() (err error) {
@@ -250,7 +250,7 @@ func (c *Client) Update() (err error) {
 	return nil
 }
 
-func (c *Client) downloadFromUrl(url, filePath string) (err error) {
+func (c *Client) downloadFromURL(url, filePath string) (err error) {
 	fmt.Printf("Downloading %s to %s\n", url, filePath)
 
 	output, err := os.Create(filePath)

update/update.go

@@ -18,17 +18,17 @@ const (
 	DefaultOmahaServer = "https://opdemand.update.core-os.net"
 	// DefaultOEM string to report to Omaha Server
 	DefaultOEM = "deisctl"
-	// DefaultAppId used for Omaha protocol
-	DefaultAppId = "0ccac0df-ca24-4f2b-bb7b-4a265bd0eb33"
-	// DefaultGroupId used for Omaha protocol
-	DefaultGroupId = "2e87b742-68c9-4d08-8f37-5cb7bb2c9d3a"
+	// DefaultAppID used for Omaha protocol
+	DefaultAppID = "0ccac0df-ca24-4f2b-bb7b-4a265bd0eb33"
+	// DefaultGroupID used for Omaha protocol
+	DefaultGroupID = "2e87b742-68c9-4d08-8f37-5cb7bb2c9d3a"
 )
 
 // Flags for update package
 var Flags struct {
 	Server        string
-	groupId       string
-	appId         string
+	groupID       string
+	appID         string
 	start         int64
 	end           int64
 	verbose       bool
@@ -51,22 +51,22 @@ func parseInt(arg string) (i int, err error) {
 
 func setUpdateFlags(args map[string]interface{}) error {
 
-	appId := utils.GetKey(constant.UpdatekeyDir, "app-id", "DEISCTL_APP_ID")
+	appID := utils.GetKey(constant.UpdatekeyDir, "app-id", "DEISCTL_APP_ID")
 	if args["--app-id"] != nil {
-		Flags.appId = args["--app-id"].(string)
-	} else if appId != "" {
-		Flags.appId = appId
+		Flags.appID = args["--app-id"].(string)
+	} else if appID != "" {
+		Flags.appID = appID
 	} else {
-		Flags.appId = DefaultAppId
+		Flags.appID = DefaultAppID
 	}
 
-	groupId := utils.GetKey(constant.UpdatekeyDir, "group-id", "DEISCTL_GROUP_ID")
+	groupID := utils.GetKey(constant.UpdatekeyDir, "group-id", "DEISCTL_GROUP_ID")
 	if args["--group-id"] != nil {
-		Flags.groupId = args["--group-id"].(string)
-	} else if groupId != "" {
-		Flags.groupId = groupId
+		Flags.groupID = args["--group-id"].(string)
+	} else if groupID != "" {
+		Flags.groupID = groupID
 	} else {
-		Flags.groupId = DefaultGroupId
+		Flags.groupID = DefaultGroupID
 	}
 
 	// read version from /etc/deis-version
@@ -150,11 +150,11 @@ func doUpdate() error {
 		server: Flags.Server,
 	}
 	c := &Client{
-		Id:        utils.GetClientID(),
-		SessionId: uuid.New(),
+		ID:        utils.GetClientID(),
+		SessionID: uuid.New(),
 		Version:   Flags.version,
-		AppId:     Flags.appId,
-		Track:     Flags.groupId,
+		AppID:     Flags.appID,
+		Track:     Flags.groupID,
 		config:    conf,
 	}
 	go c.Loop(Flags.minSleep, Flags.maxSleep)

utils/utils.go

@@ -65,7 +65,7 @@ func PullImage(args string) error {
 	return nil
 }
 
-// getClientID returns the CoreOS Machine ID or an unknown UUID string
+// GetClientID returns the CoreOS Machine ID or an unknown UUID string
 func GetClientID() string {
 	machineID := GetMachineID("/")
 	if machineID == "" {
@@ -75,7 +75,7 @@ func GetClientID() string {
 }
 
 func GetMachineID(root string) string {
-	fullPath := filepath.Join(root, constant.MachineId)
+	fullPath := filepath.Join(root, constant.MachineID)
 	id, err := ioutil.ReadFile(fullPath)
 	if err != nil {
 		return ""