From b9f788993b3e0aa2c9df9818576a1d8fbac9bba1 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 1 Mar 2016 12:31:54 +0000 Subject: [PATCH 1/2] Upgrade to go1.6 --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5db434d54..85b36ec3b 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.5.3 +FROM golang:1.6.0 ENV GO15VENDOREXPERIMENT 1 RUN apt-get update && apt-get install -y libpcap-dev python-requests time RUN go clean -i net && go install -tags netgo std && go install -race -tags netgo std From 28a0dd9d761054ee39f2a07b67fc3ae80345aebe Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 1 Mar 2016 13:01:19 +0000 Subject: [PATCH 2/2] Fix for new go1.6 lint rules. --- render/theinternet_test.go | 2 +- report/edge_metadatas_internal_test.go | 128 ++++++++++++------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/render/theinternet_test.go b/render/theinternet_test.go index 230559ed0..f31dd144d 100644 --- a/render/theinternet_test.go +++ b/render/theinternet_test.go @@ -18,7 +18,7 @@ func TestReportLocalNetworks(t *testing.T) { "nonets": report.MakeNode(), "foo": report.MakeNode().WithSets(report.EmptySets. Add(host.LocalNetworks, report.MakeStringSet( - "10.0.0.1/8", "192.168.1.1/24", "10.0.0.1/8", "badnet/33")), + "10.0.0.1/8", "192.168.1.1/24", "10.0.0.1/8", "badnet/33")), ), }, }, diff --git a/report/edge_metadatas_internal_test.go b/report/edge_metadatas_internal_test.go index c9ffefd88..9106a705e 100644 --- a/report/edge_metadatas_internal_test.go +++ b/report/edge_metadatas_internal_test.go @@ -13,13 +13,13 @@ import ( func TestEdgeMetadatasAdd(t *testing.T) { have := EmptyEdgeMetadatas. Add("foo", - EdgeMetadata{ - EgressPacketCount: newu64(1), - }). + EdgeMetadata{ + EgressPacketCount: newu64(1), + }). Add("foo", - EdgeMetadata{ - EgressPacketCount: newu64(2), - }) + EdgeMetadata{ + EgressPacketCount: newu64(2), + }) if emd, ok := have.Lookup("foo"); !ok || *emd.EgressPacketCount != 3 { t.Errorf("foo.EgressPacketCount != 3") } @@ -43,14 +43,14 @@ func TestEdgeMetadatasAddNil(t *testing.T) { func TestEdgeMetadatasDeepEquals(t *testing.T) { want := EmptyEdgeMetadatas. Add("foo", - EdgeMetadata{ - EgressPacketCount: newu64(3), - }) + EdgeMetadata{ + EgressPacketCount: newu64(3), + }) have := EmptyEdgeMetadatas. Add("foo", - EdgeMetadata{ - EgressPacketCount: newu64(3), - }) + EdgeMetadata{ + EgressPacketCount: newu64(3), + }) if !reflect.DeepEqual(want, have) { t.Errorf(test.Diff(want, have)) } @@ -69,76 +69,76 @@ func TestEdgeMetadatasMerge(t *testing.T) { a: EmptyEdgeMetadatas, b: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(1), - }), + EdgeMetadata{ + EgressPacketCount: newu64(1), + }), want: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(1), - }), + EdgeMetadata{ + EgressPacketCount: newu64(1), + }), }, "Empty b": { a: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(12), - EgressByteCount: newu64(999), - }), + EdgeMetadata{ + EgressPacketCount: newu64(12), + EgressByteCount: newu64(999), + }), b: EmptyEdgeMetadatas, want: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(12), - EgressByteCount: newu64(999), - }), + EdgeMetadata{ + EgressPacketCount: newu64(12), + EgressByteCount: newu64(999), + }), }, "Disjoint a & b": { a: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(12), - EgressByteCount: newu64(500), - }), + EdgeMetadata{ + EgressPacketCount: newu64(12), + EgressByteCount: newu64(500), + }), b: EmptyEdgeMetadatas. Add("hostQ|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(1), - EgressByteCount: newu64(2), - }), + EdgeMetadata{ + EgressPacketCount: newu64(1), + EgressByteCount: newu64(2), + }), want: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(12), - EgressByteCount: newu64(500), - }). + EdgeMetadata{ + EgressPacketCount: newu64(12), + EgressByteCount: newu64(500), + }). Add("hostQ|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(1), - EgressByteCount: newu64(2), - }), + EdgeMetadata{ + EgressPacketCount: newu64(1), + EgressByteCount: newu64(2), + }), }, "Overlapping a & b": { a: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(12), - EgressByteCount: newu64(1000), - }), + EdgeMetadata{ + EgressPacketCount: newu64(12), + EgressByteCount: newu64(1000), + }), b: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(1), - IngressByteCount: newu64(123), - EgressByteCount: newu64(2), - }), + EdgeMetadata{ + EgressPacketCount: newu64(1), + IngressByteCount: newu64(123), + EgressByteCount: newu64(2), + }), want: EmptyEdgeMetadatas. Add("hostA|:192.168.1.1:12345|:192.168.1.2:80", - EdgeMetadata{ - EgressPacketCount: newu64(13), - IngressByteCount: newu64(123), - EgressByteCount: newu64(1002), - }), + EdgeMetadata{ + EgressPacketCount: newu64(13), + IngressByteCount: newu64(123), + EgressByteCount: newu64(1002), + }), }, } { if have := c.a.Merge(c.b); !reflect.DeepEqual(c.want, have) { @@ -170,11 +170,11 @@ func TestEdgeMetadataFlatten(t *testing.T) { { have := EmptyEdgeMetadatas. Add("foo", EdgeMetadata{ - EgressPacketCount: newu64(1), - }). + EgressPacketCount: newu64(1), + }). Add("bar", EdgeMetadata{ - EgressPacketCount: newu64(3), - }).Flatten() + EgressPacketCount: newu64(3), + }).Flatten() want := EdgeMetadata{ EgressPacketCount: newu64(1 + 3), } @@ -208,11 +208,11 @@ func TestEdgeMetadataReversed(t *testing.T) { func TestEdgeMetadatasEncoding(t *testing.T) { want := EmptyEdgeMetadatas. Add("foo", EdgeMetadata{ - EgressPacketCount: newu64(1), - }). + EgressPacketCount: newu64(1), + }). Add("bar", EdgeMetadata{ - EgressPacketCount: newu64(3), - }) + EgressPacketCount: newu64(3), + }) { gobs, err := want.GobEncode()