From 14ddd7c1967720b32df581432db006569caf2ec0 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Wed, 21 Feb 2018 22:29:44 -0500 Subject: [PATCH] golint: Fix ineffassign mistakes --- etcd/etcd.go | 2 +- etcd/methods.go | 5 ++--- examples/longpoll/redirect-client.go | 1 + hcl/gapi.go | 2 +- lang/interpret.go | 2 +- puppet/gapi.go | 2 +- remote/remote.go | 5 ++--- resources/virt.go | 2 +- util/util.go | 2 +- yamlgraph/gapi.go | 2 +- yamlgraph2/gapi.go | 2 +- 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/etcd/etcd.go b/etcd/etcd.go index 112b32c0..0650b6f3 100644 --- a/etcd/etcd.go +++ b/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 { diff --git a/etcd/methods.go b/etcd/methods.go index 2c45af21..d4d7234a 100644 --- a/etcd/methods.go +++ b/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 diff --git a/examples/longpoll/redirect-client.go b/examples/longpoll/redirect-client.go index d9fb0822..112347d3 100644 --- a/examples/longpoll/redirect-client.go +++ b/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) } diff --git a/hcl/gapi.go b/hcl/gapi.go index 9aefc651..161b07b3 100644 --- a/hcl/gapi.go +++ b/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 { diff --git a/lang/interpret.go b/lang/interpret.go index dbfded62..5752772a 100644 --- a/lang/interpret.go +++ b/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 diff --git a/puppet/gapi.go b/puppet/gapi.go index 87793c94..b5a2b511 100644 --- a/puppet/gapi.go +++ b/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 { diff --git a/remote/remote.go b/remote/remote.go index b1c48a29..543b434c 100644 --- a/remote/remote.go +++ b/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") } diff --git a/resources/virt.go b/resources/virt.go index 5680abb6..b6297cdc 100644 --- a/resources/virt.go +++ b/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") diff --git a/util/util.go b/util/util.go index cf6a891b..13cc500f 100644 --- a/util/util.go +++ b/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 { diff --git a/yamlgraph/gapi.go b/yamlgraph/gapi.go index d40b0450..df0a4bce 100644 --- a/yamlgraph/gapi.go +++ b/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 { diff --git a/yamlgraph2/gapi.go b/yamlgraph2/gapi.go index 3a7cd4a6..29743961 100644 --- a/yamlgraph2/gapi.go +++ b/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 {