Merge pull request #2061 from weaveworks/use-common-lib

Use newly-created 'common' repo
weaveworks · Dec 7, 2016 · 9a92961 · 9a92961
2 parents 9d5d431 + 1020fc5
commit 9a92961
Show file tree

Hide file tree

Showing 197 changed files with 21,840 additions and 161 deletions.
diff --git a/app/collector.go b/app/collector.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ugorji/go/codec"
 	"golang.org/x/net/context"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/report"
 )
 

diff --git a/app/collector_test.go b/app/collector_test.go
@@ -6,10 +6,10 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/app"
-	"github.com/weaveworks/scope/common/mtime"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

diff --git a/app/merger_test.go b/app/merger_test.go
@@ -5,9 +5,9 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/app"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

diff --git a/app/multitenant/aws_collector.go b/app/multitenant/aws_collector.go
@@ -17,8 +17,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
 
+	"github.com/weaveworks/common/instrument"
 	"github.com/weaveworks/scope/app"
-	"github.com/weaveworks/scope/common/instrument"
 	"github.com/weaveworks/scope/report"
 )
 

diff --git a/app/multitenant/consul_pipe_router.go b/app/multitenant/consul_pipe_router.go
@@ -13,8 +13,8 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/net/context"
 
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/app"
-	"github.com/weaveworks/scope/common/mtime"
 	"github.com/weaveworks/scope/common/xfer"
 )
 

diff --git a/app/multitenant/memcache_client.go b/app/multitenant/memcache_client.go
@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
 
-	"github.com/weaveworks/scope/common/instrument"
+	"github.com/weaveworks/common/instrument"
 	"github.com/weaveworks/scope/report"
 )
 

diff --git a/app/multitenant/s3_client.go b/app/multitenant/s3_client.go
@@ -9,7 +9,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
 
-	"github.com/weaveworks/scope/common/instrument"
+	"github.com/weaveworks/common/instrument"
 	"github.com/weaveworks/scope/report"
 )
 

diff --git a/app/multitenant/sqs_control_router.go b/app/multitenant/sqs_control_router.go
@@ -15,8 +15,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
 
+	"github.com/weaveworks/common/instrument"
 	"github.com/weaveworks/scope/app"
-	"github.com/weaveworks/scope/common/instrument"
 	"github.com/weaveworks/scope/common/xfer"
 )
 

diff --git a/app/pipe_router.go b/app/pipe_router.go
@@ -9,7 +9,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"golang.org/x/net/context"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/common/xfer"
 )
 

diff --git a/app/pipes_internal_test.go b/app/pipes_internal_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/gorilla/websocket"
 	"golang.org/x/net/context"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/probe/appclient"
 	"github.com/weaveworks/scope/probe/controls"

diff --git a/app/router_test.go b/app/router_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/ugorji/go/codec"
 	"golang.org/x/net/context"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/app"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 )
 

diff --git a/app/weave.go b/app/weave.go
@@ -7,7 +7,7 @@ import (
 
 	fsouza "github.com/fsouza/go-dockerclient"
 
-	"github.com/weaveworks/scope/common/backoff"
+	"github.com/weaveworks/common/backoff"
 )
 
 // Default values for weave app integration

diff --git a/common/middleware/instrument_test.go b/common/middleware/instrument_test.go
diff --git a/common/sanitize/sanitize_test.go b/common/sanitize/sanitize_test.go
diff --git a/common/weave/client.go b/common/weave/client.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/ugorji/go/codec"
 
-	"github.com/weaveworks/scope/common/exec"
+	"github.com/weaveworks/common/exec"
 )
 
 // Client for Weave Net API

diff --git a/common/weave/client_test.go b/common/weave/client_test.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/weaveworks/scope/common/exec"
+	"github.com/weaveworks/common/exec"
+	"github.com/weaveworks/common/test"
+	testExec "github.com/weaveworks/common/test/exec"
 	"github.com/weaveworks/scope/common/weave"
-	"github.com/weaveworks/scope/test"
-	testExec "github.com/weaveworks/scope/test/exec"
 )
 
 const (

diff --git a/common/xfer/websocket.go b/common/xfer/websocket.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/ugorji/go/codec"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 )
 
 const (

diff --git a/probe/appclient/app_client_internal_test.go b/probe/appclient/app_client_internal_test.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/gorilla/handlers"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 )
 
 func dummyServer(t *testing.T, expectedToken, expectedID string, expectedVersion string, expectedReport report.Report, done chan struct{}) *httptest.Server {

diff --git a/probe/controls/controls_test.go b/probe/controls/controls_test.go
@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/probe/controls"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestControls(t *testing.T) {

diff --git a/probe/docker/container.go b/probe/docker/container.go
@@ -12,7 +12,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	docker "github.com/fsouza/go-dockerclient"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/report"
 )
 

diff --git a/probe/docker/container_test.go b/probe/docker/container_test.go
@@ -7,7 +7,7 @@ import (
 
 	client "github.com/fsouza/go-dockerclient"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/report"
 	"github.com/weaveworks/scope/test"

diff --git a/probe/docker/controls_test.go b/probe/docker/controls_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	commonTest "github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/probe/docker"
@@ -92,7 +93,7 @@ func TestPipes(t *testing.T) {
 				NodeID:  report.MakeContainerNodeID("ping"),
 			})
 			if !reflect.DeepEqual(result, want.response) {
-				t.Errorf("diff %s: %s", want.control, test.Diff(want, result))
+				t.Errorf("diff %s: %s", want.control, commonTest.Diff(want, result))
 			}
 		}
 	})

diff --git a/probe/docker/registry_test.go b/probe/docker/registry_test.go
@@ -11,7 +11,8 @@ import (
 
 	client "github.com/fsouza/go-dockerclient"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
+	commonTest "github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/report"
@@ -496,7 +497,7 @@ func TestRegistryDelete(t *testing.T) {
 				}),
 			}
 			if !reflect.DeepEqual(want, nodes) {
-				t.Errorf("Didn't get right container updates: %v", test.Diff(want, nodes))
+				t.Errorf("Didn't get right container updates: %v", commonTest.Diff(want, nodes))
 			}
 			nodes = []report.Node{}
 			mtx.Unlock()

diff --git a/probe/docker/tagger_test.go b/probe/docker/tagger_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/probe/process"
 	"github.com/weaveworks/scope/report"

diff --git a/probe/endpoint/conntrack.go b/probe/endpoint/conntrack.go
@@ -12,7 +12,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 
-	"github.com/weaveworks/scope/common/exec"
+	"github.com/weaveworks/common/exec"
 )
 
 const (

diff --git a/probe/endpoint/conntrack_internal_test.go b/probe/endpoint/conntrack_internal_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/common/exec"
+	"github.com/weaveworks/common/exec"
+	testexec "github.com/weaveworks/common/test/exec"
 	"github.com/weaveworks/scope/test"
-	testexec "github.com/weaveworks/scope/test/exec"
 )
 
 const conntrackCloseTag = "</conntrack>\n"

diff --git a/probe/endpoint/nat_internal_test.go b/probe/endpoint/nat_internal_test.go
@@ -3,9 +3,9 @@ package endpoint
 import (
 	"testing"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

diff --git a/probe/endpoint/procspy/proc_internal_test.go b/probe/endpoint/procspy/proc_internal_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	fs_hook "github.com/weaveworks/scope/common/fs"
+	fs_hook "github.com/weaveworks/common/fs"
+	"github.com/weaveworks/common/test/fs"
 	"github.com/weaveworks/scope/probe/process"
-	"github.com/weaveworks/scope/test/fs"
 )
 
 var mockFS = fs.Dir("",

diff --git a/probe/endpoint/procspy/proc_linux.go b/probe/endpoint/procspy/proc_linux.go
@@ -13,7 +13,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/armon/go-metrics"
 
-	"github.com/weaveworks/scope/common/fs"
+	"github.com/weaveworks/common/fs"
 	"github.com/weaveworks/scope/common/marshal"
 	"github.com/weaveworks/scope/probe/process"
 )

diff --git a/probe/endpoint/procspy/spy_linux_internal_test.go b/probe/endpoint/procspy/spy_linux_internal_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	fs_hook "github.com/weaveworks/scope/common/fs"
+	fs_hook "github.com/weaveworks/common/fs"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/process"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestLinuxConnections(t *testing.T) {

diff --git a/probe/host/reporter.go b/probe/host/reporter.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/report"
 )

diff --git a/probe/host/reporter_test.go b/probe/host/reporter_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/probe/host"
 	"github.com/weaveworks/scope/report"

diff --git a/probe/kubernetes/reporter.go b/probe/kubernetes/reporter.go
@@ -8,7 +8,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/labels"
 
-	"github.com/weaveworks/scope/common/mtime"
+	"github.com/weaveworks/common/mtime"
 	"github.com/weaveworks/scope/probe"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/probe/docker"
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ import ( @@
     	log "github.com/Sirupsen/logrus"
-    	"github.com/weaveworks/scope/common/exec"
+    	"github.com/weaveworks/common/exec"
     )
     const (
@@ Expand Down @@