From b6411253cfeb0c54d2776c371a08c91dfd17b645 Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Sun, 8 Oct 2017 13:42:36 +0100 Subject: [PATCH] Fix: cannot find package github.com/Sirupsen/logrus. Fix: ``` report/marshal.go:14:2: cannot find package "github.com/Sirupsen/logrus" in any of: /go/src/github.com/weaveworks/scope/vendor/github.com/Sirupsen/logrus (vendor tree) /usr/local/go/src/github.com/Sirupsen/logrus (from $GOROOT) /go/src/github.com/Sirupsen/logrus (from $GOPATH) ``` via: ``` $ git grep -l Sirupsen | grep -v vendor | xargs sed -i 's:github.com/Sirupsen/logrus:github.com/sirupsen/logrus:g' $ gofmt -s -w app $ gofmt -s -w common $ gofmt -s -w probe $ gofmt -s -w prog $ gofmt -s -w tools ``` --- app/api_topologies.go | 2 +- app/api_topology.go | 2 +- app/controls.go | 2 +- app/multitenant/aws_collector.go | 2 +- app/multitenant/billing_emitter.go | 2 +- app/multitenant/consul_client.go | 2 +- app/multitenant/consul_pipe_router.go | 2 +- app/multitenant/memcache_client.go | 2 +- app/multitenant/sqs_control_router.go | 2 +- app/pipe_router.go | 2 +- app/pipes.go | 2 +- app/router.go | 2 +- app/server_helpers.go | 2 +- common/xfer/websocket.go | 2 +- probe/appclient/app_client.go | 2 +- probe/appclient/multi_client.go | 2 +- probe/appclient/resolver.go | 2 +- probe/awsecs/client.go | 2 +- probe/awsecs/reporter.go | 2 +- probe/docker/container.go | 2 +- probe/docker/controls.go | 2 +- probe/docker/registry.go | 2 +- probe/endpoint/connection_tracker.go | 2 +- probe/endpoint/conntrack.go | 2 +- probe/endpoint/dns_snooper_linux_amd64.go | 2 +- probe/endpoint/ebpf.go | 2 +- probe/endpoint/procspy/proc_linux.go | 2 +- probe/endpoint/procspy/reader_linux.go | 2 +- probe/host/controls.go | 2 +- probe/host/controls_linux.go | 2 +- probe/kubernetes/client.go | 2 +- probe/kubernetes/reporter.go | 2 +- probe/plugins/registry.go | 2 +- probe/probe.go | 2 +- prog/app.go | 2 +- prog/main.go | 2 +- prog/main_test.go | 2 +- prog/probe.go | 2 +- report/marshal.go | 2 +- report/table.go | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app/api_topologies.go b/app/api_topologies.go index 92e4e3d11..7d00954c3 100644 --- a/app/api_topologies.go +++ b/app/api_topologies.go @@ -9,8 +9,8 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/scope/probe/docker" diff --git a/app/api_topology.go b/app/api_topology.go index a30f554bd..ec5e146dd 100644 --- a/app/api_topology.go +++ b/app/api_topology.go @@ -4,8 +4,8 @@ import ( "net/http" "time" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/scope/common/xfer" diff --git a/app/controls.go b/app/controls.go index 1977f71f1..10e27e686 100644 --- a/app/controls.go +++ b/app/controls.go @@ -4,8 +4,8 @@ import ( "net/http" "net/rpc" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" + log "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" "golang.org/x/net/context" diff --git a/app/multitenant/aws_collector.go b/app/multitenant/aws_collector.go index 964b5b241..064529465 100644 --- a/app/multitenant/aws_collector.go +++ b/app/multitenant/aws_collector.go @@ -8,7 +8,6 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/session" @@ -16,6 +15,7 @@ import ( "github.com/bluele/gcache" "github.com/nats-io/nats" "github.com/prometheus/client_golang/prometheus" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/common/instrument" diff --git a/app/multitenant/billing_emitter.go b/app/multitenant/billing_emitter.go index a83561c5c..253b12865 100644 --- a/app/multitenant/billing_emitter.go +++ b/app/multitenant/billing_emitter.go @@ -7,7 +7,7 @@ import ( "strings" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" billing "github.com/weaveworks/billing-client" "golang.org/x/net/context" diff --git a/app/multitenant/consul_client.go b/app/multitenant/consul_client.go index f893999a3..222b5f5d4 100644 --- a/app/multitenant/consul_client.go +++ b/app/multitenant/consul_client.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - log "github.com/Sirupsen/logrus" consul "github.com/hashicorp/consul/api" + log "github.com/sirupsen/logrus" ) const ( diff --git a/app/multitenant/consul_pipe_router.go b/app/multitenant/consul_pipe_router.go index bc06d2e11..b6b825f15 100644 --- a/app/multitenant/consul_pipe_router.go +++ b/app/multitenant/consul_pipe_router.go @@ -8,9 +8,9 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" "github.com/gorilla/websocket" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/common/mtime" diff --git a/app/multitenant/memcache_client.go b/app/multitenant/memcache_client.go index c4fd3e297..dea247c88 100644 --- a/app/multitenant/memcache_client.go +++ b/app/multitenant/memcache_client.go @@ -7,9 +7,9 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/bradfitz/gomemcache/memcache" "github.com/prometheus/client_golang/prometheus" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/common/instrument" diff --git a/app/multitenant/sqs_control_router.go b/app/multitenant/sqs_control_router.go index 35071aef3..e67b5ebab 100644 --- a/app/multitenant/sqs_control_router.go +++ b/app/multitenant/sqs_control_router.go @@ -8,11 +8,11 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sqs" "github.com/prometheus/client_golang/prometheus" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/common/instrument" diff --git a/app/pipe_router.go b/app/pipe_router.go index af0febff6..0c20b7330 100644 --- a/app/pipe_router.go +++ b/app/pipe_router.go @@ -6,7 +6,7 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/common/mtime" diff --git a/app/pipes.go b/app/pipes.go index 08feab372..a79a8ad05 100644 --- a/app/pipes.go +++ b/app/pipes.go @@ -3,8 +3,8 @@ package app import ( "net/http" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" + log "github.com/sirupsen/logrus" "golang.org/x/net/context" "github.com/weaveworks/scope/common/xfer" diff --git a/app/router.go b/app/router.go index 414f45f99..8820515e0 100644 --- a/app/router.go +++ b/app/router.go @@ -12,8 +12,8 @@ import ( "time" "github.com/PuerkitoBio/ghost/handlers" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" + log "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" "golang.org/x/net/context" diff --git a/app/server_helpers.go b/app/server_helpers.go index aa2937066..fffee5858 100644 --- a/app/server_helpers.go +++ b/app/server_helpers.go @@ -5,7 +5,7 @@ import ( "github.com/ugorji/go/codec" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) func respondWith(w http.ResponseWriter, code int, response interface{}) { diff --git a/common/xfer/websocket.go b/common/xfer/websocket.go index b96c93067..1e1ca7f9d 100644 --- a/common/xfer/websocket.go +++ b/common/xfer/websocket.go @@ -6,8 +6,8 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/gorilla/websocket" + log "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" "github.com/weaveworks/common/mtime" diff --git a/probe/appclient/app_client.go b/probe/appclient/app_client.go index ea511d1c2..2f77bfd20 100644 --- a/probe/appclient/app_client.go +++ b/probe/appclient/app_client.go @@ -11,9 +11,9 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/gorilla/websocket" "github.com/hashicorp/go-cleanhttp" + log "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" "github.com/weaveworks/scope/common/xfer" diff --git a/probe/appclient/multi_client.go b/probe/appclient/multi_client.go index c8187a5ed..a69a67c24 100644 --- a/probe/appclient/multi_client.go +++ b/probe/appclient/multi_client.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/common/xfer" "github.com/weaveworks/scope/report" diff --git a/probe/appclient/resolver.go b/probe/appclient/resolver.go index f965a5a06..559a38d05 100644 --- a/probe/appclient/resolver.go +++ b/probe/appclient/resolver.go @@ -7,8 +7,8 @@ import ( "strings" "time" - log "github.com/Sirupsen/logrus" "github.com/miekg/dns" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/common/xfer" ) diff --git a/probe/awsecs/client.go b/probe/awsecs/client.go index 86c917cc5..be255bbc0 100644 --- a/probe/awsecs/client.go +++ b/probe/awsecs/client.go @@ -6,12 +6,12 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ecs" "github.com/bluele/gcache" + log "github.com/sirupsen/logrus" ) const servicePrefix = "ecs-svc" // Task StartedBy field begins with this if it was started by a service diff --git a/probe/awsecs/reporter.go b/probe/awsecs/reporter.go index a3629c56d..833fa1a2a 100644 --- a/probe/awsecs/reporter.go +++ b/probe/awsecs/reporter.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/common/xfer" "github.com/weaveworks/scope/probe/controls" "github.com/weaveworks/scope/probe/docker" diff --git a/probe/docker/container.go b/probe/docker/container.go index bc10f6bfd..d8a2d58d1 100644 --- a/probe/docker/container.go +++ b/probe/docker/container.go @@ -9,8 +9,8 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" docker "github.com/fsouza/go-dockerclient" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/mtime" "github.com/weaveworks/scope/report" diff --git a/probe/docker/controls.go b/probe/docker/controls.go index f2eb51e6e..7cc54e0e4 100644 --- a/probe/docker/controls.go +++ b/probe/docker/controls.go @@ -3,7 +3,7 @@ package docker import ( docker_client "github.com/fsouza/go-dockerclient" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/common/xfer" "github.com/weaveworks/scope/probe/controls" diff --git a/probe/docker/registry.go b/probe/docker/registry.go index 223b11575..05e6a5302 100644 --- a/probe/docker/registry.go +++ b/probe/docker/registry.go @@ -6,9 +6,9 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/armon/go-radix" docker_client "github.com/fsouza/go-dockerclient" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/probe/controls" "github.com/weaveworks/scope/report" diff --git a/probe/endpoint/connection_tracker.go b/probe/endpoint/connection_tracker.go index cd8dac7a0..6d241ce49 100644 --- a/probe/endpoint/connection_tracker.go +++ b/probe/endpoint/connection_tracker.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/probe/endpoint/procspy" "github.com/weaveworks/scope/probe/process" "github.com/weaveworks/scope/report" diff --git a/probe/endpoint/conntrack.go b/probe/endpoint/conntrack.go index bc79661a4..95f6f5531 100644 --- a/probe/endpoint/conntrack.go +++ b/probe/endpoint/conntrack.go @@ -13,7 +13,7 @@ import ( "time" "unicode" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/exec" ) diff --git a/probe/endpoint/dns_snooper_linux_amd64.go b/probe/endpoint/dns_snooper_linux_amd64.go index 2a9d6be58..a755f364a 100644 --- a/probe/endpoint/dns_snooper_linux_amd64.go +++ b/probe/endpoint/dns_snooper_linux_amd64.go @@ -8,11 +8,11 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/bluele/gcache" "github.com/google/gopacket" "github.com/google/gopacket/layers" "github.com/google/gopacket/pcap" + log "github.com/sirupsen/logrus" ) const ( diff --git a/probe/endpoint/ebpf.go b/probe/endpoint/ebpf.go index 7b4b10fde..c3010e43e 100644 --- a/probe/endpoint/ebpf.go +++ b/probe/endpoint/ebpf.go @@ -11,7 +11,7 @@ import ( "sync" "syscall" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/fs" "github.com/weaveworks/scope/probe/endpoint/procspy" "github.com/weaveworks/scope/probe/host" diff --git a/probe/endpoint/procspy/proc_linux.go b/probe/endpoint/procspy/proc_linux.go index ec676072c..a32f7ff89 100644 --- a/probe/endpoint/procspy/proc_linux.go +++ b/probe/endpoint/procspy/proc_linux.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - log "github.com/Sirupsen/logrus" "github.com/armon/go-metrics" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/fs" "github.com/weaveworks/scope/common/marshal" diff --git a/probe/endpoint/procspy/reader_linux.go b/probe/endpoint/procspy/reader_linux.go index 92b43ca3c..25557c79f 100644 --- a/probe/endpoint/procspy/reader_linux.go +++ b/probe/endpoint/procspy/reader_linux.go @@ -6,7 +6,7 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/probe/process" ) diff --git a/probe/host/controls.go b/probe/host/controls.go index c565dbee7..bf53971e0 100644 --- a/probe/host/controls.go +++ b/probe/host/controls.go @@ -3,9 +3,9 @@ package host import ( "os/exec" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/term" "github.com/kr/pty" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/common/xfer" "github.com/weaveworks/scope/probe/controls" diff --git a/probe/host/controls_linux.go b/probe/host/controls_linux.go index bb3fc0cdc..01ee68352 100644 --- a/probe/host/controls_linux.go +++ b/probe/host/controls_linux.go @@ -6,7 +6,7 @@ import ( "strings" "syscall" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/willdonnelly/passwd" ) diff --git a/probe/kubernetes/client.go b/probe/kubernetes/client.go index eae963e50..1530a0930 100644 --- a/probe/kubernetes/client.go +++ b/probe/kubernetes/client.go @@ -8,7 +8,7 @@ import ( "github.com/weaveworks/common/backoff" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/types" diff --git a/probe/kubernetes/reporter.go b/probe/kubernetes/reporter.go index bda02378d..88401d7c6 100644 --- a/probe/kubernetes/reporter.go +++ b/probe/kubernetes/reporter.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/labels" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/mtime" "github.com/weaveworks/scope/probe" "github.com/weaveworks/scope/probe/controls" diff --git a/probe/plugins/registry.go b/probe/plugins/registry.go index 11d9d1db1..dbcf810c7 100644 --- a/probe/plugins/registry.go +++ b/probe/plugins/registry.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" "golang.org/x/net/context" "golang.org/x/net/context/ctxhttp" diff --git a/probe/probe.go b/probe/probe.go index 80d1bf458..53b6ace72 100644 --- a/probe/probe.go +++ b/probe/probe.go @@ -4,8 +4,8 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/armon/go-metrics" + log "github.com/sirupsen/logrus" "github.com/weaveworks/scope/probe/appclient" "github.com/weaveworks/scope/report" diff --git a/prog/app.go b/prog/app.go index 7b517100e..b0b1d7525 100644 --- a/prog/app.go +++ b/prog/app.go @@ -12,9 +12,9 @@ import ( "strings" "time" - log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus" + log "github.com/sirupsen/logrus" "github.com/tylerb/graceful" billing "github.com/weaveworks/billing-client" diff --git a/prog/main.go b/prog/main.go index 7d72262b1..a2ad51502 100644 --- a/prog/main.go +++ b/prog/main.go @@ -12,7 +12,7 @@ import ( "strings" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" billing "github.com/weaveworks/billing-client" "github.com/weaveworks/scope/app" diff --git a/prog/main_test.go b/prog/main_test.go index 3e1728b9c..dad7fe5ad 100644 --- a/prog/main_test.go +++ b/prog/main_test.go @@ -4,7 +4,7 @@ import ( "flag" "testing" - "github.com/Sirupsen/logrus/hooks/test" + "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" ) diff --git a/prog/probe.go b/prog/probe.go index 5d282d016..4ff883726 100644 --- a/prog/probe.go +++ b/prog/probe.go @@ -10,9 +10,9 @@ import ( "strconv" "time" - log "github.com/Sirupsen/logrus" "github.com/armon/go-metrics" "github.com/prometheus/client_golang/prometheus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/network" "github.com/weaveworks/common/sanitize" diff --git a/report/marshal.go b/report/marshal.go index cebcd0b76..268554e54 100644 --- a/report/marshal.go +++ b/report/marshal.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" ) diff --git a/report/table.go b/report/table.go index 859a8c1f1..8f7a46d5e 100644 --- a/report/table.go +++ b/report/table.go @@ -6,7 +6,7 @@ import ( "strings" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/weaveworks/common/mtime" )