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

@@ -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

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

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"

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"

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"

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"

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

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"

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"

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"

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"

matchbox/http/ipxe.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"text/template"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 const ipxeBootstrap = `#!ipxe

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"

matchbox/http/metadata.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 const plainContentType = "plain/text"

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"

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"
 )

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"
 )
 

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"
 )
 

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"

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.