From 9cf216e937114541627d1fd7854aff6b0db8fb0b Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 10 Feb 2019 21:39:17 -0800 Subject: [PATCH] Upgrade Sirupsen/logrus v0.10.0 to sirupsen v1.3.0 * Upstream author changed case of his/her username (breaking) * Fix to lowercase name so clients using Go modules can avoid case-sensitive conflicts. Go modules do not handle this real-world case well --- cmd/matchbox/main.go | 4 ++-- glide.yaml | 4 ++-- matchbox/http/cloud.go | 2 +- matchbox/http/cloud_test.go | 2 +- matchbox/http/generic.go | 2 +- matchbox/http/generic_test.go | 2 +- matchbox/http/grub.go | 2 +- matchbox/http/grub_test.go | 2 +- matchbox/http/handlers_test.go | 2 +- matchbox/http/ignition.go | 2 +- matchbox/http/ignition_test.go | 2 +- matchbox/http/ipxe.go | 2 +- matchbox/http/ipxe_test.go | 2 +- matchbox/http/metadata.go | 2 +- matchbox/http/metadata_test.go | 2 +- matchbox/http/parse.go | 2 +- matchbox/http/parse_test.go | 2 +- matchbox/http/render_test.go | 2 +- matchbox/http/server.go | 2 +- matchbox/storage/filestore.go | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/matchbox/main.go b/cmd/matchbox/main.go index 74f0ca20..aba2bad0 100644 --- a/cmd/matchbox/main.go +++ b/cmd/matchbox/main.go @@ -7,7 +7,6 @@ import ( "net/http" "os" - "github.com/Sirupsen/logrus" web "github.com/coreos/matchbox/matchbox/http" "github.com/coreos/matchbox/matchbox/rpc" "github.com/coreos/matchbox/matchbox/server" @@ -16,6 +15,7 @@ import ( "github.com/coreos/matchbox/matchbox/tlsutil" "github.com/coreos/matchbox/matchbox/version" "github.com/coreos/pkg/flagutil" + "github.com/sirupsen/logrus" ) var ( @@ -45,7 +45,7 @@ func main() { flag.StringVar(&flags.dataPath, "data-path", "/var/lib/matchbox", "Path to data directory") flag.StringVar(&flags.assetsPath, "assets-path", "/var/lib/matchbox/assets", "Path to static assets") - // Log levels https://github.com/Sirupsen/logrus/blob/master/logrus.go#L36 + // Log levels https://github.com/sirupsen/logrus/blob/master/logrus.go#L36 flag.StringVar(&flags.logLevel, "log-level", "info", "Set the logging level") // gRPC Server TLS diff --git a/glide.yaml b/glide.yaml index 00dc6acb..ba938e41 100644 --- a/glide.yaml +++ b/glide.yaml @@ -52,8 +52,8 @@ import: version: 66fe44ad037ccb80329115cb4db0dbe8e9beb03a subpackages: - flagutil -- package: github.com/Sirupsen/logrus - version: v0.10.0 +- package: github.com/sirupsen/logrus + version: v1.3.0 subpackages: - hooks/test - package: github.com/spf13/cobra diff --git a/matchbox/http/cloud.go b/matchbox/http/cloud.go index d7257cba..60a7fc48 100644 --- a/matchbox/http/cloud.go +++ b/matchbox/http/cloud.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/Sirupsen/logrus" cloudinit "github.com/coreos/coreos-cloudinit/config" + "github.com/sirupsen/logrus" "github.com/coreos/matchbox/matchbox/server" pb "github.com/coreos/matchbox/matchbox/server/serverpb" diff --git a/matchbox/http/cloud_test.go b/matchbox/http/cloud_test.go index f429bed7..f37e4be1 100644 --- a/matchbox/http/cloud_test.go +++ b/matchbox/http/cloud_test.go @@ -6,7 +6,7 @@ import ( "testing" "context" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/coreos/matchbox/matchbox/server" diff --git a/matchbox/http/generic.go b/matchbox/http/generic.go index a71d23f2..748dfb37 100644 --- a/matchbox/http/generic.go +++ b/matchbox/http/generic.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/coreos/matchbox/matchbox/server" pb "github.com/coreos/matchbox/matchbox/server/serverpb" diff --git a/matchbox/http/generic_test.go b/matchbox/http/generic_test.go index 3dab3e54..8672b2f8 100644 --- a/matchbox/http/generic_test.go +++ b/matchbox/http/generic_test.go @@ -6,7 +6,7 @@ import ( "testing" "context" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/coreos/matchbox/matchbox/server" diff --git a/matchbox/http/grub.go b/matchbox/http/grub.go index 8d2b5cd5..263c7f1c 100644 --- a/matchbox/http/grub.go +++ b/matchbox/http/grub.go @@ -5,7 +5,7 @@ import ( "net/http" "text/template" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var grubTemplate = template.Must(template.New("GRUB2 config").Parse(`default=0 diff --git a/matchbox/http/grub_test.go b/matchbox/http/grub_test.go index 83474669..d9d41662 100644 --- a/matchbox/http/grub_test.go +++ b/matchbox/http/grub_test.go @@ -6,7 +6,7 @@ import ( "testing" "context" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" fake "github.com/coreos/matchbox/matchbox/storage/testfakes" diff --git a/matchbox/http/handlers_test.go b/matchbox/http/handlers_test.go index ddd031bb..3c76a41d 100644 --- a/matchbox/http/handlers_test.go +++ b/matchbox/http/handlers_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/coreos/matchbox/matchbox/server" diff --git a/matchbox/http/ignition.go b/matchbox/http/ignition.go index 81eecf92..ee9ae722 100644 --- a/matchbox/http/ignition.go +++ b/matchbox/http/ignition.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/Sirupsen/logrus" ct "github.com/coreos/container-linux-config-transpiler/config" ignition "github.com/coreos/ignition/config" + "github.com/sirupsen/logrus" "github.com/coreos/matchbox/matchbox/server" pb "github.com/coreos/matchbox/matchbox/server/serverpb" diff --git a/matchbox/http/ignition_test.go b/matchbox/http/ignition_test.go index 5bd6004a..9abdeead 100644 --- a/matchbox/http/ignition_test.go +++ b/matchbox/http/ignition_test.go @@ -6,7 +6,7 @@ import ( "testing" "context" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/coreos/matchbox/matchbox/server" diff --git a/matchbox/http/ipxe.go b/matchbox/http/ipxe.go index 857f6880..f865d31b 100644 --- a/matchbox/http/ipxe.go +++ b/matchbox/http/ipxe.go @@ -6,7 +6,7 @@ import ( "net/http" "text/template" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) const ipxeBootstrap = `#!ipxe diff --git a/matchbox/http/ipxe_test.go b/matchbox/http/ipxe_test.go index 91e2ad10..ef5edd18 100644 --- a/matchbox/http/ipxe_test.go +++ b/matchbox/http/ipxe_test.go @@ -6,7 +6,7 @@ import ( "testing" "context" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/coreos/matchbox/matchbox/storage/storagepb" diff --git a/matchbox/http/metadata.go b/matchbox/http/metadata.go index a76c0311..1765e567 100644 --- a/matchbox/http/metadata.go +++ b/matchbox/http/metadata.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) const plainContentType = "plain/text" diff --git a/matchbox/http/metadata_test.go b/matchbox/http/metadata_test.go index 4c80f684..ec12f70f 100644 --- a/matchbox/http/metadata_test.go +++ b/matchbox/http/metadata_test.go @@ -8,7 +8,7 @@ import ( "testing" "context" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/coreos/matchbox/matchbox/storage/storagepb" diff --git a/matchbox/http/parse.go b/matchbox/http/parse.go index fee35096..4a152869 100644 --- a/matchbox/http/parse.go +++ b/matchbox/http/parse.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/coreos/matchbox/matchbox/storage/storagepb" ) diff --git a/matchbox/http/parse_test.go b/matchbox/http/parse_test.go index ab9e8842..6e9e74b9 100644 --- a/matchbox/http/parse_test.go +++ b/matchbox/http/parse_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" ) diff --git a/matchbox/http/render_test.go b/matchbox/http/render_test.go index ed8709cc..a526dcf9 100644 --- a/matchbox/http/render_test.go +++ b/matchbox/http/render_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - logtest "github.com/Sirupsen/logrus/hooks/test" + logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" ) diff --git a/matchbox/http/server.go b/matchbox/http/server.go index 4276d3ee..44edac31 100644 --- a/matchbox/http/server.go +++ b/matchbox/http/server.go @@ -3,7 +3,7 @@ package http import ( "net/http" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/coreos/matchbox/matchbox/server" "github.com/coreos/matchbox/matchbox/sign" diff --git a/matchbox/storage/filestore.go b/matchbox/storage/filestore.go index 36ffa79e..1fc4d4e7 100644 --- a/matchbox/storage/filestore.go +++ b/matchbox/storage/filestore.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/Sirupsen/logrus" "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/sirupsen/logrus" ) // Config initializes a fileStore.