14324: Use logrus in Azure driver. Fix Sirupsen->sirupsen in imports

"It's in the past been possible to import Logrus as both upper- and
lower-case. Due to the Go package environment, this caused issues in
the community and we needed a standard. Some environments experienced
problems with the upper-case variant, so the lower-case was
decided. Everything using logrus will need to use the lower-case:
github.com/sirupsen/logrus. Any package that isn't, should be
changed."

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/lib/cloud/azure.go b/lib/cloud/azure.go
index d9f1158fc36dded453b462e9df97fcc1b0adbd37..d94285d6ad54c005b39b27bd3ebb46e1605f0440 100644 (file)
--- a/lib/cloud/azure.go
+++ b/lib/cloud/azure.go
@@ -8,7 +8,6 @@ import (
        "context"
        "encoding/base64"
        "fmt"
-       "log"
        "net/http"
        "regexp"
        "strconv"
@@ -27,6 +26,7 @@ import (
        "github.com/Azure/go-autorest/autorest/to"
        "github.com/jmcvetta/randutil"
        "github.com/mitchellh/mapstructure"
+       "github.com/sirupsen/logrus"
        "golang.org/x/crypto/ssh"
 )
 
@@ -200,14 +200,15 @@ type AzureInstanceSet struct {
        stopWg            sync.WaitGroup
        deleteNIC         chan string
        deleteBlob        chan storage.Blob
+       logger            logrus.FieldLogger
 }
 
-func NewAzureInstanceSet(config map[string]interface{}, dispatcherID InstanceSetID) (prv InstanceSet, err error) {
+func NewAzureInstanceSet(config map[string]interface{}, dispatcherID InstanceSetID, logger logrus.FieldLogger) (prv InstanceSet, err error) {
        azcfg := AzureInstanceSetConfig{}
        if err = mapstructure.Decode(config, &azcfg); err != nil {
                return nil, err
        }
-       ap := AzureInstanceSet{}
+       ap := AzureInstanceSet{logger: logger}
        err = ap.setup(azcfg, string(dispatcherID))
        if err != nil {
                return nil, err
@@ -273,9 +274,9 @@ func (az *AzureInstanceSet) setup(azcfg AzureInstanceSetConfig, dispatcherID str
                                }
                                _, delerr := az.netClient.Delete(context.Background(), az.azconfig.ResourceGroup, nicname)
                                if delerr != nil {
-                                       log.Printf("Error deleting %v: %v", nicname, delerr)
+                                       az.logger.WithError(delerr).Warnf("Error deleting %v", nicname)
                                } else {
-                                       log.Printf("Deleted %v", nicname)
+                                       az.logger.Printf("Deleted NIC %v", nicname)
                                }
                        }
                }()
@@ -287,9 +288,9 @@ func (az *AzureInstanceSet) setup(azcfg AzureInstanceSetConfig, dispatcherID str
                                }
                                err := blob.Delete(nil)
                                if err != nil {
-                                       log.Printf("error deleting %v: %v", blob.Name, err)
+                                       az.logger.WithError(err).Warnf("Error deleting %v", blob.Name)
                                } else {
-                                       log.Printf("Deleted blob %v", blob.Name)
+                                       az.logger.Printf("Deleted blob %v", blob.Name)
                                }
                        }
                }()
@@ -475,7 +476,7 @@ func (az *AzureInstanceSet) ManageNics() (map[string]network.Interface, error) {
        timestamp := time.Now()
        for ; result.NotDone(); err = result.Next() {
                if err != nil {
-                       log.Printf("Error listing nics: %v", err)
+                       az.logger.WithError(err).Warnf("Error listing nics")
                        return interfaces, nil
                }
                if strings.HasPrefix(*result.Value().Name, az.namePrefix) {
@@ -486,7 +487,7 @@ func (az *AzureInstanceSet) ManageNics() (map[string]network.Interface, error) {
                                        created_at, err := time.Parse(time.RFC3339Nano, *result.Value().Tags["created-at"])
                                        if err == nil {
                                                if timestamp.Sub(created_at).Seconds() > az.azconfig.DeleteDanglingResourcesAfter {
-                                                       log.Printf("Will delete %v because it is older than %v s", *result.Value().Name, az.azconfig.DeleteDanglingResourcesAfter)
+                                                       az.logger.Printf("Will delete %v because it is older than %v s", *result.Value().Name, az.azconfig.DeleteDanglingResourcesAfter)
                                                        az.deleteNIC <- *result.Value().Name
                                                }
                                        }
@@ -508,14 +509,14 @@ func (az *AzureInstanceSet) ManageBlobs() {
 
        result, err := az.storageAcctClient.ListKeys(az.ctx, az.azconfig.ResourceGroup, az.azconfig.StorageAccount)
        if err != nil {
-               log.Printf("Couldn't get account keys %v", err)
+               az.logger.WithError(err).Warn("Couldn't get account keys")
                return
        }
 
        key1 := *(*result.Keys)[0].Value
        client, err := storage.NewBasicClientOnSovereignCloud(az.azconfig.StorageAccount, key1, az.azureEnv)
        if err != nil {
-               log.Printf("Couldn't make client %v", err)
+               az.logger.WithError(err).Warn("Couldn't make client")
                return
        }
 
@@ -528,7 +529,7 @@ func (az *AzureInstanceSet) ManageBlobs() {
        for {
                response, err := blobcont.ListBlobs(page)
                if err != nil {
-                       log.Printf("Error listing blobs %v", err)
+                       az.logger.WithError(err).Warn("Error listing blobs")
                        return
                }
                for _, b := range response.Blobs {
@@ -538,7 +539,7 @@ func (az *AzureInstanceSet) ManageBlobs() {
                                b.Properties.LeaseStatus == "unlocked" &&
                                age.Seconds() > az.azconfig.DeleteDanglingResourcesAfter {
 
-                               log.Printf("Blob %v is unlocked and not modified for %v seconds, will delete", b.Name, age.Seconds())
+                               az.logger.Printf("Blob %v is unlocked and not modified for %v seconds, will delete", b.Name, age.Seconds())
                                az.deleteBlob <- b
                        }
                }

diff --git a/lib/cloud/interfaces.go b/lib/cloud/interfaces.go
index e3a072582beb32fe59e4f40335186fd0706c45a9..969a4bc2ddeb4b6389bf80912f9826009a56400c 100644 (file)
--- a/lib/cloud/interfaces.go
+++ b/lib/cloud/interfaces.go
@@ -9,6 +9,7 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "github.com/sirupsen/logrus"
        "golang.org/x/crypto/ssh"
 )
 
@@ -163,17 +164,17 @@ type InstanceSet interface {
 //
 //     var _ = registerCloudDriver("example", &exampleDriver{})
 type Driver interface {
-       InstanceSet(config map[string]interface{}, id InstanceSetID) (InstanceSet, error)
+       InstanceSet(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error)
 }
 
 // DriverFunc makes a Driver using the provided function as its
 // InstanceSet method. This is similar to http.HandlerFunc.
-func DriverFunc(fn func(config map[string]interface{}, id InstanceSetID) (InstanceSet, error)) Driver {
+func DriverFunc(fn func(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error)) Driver {
        return driverFunc(fn)
 }
 
-type driverFunc func(config map[string]interface{}, id InstanceSetID) (InstanceSet, error)
+type driverFunc func(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error)
 
-func (df driverFunc) InstanceSet(config map[string]interface{}, id InstanceSetID) (InstanceSet, error) {
-       return df(config, id)
+func (df driverFunc) InstanceSet(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error) {
+       return df(config, id, logger)
 }

diff --git a/lib/controller/federation_test.go b/lib/controller/federation_test.go
index db39029bed532919c6efab0c357df4545d08f21a..c935e20be6b29d90577640d643d74c73fa75c84e 100644 (file)
--- a/lib/controller/federation_test.go
+++ b/lib/controller/federation_test.go
@@ -21,7 +21,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/lib/controller/server_test.go b/lib/controller/server_test.go
index 7742cf4eae6979c6daefb30afd32601b3ce637c0..95f17e79e6d8370e8c211f928264dff9869189c2 100644 (file)
--- a/lib/controller/server_test.go
+++ b/lib/controller/server_test.go
@@ -12,7 +12,7 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/lib/dispatchcloud/container/queue.go b/lib/dispatchcloud/container/queue.go
index 432f4d4884a27f1d9e3ba6df15c0c3a1e4cd954d..965407e518a1aaf16444d2b3ce6f84af90be3b30 100644 (file)
--- a/lib/dispatchcloud/container/queue.go
+++ b/lib/dispatchcloud/container/queue.go
@@ -10,8 +10,8 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
        "github.com/prometheus/client_golang/prometheus"
+       "github.com/sirupsen/logrus"
 )
 
 type typeChooser func(*arvados.Container) (arvados.InstanceType, error)

diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go
index 81ad0ed3fa2b5924fdf1a55a3603dbfc88827fef..2415094ac00290625794d8204449052ad749ad85 100644 (file)
--- a/lib/dispatchcloud/dispatcher.go
+++ b/lib/dispatchcloud/dispatcher.go
@@ -21,9 +21,9 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/auth"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
-       "github.com/Sirupsen/logrus"
        "github.com/prometheus/client_golang/prometheus"
        "github.com/prometheus/client_golang/prometheus/promhttp"
+       "github.com/sirupsen/logrus"
        "golang.org/x/crypto/ssh"
 )
 
@@ -121,7 +121,7 @@ func (disp *dispatcher) initialize() {
                disp.sshKey = key
        }
 
-       instanceSet, err := newInstanceSet(disp.Cluster, disp.InstanceSetID)
+       instanceSet, err := newInstanceSet(disp.Cluster, disp.InstanceSetID, disp.logger)
        if err != nil {
                disp.logger.Fatalf("error initializing driver: %s", err)
        }

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 33823a828d30c610f749388f42e45c0bb692a1c2..1f94577434c4076fa0eca25cb2432d579631c657 100644 (file)
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -16,7 +16,7 @@ import (
 
        "git.curoverse.com/arvados.git/lib/dispatchcloud/test"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        "golang.org/x/crypto/ssh"
        check "gopkg.in/check.v1"
 )

diff --git a/lib/dispatchcloud/driver.go b/lib/dispatchcloud/driver.go
index 97c1bc773a8e420b8e6abd88c07e63bf20a4ad01..a6e62e05bb1a4cb611d6698812ddc459585f24fe 100644 (file)
--- a/lib/dispatchcloud/driver.go
+++ b/lib/dispatchcloud/driver.go
@@ -9,16 +9,17 @@ import (
 
        "git.curoverse.com/arvados.git/lib/cloud"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "github.com/sirupsen/logrus"
 )
 
 var drivers = map[string]cloud.Driver{
        "azure": cloud.DriverFunc(cloud.NewAzureInstanceSet),
 }
 
-func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID) (cloud.InstanceSet, error) {
+func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID, logger logrus.FieldLogger) (cloud.InstanceSet, error) {
        driver, ok := drivers[cluster.CloudVMs.Driver]
        if !ok {
                return nil, fmt.Errorf("unsupported cloud driver %q", cluster.CloudVMs.Driver)
        }
-       return driver.InstanceSet(cluster.CloudVMs.DriverParameters, setID)
+       return driver.InstanceSet(cluster.CloudVMs.DriverParameters, setID, logger)
 }

diff --git a/lib/dispatchcloud/scheduler/run_queue.go b/lib/dispatchcloud/scheduler/run_queue.go
index ece8e3d989e577692626598d27ba861cdecab35a..8e74caef0d565c81e23a3a148f4f53a379450ac9 100644 (file)
--- a/lib/dispatchcloud/scheduler/run_queue.go
+++ b/lib/dispatchcloud/scheduler/run_queue.go
@@ -10,7 +10,7 @@ import (
        "git.curoverse.com/arvados.git/lib/cloud"
        "git.curoverse.com/arvados.git/lib/dispatchcloud/container"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 func (sch *Scheduler) runQueue() {

diff --git a/lib/dispatchcloud/scheduler/run_queue_test.go b/lib/dispatchcloud/scheduler/run_queue_test.go
index be13e1c345b3893db242ee662ffc4c819c346ef4..8945f88a14385af1961f080f0e05601a994badeb 100644 (file)
--- a/lib/dispatchcloud/scheduler/run_queue_test.go
+++ b/lib/dispatchcloud/scheduler/run_queue_test.go
@@ -11,7 +11,7 @@ import (
        "git.curoverse.com/arvados.git/lib/dispatchcloud/test"
        "git.curoverse.com/arvados.git/lib/dispatchcloud/worker"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/lib/dispatchcloud/scheduler/scheduler.go b/lib/dispatchcloud/scheduler/scheduler.go
index 3971a5319d72135ca82d7f899a432ef8601fe677..83fc08a9ffdb28c285965ca7a3f6cd41aba4dd7d 100644 (file)
--- a/lib/dispatchcloud/scheduler/scheduler.go
+++ b/lib/dispatchcloud/scheduler/scheduler.go
@@ -10,7 +10,7 @@ import (
        "sync"
        "time"
 
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 // A Scheduler maps queued containers onto unallocated workers in

diff --git a/lib/dispatchcloud/scheduler/sync.go b/lib/dispatchcloud/scheduler/sync.go
index 4c55b3c0d8564a03535f476319ad0f13ededd0a0..47c754e243dab20ae127cd8741c9decb9eea9688 100644 (file)
--- a/lib/dispatchcloud/scheduler/sync.go
+++ b/lib/dispatchcloud/scheduler/sync.go
@@ -10,7 +10,7 @@ import (
 
        "git.curoverse.com/arvados.git/lib/dispatchcloud/container"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 // sync resolves discrepancies between the queue and the pool:

diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go
index 8bdfaa947dfb2b9dcb0185dbe8eb2ab19a601bf3..3c23457c95a00a97859023802fa9705d6f98e4a6 100644 (file)
--- a/lib/dispatchcloud/test/stub_driver.go
+++ b/lib/dispatchcloud/test/stub_driver.go
@@ -17,8 +17,8 @@ import (
 
        "git.curoverse.com/arvados.git/lib/cloud"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
        "github.com/mitchellh/mapstructure"
+       "github.com/sirupsen/logrus"
        "golang.org/x/crypto/ssh"
 )
 

diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index ff5f762c1d225575f0ad4eeb1b69bb4de463d281..fc3301d8636593cfd79aee008061c9cfafab577a 100644 (file)
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -13,8 +13,8 @@ import (
 
        "git.curoverse.com/arvados.git/lib/cloud"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
        "github.com/prometheus/client_golang/prometheus"
+       "github.com/sirupsen/logrus"
 )
 
 const (

diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index 3867e2c63e4b41b752b96cdbdf1c9a6b86b94159..7551caff9547178338e5ba7c900dadfde2c88184 100644 (file)
--- a/lib/dispatchcloud/worker/pool_test.go
+++ b/lib/dispatchcloud/worker/pool_test.go
@@ -11,7 +11,7 @@ import (
        "git.curoverse.com/arvados.git/lib/cloud"
        "git.curoverse.com/arvados.git/lib/dispatchcloud/test"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/lib/dispatchcloud/worker/worker.go b/lib/dispatchcloud/worker/worker.go
index c26186309ad013f2926ba351eee4e2326595920e..db6bc185b1af2895117046c6bbd9254f25b9ea0a 100644 (file)
--- a/lib/dispatchcloud/worker/worker.go
+++ b/lib/dispatchcloud/worker/worker.go
@@ -12,7 +12,7 @@ import (
 
        "git.curoverse.com/arvados.git/lib/cloud"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 // State indicates whether a worker is available to do work, and (if

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 4584939f7660b3519895fd5a3a2bc3f640cb9746..7f6b0236cb9571cd3ca30420cb6d41af6d787bd3 100644 (file)
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -15,8 +15,8 @@ import (
        "git.curoverse.com/arvados.git/lib/cmd"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
-       "github.com/Sirupsen/logrus"
        "github.com/coreos/go-systemd/daemon"
+       "github.com/sirupsen/logrus"
 )
 
 type Handler interface {

diff --git a/sdk/go/ctxlog/log.go b/sdk/go/ctxlog/log.go
index fa76a4f964a35e8a7aab702f10a19f71bf28d3a4..45e4efdbeff2c5e5e507e92c94c85c8a189d8263 100644 (file)
--- a/sdk/go/ctxlog/log.go
+++ b/sdk/go/ctxlog/log.go
@@ -7,7 +7,7 @@ package ctxlog
 import (
        "context"
 
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/sdk/go/dispatch/dispatch.go b/sdk/go/dispatch/dispatch.go
index c8fb5aeb37e97eb9a43846301e2a07ea63e28ae7..fdb52e510bd34e36ffe7f22b2975fc95bc05bf60 100644 (file)
--- a/sdk/go/dispatch/dispatch.go
+++ b/sdk/go/dispatch/dispatch.go
@@ -14,7 +14,7 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 const (

diff --git a/sdk/go/httpserver/logger.go b/sdk/go/httpserver/logger.go
index 9577718c76e45c1757297d5272c6174f5a454571..357daee269f3784dd650107ef081d689cd3639de 100644 (file)
--- a/sdk/go/httpserver/logger.go
+++ b/sdk/go/httpserver/logger.go
@@ -10,7 +10,7 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/stats"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 type contextKey struct {

diff --git a/sdk/go/httpserver/logger_test.go b/sdk/go/httpserver/logger_test.go
index bdde3303e2f97c35b45e73c1dd207f30e521e13d..8386db9276935c9dbd565ea657357b15302111cb 100644 (file)
--- a/sdk/go/httpserver/logger_test.go
+++ b/sdk/go/httpserver/logger_test.go
@@ -12,7 +12,7 @@ import (
        "testing"
        "time"
 
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/sdk/go/httpserver/metrics.go b/sdk/go/httpserver/metrics.go
index a0455f11b11b19ac2d4c88d87554d9d7c5794d2a..032093f8d8aab842a1a3af194089c1ee9b4980e4 100644 (file)
--- a/sdk/go/httpserver/metrics.go
+++ b/sdk/go/httpserver/metrics.go
@@ -12,10 +12,10 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/auth"
        "git.curoverse.com/arvados.git/sdk/go/stats"
-       "github.com/Sirupsen/logrus"
        "github.com/gogo/protobuf/jsonpb"
        "github.com/prometheus/client_golang/prometheus"
        "github.com/prometheus/client_golang/prometheus/promhttp"
+       "github.com/sirupsen/logrus"
 )
 
 type Handler interface {

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index fc10393626be103c17b01b5b1bfde615ed470bc9..dcd54e8968e930f1cdb390aa9b0e5c40182c3bdb 100644 (file)
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -20,7 +20,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/dispatch"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 var version = "dev"

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index 6da17ea86cc06ccdbce21c37d2b703b1f937fded..6bae1f40997a8a824284390a18c2da8df8568cdb 100644 (file)
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -20,7 +20,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/dispatch"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        . "gopkg.in/check.v1"
 )
 

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 092524d8063b7ea818f99f1fe20f37957c8a2c15..31329c123907f5c47a001148a5d73385b2aec228 100644 (file)
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -23,7 +23,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/config"
        "git.curoverse.com/arvados.git/sdk/go/dispatch"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        "github.com/coreos/go-systemd/daemon"
 )
 

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 10fdb07124cc817cc857f35384ded22ca0193d63..eea102012befe3c09dbb22a21c5b2a5ad532af4e 100644 (file)
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -24,7 +24,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/dispatch"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        . "gopkg.in/check.v1"
 )
 

diff --git a/services/crunch-dispatch-slurm/squeue_test.go b/services/crunch-dispatch-slurm/squeue_test.go
index de674a1397a0fcc24a64d2c417b262e18e9554ae..ce74fe61cc191cb2538fac54d6cd98a15fc69258 100644 (file)
--- a/services/crunch-dispatch-slurm/squeue_test.go
+++ b/services/crunch-dispatch-slurm/squeue_test.go
@@ -7,7 +7,7 @@ package main
 import (
        "time"
 
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        . "gopkg.in/check.v1"
 )
 

diff --git a/services/health/main.go b/services/health/main.go
index 1d2ec47a6af41d39907d62105fcb898e462ff82a..21fcf4d674e1015184f2c87413cb0fbb32a9f0d1 100644 (file)
--- a/services/health/main.go
+++ b/services/health/main.go
@@ -12,7 +12,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/health"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
-       log "github.com/Sirupsen/logrus"
+       log "github.com/sirupsen/logrus"
 )
 
 var version = "dev"

diff --git a/services/keep-balance/balance.go b/services/keep-balance/balance.go
index e1b207805b58a81837eab51c80f8ce5e5e8df186..836be2e6080c3345758a38bbd0953ace6d7a11c0 100644 (file)
--- a/services/keep-balance/balance.go
+++ b/services/keep-balance/balance.go
@@ -18,7 +18,7 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 // Balancer compares the contents of keepstore servers with the

diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go
index f7cb7f92bd71d2ea248c8febbd8978e4c01d0c38..7e2adcfedd4dc33b67ccae5301813cb531f6af9d 100644 (file)
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -16,7 +16,7 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go
index ceffb9cc1f5c7b78874f4cf4bc0d847a8f40d46c..8f5d08a192ff81cb07bd88a90cb29d9a74f73c76 100644 (file)
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -15,7 +15,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index e3e90d3581517c0ae8831f76be2881aaa0f1a44c..3316a17240cddd69c37aa804e9bd5e2dbf610def 100644 (file)
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -15,7 +15,7 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/config"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 var debugf = func(string, ...interface{}) {}

diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go
index ad13be7511d55de4f334e23f4838f6886fa91694..613a2f7d3c3da2e6c466ec8ac9345a9e2e70775e 100644 (file)
--- a/services/keep-balance/server.go
+++ b/services/keep-balance/server.go
@@ -15,7 +15,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/auth"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 var version = "dev"

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 6a7dc5dbacb7840cc759bb1447803b8d56aed726..b5c11e553c115c872d5ded605e0ad3b54956d406 100644 (file)
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -25,7 +25,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/health"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
-       log "github.com/Sirupsen/logrus"
+       log "github.com/sirupsen/logrus"
        "golang.org/x/net/webdav"
 )
 

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index d09fce706c4a50033649b32df152afa30ab85dc6..fd63535691318368b880d320fee9f74b51d7762a 100644 (file)
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -12,7 +12,7 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/config"
-       log "github.com/Sirupsen/logrus"
+       log "github.com/sirupsen/logrus"
        "github.com/coreos/go-systemd/daemon"
 )
 

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index b6c8bd66aa40f026051ba8b4885ce562fb580721..def97e6e003a9b1d86ed94ea50f48e343cc8b6a7 100644 (file)
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -26,7 +26,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/health"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
-       log "github.com/Sirupsen/logrus"
+       log "github.com/sirupsen/logrus"
        "github.com/coreos/go-systemd/daemon"
        "github.com/ghodss/yaml"
        "github.com/gorilla/mux"

diff --git a/services/keepstore/config.go b/services/keepstore/config.go
index 2e3fe0a5b130fe5259550b450dea2bf0237cd295..2bd989de30c1bffc020777ba1ecbb895591570cf 100644 (file)
--- a/services/keepstore/config.go
+++ b/services/keepstore/config.go
@@ -13,7 +13,7 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 type Config struct {

diff --git a/services/keepstore/config_test.go b/services/keepstore/config_test.go
index d6471e3d4547d45f577131c0a6ecb2f1ca59c52c..e3b0ffc22afc8c51702bf4fddc19b1d3d8c2e65b 100644 (file)
--- a/services/keepstore/config_test.go
+++ b/services/keepstore/config_test.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 func init() {

diff --git a/services/ws/router.go b/services/ws/router.go
index 987c225eac8ba5a456aa0c2af2e7f56eede749be..a408b58bddf31b5483f799c779823cdfcd98902d 100644 (file)
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -15,7 +15,7 @@ import (
 
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        "git.curoverse.com/arvados.git/sdk/go/health"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
        "golang.org/x/net/websocket"
 )
 

diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index b57abb5cac31b0d563528669514e3bdcee151327..7bd1498158304ea3ab8a969c0c90129241ab1028 100644 (file)
--- a/services/ws/session_v0.go
+++ b/services/ws/session_v0.go
@@ -14,7 +14,7 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/vendor/vendor.json b/vendor/vendor.json
index 6bf8c016d1137e35e777ef79634fd109650cdadd..ec5fa21e2a61b6e5d462246e898d7257a22f9d66 100644 (file)
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -113,12 +113,6 @@
                        "revision": "78439966b38d69bf38227fbf57ac8a6fee70f69a",
                        "revisionTime": "2017-08-04T20:09:54Z"
                },
-               {
-                       "checksumSHA1": "CWLxwFSj7MNed2MzAOSm0Cg9p+o=",
-                       "path": "github.com/Sirupsen/logrus",
-                       "revision": "d682213848ed68c0a260ca37d6dd5ace8423f5ba",
-                       "revisionTime": "2017-12-05T20:32:29Z"
-               },
                {
                        "checksumSHA1": "spyv5/YFBjYyZLZa1U2LBfDR8PM=",
                        "path": "github.com/beorn7/perks/quantile",
@@ -498,6 +492,12 @@
                        "revision": "1744e2970ca51c86172c8190fadad617561ed6e7",
                        "revisionTime": "2017-11-10T11:01:46Z"
                },
+               {
+                       "checksumSHA1": "ySaT8G3I3y4MmnoXOYAAX0rC+p8=",
+                       "path": "github.com/sirupsen/logrus",
+                       "revision": "d682213848ed68c0a260ca37d6dd5ace8423f5ba",
+                       "revisionTime": "2017-12-05T20:32:29Z"
+               },
                {
                        "checksumSHA1": "8QeSG127zQqbA+YfkO1WkKx/iUI=",
                        "path": "github.com/src-d/gcfg",