style(pkg): use go lint

Author: duanhongyi

.gitignore

@@ -1,2 +1,3 @@
 rootfs/bin/boot
 vendor/*
+coverage.txt

.travis.yml

@@ -9,3 +9,5 @@ notifications:
   slack:
     rooms:
       - drycc:xKmLlmJR4hfRAgVIOwdpAoC9#drycc
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -26,9 +26,11 @@ all: build test
 
 build:
 	${DEV_ENV_CMD} go build ${PKG_DIRS}
-
-test:
+test-cover:
+	${DEV_ENV_CMD} test-cover.sh
+test-style:
+	${DEV_ENV_CMD} lint
+test: build test-style test-cover
 	${DEV_ENV_CMD} go test ${PKG_DIRS}
 
-
 .PHONY: all build test

aboutme/aboutme.go

@@ -17,11 +17,11 @@ import (
 	"os"
 	"strings"
 
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	v1 "k8s.io/api/core/v1"
 )
 
 // DefaultNamespace is the Kubernetes default namespace.
@@ -38,8 +38,9 @@ var (
 	EnvName = "POD_NAME"
 )
 
+// Me struct is current kuber info
 type Me struct {
-	ApiServer, Name                      string
+	APIServer, Name                      string
 	IP, NodeIP, Namespace, SelfLink, UID string
 	Labels                               map[string]string
 	Annotations                          map[string]string
@@ -64,7 +65,7 @@ func FromEnv() (*Me, error) {
 	url := proto + "://" + host + ":" + port
 
 	me := &Me{
-		ApiServer: url,
+		APIServer: url,
 		Name:      name,
 		Namespace: NamespaceFromEnv(),
 	}
@@ -83,7 +84,7 @@ func FromEnv() (*Me, error) {
 		return me, err
 	}
 
-	return me, nil
+	return me, err
 }
 
 // Client returns an initialized Kubernetes API client.
@@ -122,7 +123,7 @@ func NamespaceFromEnv() string {
 // 	- Annotations become MY_ANNOTATION_[NAME] = [value]
 func (me *Me) ShuntEnv() {
 	env := map[string]string{
-		"MY_APISERVER": me.ApiServer,
+		"MY_APISERVER": me.APIServer,
 		"MY_NAME":      me.Name,
 		"MY_IP":        me.IP,
 		"MY_NODEIP":    me.NodeIP,
@@ -156,7 +157,7 @@ func (me *Me) init() error {
 	me.SelfLink = p.SelfLink
 	me.UID = string(p.UID)
 	me.Labels = p.Labels
-	me.Annotations = me.Annotations
+	me.Annotations = p.Annotations
 
 	// FIXME: It appears that sometimes the k8s API server does not set the
 	// PodIP, even though the pod is issued an IP. We need to figure out why,
@@ -230,6 +231,8 @@ func MyIP() (string, error) {
 
 	return "0.0.0.0", err
 }
+
+// IPByInterface is get ip by device interface
 func IPByInterface(name string) (string, error) {
 	iface, err := net.InterfaceByName(name)
 	if err != nil {
@@ -248,7 +251,7 @@ func IPByInterface(name string) (string, error) {
 		}
 	}
 	if len(ip) == 0 {
-		return ip, errors.New("Found no IPv4 addresses.")
+		return ip, errors.New("found no IPv4 addresses")
 	}
 	return ip, nil
 }

env/envvar.go

@@ -55,7 +55,7 @@ func Get(c cookoo.Context, params *cookoo.Params) (interface{}, cookoo.Interrupt
 // 	- content (string): The given string to expand.
 //
 // Returns:
-//  - The expanded string. This expands against the os environemnt (os.ExpandEnv).
+//  - The expanded string. This expands against the os environment (os.ExpandEnv).
 func Expand(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	s := p.Get("content", "").(string)
 

etcd/discovery/discovery.go

@@ -1,4 +1,3 @@
-/* Package discovery contains utlities for Etcd discovery. */
 package discovery
 
 import (
@@ -8,10 +7,16 @@ import (
 	"github.com/Masterminds/cookoo"
 )
 
+// TokenFile for etcd
 var TokenFile = "/var/run/secrets/drycc/etcd/discovery/token"
 
+// ClusterDiscoveryURL for drycc
 const ClusterDiscoveryURL = "http://%s:%s/v2/keys/drycc/discovery/%s"
+
+// ClusterSizeKey for discovery
 const ClusterSizeKey = "drycc/discovery/%s/_config/size"
+
+// ClusterStatusKey for drycc
 const ClusterStatusKey = "drycc/status/%s/%s"
 
 // Token reads the discovery token from the TokenFile and returns it.

etcd/etcd.go

@@ -65,6 +65,7 @@ func SimpleGet(cli client.Client, key string, recursive bool) (*client.Response,
 	return k.Get(dctx(), key, &client.GetOptions{Recursive: recursive})
 }
 
+// SimpleSet performs the common base-line set, using a default context.
 func SimpleSet(cli client.Client, key, value string, expires time.Duration) (*client.Response, error) {
 	k := client.NewKeysAPI(cli)
 	return k.Set(dctx(), key, value, &client.SetOptions{TTL: expires})
@@ -84,7 +85,7 @@ func SimpleSet(cli client.Client, key, value string, expires time.Duration) (*cl
 func Get(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	cli, ok := p.Has("client")
 	if !ok {
-		return nil, errors.New("No Etcd client found.")
+		return nil, errors.New("no etcd client found")
 	}
 	ec := cli.(client.Client)
 	path := p.Get("path", "/").(string)
@@ -98,7 +99,7 @@ func Get(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	}
 
 	if !res.Node.Dir {
-		return res, fmt.Errorf("Expected / to be a dir.")
+		return res, fmt.Errorf("expected / to be a dir")
 	}
 	return res, nil
 }
@@ -126,7 +127,7 @@ func IsRunning(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrup
 		time.Sleep(250 * time.Millisecond)
 	}
 	log.Errf(c, "Etcd is not answering after %d attempts.", count)
-	return false, &cookoo.FatalError{"Could not connect to Etcd."}
+	return false, &cookoo.FatalError{Message: "Could not connect to Etcd."}
 }
 
 // Set sets a value in etcd.
@@ -387,12 +388,12 @@ func MakeDir(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 	k := client.NewKeysAPI(cli)
 
 	if len(name) == 0 {
-		return false, errors.New("Expected directory name to be more than zero characters.")
+		return false, errors.New("expected directory name to be more than zero characters")
 	}
 
 	res, err := k.Set(dctx(), name, "", &client.SetOptions{TTL: ttl, Dir: true})
 	if err != nil {
-		return res, &cookoo.RecoverableError{err.Error()}
+		return res, &cookoo.RecoverableError{Message: err.Error()}
 	}
 
 	return res, nil

etcd/members.go

@@ -7,8 +7,8 @@ import (
 	"github.com/Masterminds/cookoo"
 	"github.com/Masterminds/cookoo/log"
 	"github.com/coreos/etcd/client"
-	"k8s.io/apimachinery/pkg/labels"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )
@@ -168,7 +168,7 @@ func RemoveStaleMembers(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo
 // Params:
 // 	client (client.Client): An etcd client.
 // Returns:
-//  string representation of the list, also put into the enviornment.
+//  string representation of the list, also put into the environment.
 func GetInitialCluster(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	cli := p.Get("client", nil).(client.Client)
 	mem := client.NewMembersAPI(cli)

etcd/simple_client.go

@@ -11,11 +11,6 @@ import (
 	"github.com/coreos/etcd/client"
 )
 
-var (
-	retryCycles = 2
-	retrySleep  = 200 * time.Millisecond
-)
-
 // Getter describes the Get behavior of an Etcd client.
 //
 // Usually you will want to use go-etcd/etcd.Client to satisfy this.
@@ -53,22 +48,22 @@ type GetterSetter interface {
 // 	- retrySleep (time.Duration): How long to sleep between retries
 //
 // Returns:
-// 	This puts a simpleEtcdClient into context (implements Getter, Setter, etc.)
+// 	This puts a SimpleEtcdClient into context (implements Getter, Setter, etc.)
 func CreateSimpleClient(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	r, e := CreateClient(c, p)
 	if e != nil {
 		return c, e
 	}
 
-	return &simpleEtcdClient{
+	return &SimpleEtcdClient{
 		realClient: r.(client.Client),
 	}, nil
 }
 
-// Provides a simple wrapper around the old API.
+// NewSimpleClient Provides a simple wrapper around the old API.
 //
 // DO NOT USE for new code. Instead, use NewClient().
-func NewSimpleClient(hosts []string) (*simpleEtcdClient, error) {
+func NewSimpleClient(hosts []string) (*SimpleEtcdClient, error) {
 	cfg := client.Config{
 		Endpoints: hosts,
 	}
@@ -78,29 +73,32 @@ func NewSimpleClient(hosts []string) (*simpleEtcdClient, error) {
 		return nil, err
 	}
 
-	return &simpleEtcdClient{
+	return &SimpleEtcdClient{
 		realClient: r,
 	}, nil
 }
 
-// simpleEtcdClient provides an interface compatible with the old Etcd client.
-type simpleEtcdClient struct {
+// SimpleEtcdClient provides an interface compatible with the old Etcd client.
+type SimpleEtcdClient struct {
 	realClient client.Client
 }
 
-func (c *simpleEtcdClient) Get(key string, sort bool, rec bool) (*client.Response, error) {
+// Get client.Response
+func (c *SimpleEtcdClient) Get(key string, sort bool, rec bool) (*client.Response, error) {
 	k := client.NewKeysAPI(c.realClient)
 	return k.Get(dctx(), key, &client.GetOptions{Sort: sort, Recursive: rec})
 }
 
-func (c *simpleEtcdClient) Set(key, val string, ttl uint64) (*client.Response, error) {
+// Set client.Response
+func (c *SimpleEtcdClient) Set(key, val string, ttl uint64) (*client.Response, error) {
 	k := client.NewKeysAPI(c.realClient)
 	// We're banking on people not using really uge ttls. In the code base, the
 	// highest is only a few hundred.
 	return k.Set(dctx(), key, val, &client.SetOptions{TTL: time.Duration(ttl) * time.Second})
 }
 
-func (c *simpleEtcdClient) CreateDir(name string, ttl uint64) (*client.Response, error) {
+// CreateDir by name
+func (c *SimpleEtcdClient) CreateDir(name string, ttl uint64) (*client.Response, error) {
 	k := client.NewKeysAPI(c.realClient)
 	return k.Set(dctx(), name, "", &client.SetOptions{TTL: time.Duration(ttl) * time.Second, Dir: true})
 }

log/log.go

@@ -32,10 +32,17 @@ var (
 )
 
 const (
+	// DebugPrefix for log
 	DebugPrefix = "[DEBUG]"
+
+	// ErrorPrefix for log
 	ErrorPrefix = "[ERROR]"
-	WarnPrefix  = "[WARN]"
-	InfoPrefix  = "--->"
+
+	// WarnPrefix for log
+	WarnPrefix = "[WARN]"
+
+	// InfoPrefix for log
+	InfoPrefix = "--->"
 )
 
 // Logger is the base logging struct from which all logging functionality stems