From 915638d17ad9e8f032cea28fd7d289db43e0b287 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Mon, 10 Oct 2016 17:25:23 +0100 Subject: [PATCH] Address linter failures --- ipam/ring/ring_test.go | 4 ++-- npc/namespace.go | 4 ++-- prog/weaver/metrics.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ipam/ring/ring_test.go b/ipam/ring/ring_test.go index fa5e0c44..ca95744d 100644 --- a/ipam/ring/ring_test.go +++ b/ipam/ring/ring_test.go @@ -494,7 +494,7 @@ func TestTransfer(t *testing.T) { ring1.ClaimItAll() ring1.GrantRangeToHost(middle, end, peer2name) ring1.Transfer(peer2name, peer1name) - require.Equal(t, []address.Range{{start, middle}, {middle, end}}, ring1.OwnedRanges()) + require.Equal(t, []address.Range{{Start: start, End: middle}, {Start: middle, End: end}}, ring1.OwnedRanges()) // Second test is what happens when a token exists at the end of a range but is transferred // - does it get resurrected correctly? @@ -503,7 +503,7 @@ func TestTransfer(t *testing.T) { ring1.GrantRangeToHost(middle, end, peer2name) ring1.Transfer(peer2name, peer1name) ring1.GrantRangeToHost(dot10, middle, peer2name) - require.Equal(t, []address.Range{{start, dot10}, {middle, end}}, ring1.OwnedRanges()) + require.Equal(t, []address.Range{{Start: start, End: dot10}, {Start: middle, End: end}}, ring1.OwnedRanges()) } func TestOwner(t *testing.T) { diff --git a/npc/namespace.go b/npc/namespace.go index b2ae88d4..3974bf3a 100644 --- a/npc/namespace.go +++ b/npc/namespace.go @@ -319,13 +319,13 @@ func equals(a, b map[string]string) bool { } func isDefaultDeny(namespace *coreapi.Namespace) bool { - nnpJson, found := namespace.ObjectMeta.Annotations["net.beta.kubernetes.io/network-policy"] + nnpJSON, found := namespace.ObjectMeta.Annotations["net.beta.kubernetes.io/network-policy"] if !found { return false } var nnp NamespaceNetworkPolicy - if err := json.Unmarshal([]byte(nnpJson), &nnp); err != nil { + if err := json.Unmarshal([]byte(nnpJSON), &nnp); err != nil { log.Warn("Ignoring network policy annotation: unmarshal failed:", err) // If we can't understand the annotation, behave as if it isn't present return false diff --git a/prog/weaver/metrics.go b/prog/weaver/metrics.go index 296dd620..3ab4a4a9 100644 --- a/prog/weaver/metrics.go +++ b/prog/weaver/metrics.go @@ -43,7 +43,7 @@ func uint64Counter(desc *prometheus.Desc, val uint64, labels ...string) promethe return prometheus.MustNewConstMetric(desc, prometheus.CounterValue, float64(val), labels...) } -var metrics []metric = []metric{ +var metrics = []metric{ {desc("weave_connections", "Number of peer-to-peer connections.", "state"), func(s WeaveStatus, desc *prometheus.Desc, ch chan<- prometheus.Metric) { counts := make(map[string]int)