Merge pull request #658 from tomdee/tidy

Fix various little problems found by gometalinter

backend/alloc/alloc.go

@@ -17,10 +17,10 @@ package alloc
 import (
 	"fmt"
 
-	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	"golang.org/x/net/context"
 )
 
 func init() {

backend/awsvpc/awsvpc.go

@@ -116,6 +116,9 @@ func (be *AwsVpcBackend) RegisterNetwork(ctx context.Context, network string, co
 	}
 
 	networkConfig, err := be.sm.GetNetworkConfig(ctx, network)
+	if err != nil {
+		log.Errorf("Error fetching network config: %v", err)
+	}
 
 	err = be.cleanupBlackholeRoutes(cfg.RouteTableID, networkConfig.Network, ec2c)
 	if err != nil {

backend/gce/gce.go

@@ -119,7 +119,7 @@ func (g *GCEBackend) RegisterNetwork(ctx context.Context, network string, config
 
 		err = g.api.pollOperationStatus(operation.Name)
 		if err != nil {
-			return nil, fmt.Errorf("insert operaiton failed: ", err)
+			return nil, fmt.Errorf("insert operaiton failed: %v", err)
 		}
 	}
 

backend/hostgw/hostgw.go

@@ -17,10 +17,10 @@ package hostgw
 import (
 	"fmt"
 
-	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	"golang.org/x/net/context"
 )
 
 func init() {

backend/manager.go

@@ -24,7 +24,7 @@ import (
 	"github.com/coreos/flannel/subnet"
 )
 
-var backendCtors map[string]BackendCtor = make(map[string]BackendCtor)
+var constructors = make(map[string]BackendCtor)
 
 type Manager interface {
 	GetBackend(backendType string) (Backend, error)
@@ -60,7 +60,7 @@ func (bm *manager) GetBackend(backendType string) (Backend, error) {
 	}
 
 	// first request, need to create and run it
-	befunc, ok := backendCtors[betype]
+	befunc, ok := constructors[betype]
 	if !ok {
 		return nil, fmt.Errorf("unknown backend type: %v", betype)
 	}
@@ -95,5 +95,5 @@ func (bm *manager) Wait() {
 }
 
 func Register(name string, ctor BackendCtor) {
-	backendCtors[name] = ctor
+	constructors[name] = ctor
 }

backend/udp/network.go

@@ -142,11 +142,7 @@ func (n *network) initTun() error {
 	}
 
 	err = configureIface(tunName, n.tunNet, n.MTU())
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 func configureIface(ifname string, ipn ip.IP4Net, mtu int) error {

backend/vxlan/device.go

@@ -243,7 +243,7 @@ func (dev *vxlanDevice) processNeighMsg(msg syscall.NetlinkMessage, misses chan
 		return
 	}
 
-	if int(neigh.LinkIndex) != dev.link.Index {
+	if neigh.LinkIndex != dev.link.Index {
 		return
 	}
 

subnet/config.go

@@ -38,10 +38,8 @@ func parseBackendType(be json.RawMessage) (string, error) {
 
 	if len(be) == 0 {
 		return "udp", nil
-	} else {
-		if err := json.Unmarshal(be, &bt); err != nil {
-			return "", fmt.Errorf("error decoding Backend property of config: %v", err)
-		}
+	} else if err := json.Unmarshal(be, &bt); err != nil {
+		return "", fmt.Errorf("error decoding Backend property of config: %v", err)
 	}
 
 	return bt.Type, nil

subnet/etcdv2/registry.go

@@ -353,7 +353,7 @@ func (esr *etcdSubnetRegistry) parseNetworkWatchResponse(resp *etcd.Response) (E
 		return Event{}, index, errTryAgain
 	}
 
-	evt := Event{}
+	var evt Event
 
 	switch resp.Action {
 	case "delete":

subnet/etcdv2/registry_test.go

@@ -88,8 +88,6 @@ func watchSubnets(t *testing.T, r Registry, ctx context.Context, sn ip.IP4Net, n
 			return
 		}
 	}
-
-	result <- fmt.Errorf("Should never get here")
 }
 
 func TestEtcdRegistry(t *testing.T) {
@@ -152,19 +150,19 @@ func TestEtcdRegistry(t *testing.T) {
 		t.Fatal("Failed to create subnet lease")
 	}
 	if !exp.After(time.Now()) {
-		t.Fatal("Subnet lease duration %v not in the future", exp)
+		t.Fatalf("Subnet lease duration %v not in the future", exp)
 	}
 
 	// Make sure the lease got created
 	resp, err := m.Get(ctx, "/coreos.com/network/foobar/subnets/10.1.5.0-24", nil)
 	if err != nil {
-		t.Fatal("Failed to verify subnet lease directly in etcd: %v", err)
+		t.Fatalf("Failed to verify subnet lease directly in etcd: %v", err)
 	}
 	if resp == nil || resp.Node == nil {
 		t.Fatal("Failed to retrive node in subnet lease")
 	}
 	if resp.Node.Value != "{\"PublicIP\":\"1.2.3.4\"}" {
-		t.Fatal("Unexpected subnet lease node %s value %s", resp.Node.Key, resp.Node.Value)
+		t.Fatalf("Unexpected subnet lease node %s value %s", resp.Node.Key, resp.Node.Value)
 	}
 
 	leases, _, err := r.getSubnets(ctx, "foobar")

subnet/etcdv2/subnet_test.go

@@ -280,7 +280,7 @@ func TestRenewLease(t *testing.T) {
 	// check that it's still good
 	n, err := msr.getNetwork(ctx, "_")
 	if err != nil {
-		t.Error("Failed to renew lease: could not get networks: %v", err)
+		t.Errorf("Failed to renew lease: could not get networks: %v", err)
 	}
 
 	for _, sn := range n.subnets {
@@ -296,7 +296,7 @@ func TestRenewLease(t *testing.T) {
 		}
 	}
 
-	t.Fatalf("Failed to find acquired lease")
+	t.Fatal("Failed to find acquired lease")
 }
 
 func TestLeaseRevoked(t *testing.T) {
@@ -336,7 +336,7 @@ func TestWatchGetNetworks(t *testing.T) {
 
 	resp, err := sm.WatchNetworks(ctx, nil)
 	if err != nil {
-		t.Errorf("WatchNetworks(nil) failed:", err)
+		t.Errorf("WatchNetworks(nil) failed: %v", err)
 	}
 
 	if len(resp.Snapshot) != 1 {

subnet/kube/kube.go

@@ -41,7 +41,6 @@ import (
 
 var (
 	ErrUnimplemented = errors.New("unimplemented")
-	kubeSubnetCfg    *subnet.Config
 )
 
 const (

subnet/subnet.go

@@ -28,9 +28,9 @@ import (
 )
 
 var (
-	ErrLeaseTaken                 = errors.New("subnet: lease already taken")
-	ErrNoMoreTries                = errors.New("subnet: no more tries")
-	subnetRegex    *regexp.Regexp = regexp.MustCompile(`(\d+\.\d+.\d+.\d+)-(\d+)`)
+	ErrLeaseTaken  = errors.New("subnet: lease already taken")
+	ErrNoMoreTries = errors.New("subnet: no more tries")
+	subnetRegex    = regexp.MustCompile(`(\d+\.\d+.\d+.\d+)-(\d+)`)
 )
 
 type LeaseAttrs struct {

subnet/watch.go

@@ -47,7 +47,7 @@ func WatchLeases(ctx context.Context, sm Manager, network string, ownLease *Leas
 
 		cursor = res.Cursor
 
-		batch := []Event{}
+		var batch []Event
 
 		if len(res.Events) > 0 {
 			batch = lw.update(res.Events)
@@ -175,7 +175,7 @@ func WatchNetworks(ctx context.Context, sm Manager, receiver chan []Event) {
 		}
 		cursor = res.Cursor
 
-		batch := []Event{}
+		var batch []Event
 
 		if len(res.Events) > 0 {
 			batch = nw.update(res.Events)
@@ -212,7 +212,7 @@ func (nw *netWatcher) reset(networks []string) []Event {
 	}
 
 	// everything left in sm.networks has been deleted
-	for netname, _ := range nw.networks {
+	for netname := range nw.networks {
 		batch = append(batch, Event{EventRemoved, Lease{}, netname})
 	}