golint: Fix ineffassign mistakes

etcd/etcd.go

@@ -569,7 +569,7 @@ func (obj *EmbdEtcd) CtxError(ctx context.Context, err error) (context.Context,
 		// tmin <= texp^iter - 1 <= tmax // TODO: check my math
 		return time.Duration(math.Min(math.Max(math.Pow(float64(texp), float64(iter))-1.0, float64(tmin)), float64(tmax))) * time.Millisecond
 	}
-	var isTimeout = false
+	var isTimeout bool
 	var iter int // = 0
 	if ctxerr, ok := ctx.Value(ctxErr).(error); ok {
 		if obj.flags.Debug {

etcd/methods.go

@@ -371,9 +371,8 @@ func Members(obj *EmbdEtcd) (map[uint64]string, error) {
 // Leader returns the current leader of the etcd server cluster.
 func Leader(obj *EmbdEtcd) (string, error) {
 	//obj.Connect(false) // TODO: ?
-	var err error
-	membersMap := make(map[uint64]string)
-	if membersMap, err = Members(obj); err != nil {
+	membersMap, err := Members(obj)
+	if err != nil {
 		return "", err
 	}
 	addresses := obj.LocalhostClientURLs() // heuristic, but probably correct

examples/longpoll/redirect-client.go

@@ -49,4 +49,5 @@ func main() {
 	s, err := ioutil.ReadAll(result.Body) // TODO: apparently we can stream
 	result.Body.Close()
 	log.Printf("Response: %+v", string(s))
+	log.Printf("Error: %+v", err)
 }

hcl/gapi.go

@@ -151,7 +151,7 @@ func (obj *GAPI) Next() chan gapi.Next {
 		startChan := make(chan struct{}) // start signal
 		close(startChan)                 // kick it off!
 
-		watchChan := make(chan error)
+		var watchChan chan error
 		if obj.data.NoStreamWatch {
 			watchChan = nil
 		} else {

lang/interpret.go

@@ -72,7 +72,7 @@ func interpret(ast interfaces.Stmt) (*pgraph.Graph, error) {
 
 	for _, e := range output.Edges {
 		var v1, v2 resources.Res
-		var exists = true
+		var exists bool // = true
 		var m map[string]resources.Res
 		var notify = e.Notify
 

puppet/gapi.go

@@ -275,7 +275,7 @@ func (obj *GAPI) Next() chan gapi.Next {
 		startChan := make(chan struct{}) // start signal
 		close(startChan)                 // kick it off!
 
-		pChan := make(<-chan time.Time)
+		var pChan <-chan time.Time
 		// NOTE: we don't look at obj.data.NoConfigWatch since emulating
 		// puppet means we do not switch graphs on code changes anyways.
 		if obj.data.NoStreamWatch {

remote/remote.go

@@ -165,7 +165,7 @@ func (obj *SSH) Sftp() error {
 	}
 
 	// we run local operations first so that remote clean up is easier...
-	selfpath := ""
+	var selfpath string
 	if selfpath, err = osext.Executable(); err != nil {
 		return fmt.Errorf("Can't get executable path: %v", err)
 	}
@@ -766,7 +766,6 @@ func (obj *Remotes) NewSSH(file string) (*SSH, error) {
 		return nil, fmt.Errorf("Unknown remote scheme: %s", u.Scheme)
 	}
 
-	host := ""
 	port := defaultPort // default
 	x := strings.Split(u.Host, ":")
 	if c := len(x); c == 0 || c > 2 { // need one or two chunks
@@ -778,7 +777,7 @@ func (obj *Remotes) NewSSH(file string) (*SSH, error) {
 		}
 		port = uint16(v)
 	}
-	host = x[0]
+	host := x[0]
 	if host == "" {
 		return nil, fmt.Errorf("empty hostname")
 	}

resources/virt.go

@@ -764,7 +764,7 @@ func (obj *VirtRes) CheckApply(apply bool) (bool, error) {
 			return false, nil
 		}
 
-		var c = true
+		var c bool                       // = true
 		dom, c, err = obj.domainCreate() // create the domain
 		if err != nil {
 			return false, errwrap.Wrapf(err, "domainCreate failed")

util/util.go

@@ -334,7 +334,7 @@ func FlattenListWithSplit(input []string, split []string) []string {
 	}
 	out := []string{}
 	for _, x := range input {
-		s := []string{}
+		var s []string
 		if len(split) == 1 {
 			s = strings.Split(x, split[0]) // split by only string
 		} else {

yamlgraph/gapi.go

@@ -150,7 +150,7 @@ func (obj *GAPI) Next() chan gapi.Next {
 		startChan := make(chan struct{}) // start signal
 		close(startChan)                 // kick it off!
 
-		watchChan := make(chan error)
+		var watchChan chan error
 		if obj.data.NoStreamWatch {
 			watchChan = nil
 		} else {

yamlgraph2/gapi.go

@@ -150,7 +150,7 @@ func (obj *GAPI) Next() chan gapi.Next {
 		startChan := make(chan struct{}) // start signal
 		close(startChan)                 // kick it off!
 
-		watchChan := make(chan error)
+		var watchChan chan error
 		if obj.data.NoStreamWatch {
 			watchChan = nil
 		} else {