Merge pull request #484 from mgleung/update_pkg

Updated the import for logrus to use lowercasing
projectcalico · Jul 31, 2017 · 93f9e49 · 93f9e49
2 parents 73b7a64 + f43a1fd
commit 93f9e49
Show file tree

Hide file tree

Showing 52 changed files with 74 additions and 60 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -5,7 +5,7 @@ owners:
 - name: Rob Brockbank
   email: [email protected]
 import:
-- package: github.com/Sirupsen/logrus
+- package: github.com/sirupsen/logrus
   version: ^0.10.0
 - package: github.com/coreos/etcd
   subpackages:

diff --git a/lib/backend/client.go b/lib/backend/client.go
@@ -18,12 +18,12 @@ import (
 	"errors"
 	"fmt"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/api"
 	bapi "github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/compat"
 	"github.com/projectcalico/libcalico-go/lib/backend/etcd"
 	"github.com/projectcalico/libcalico-go/lib/backend/k8s"
+	log "github.com/sirupsen/logrus"
 )
 
 // NewClient creates a new backend datastore client.

diff --git a/lib/backend/compat/compat.go b/lib/backend/compat/compat.go
@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	goerrors "errors"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"

diff --git a/lib/backend/etcd/etcd.go b/lib/backend/etcd/etcd.go
@@ -20,13 +20,13 @@ import (
 
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/pkg/transport"
 	capi "github.com/projectcalico/libcalico-go/lib/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 )
 

diff --git a/lib/backend/etcd/syncer.go b/lib/backend/etcd/syncer.go
@@ -21,12 +21,12 @@ import (
 
 	"net"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/coreos/etcd/client"
 	etcd "github.com/coreos/etcd/client"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/hwm"
+	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 )
 

diff --git a/lib/backend/k8s/conversion.go b/lib/backend/k8s/conversion.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	kapiv1 "k8s.io/client-go/pkg/api/v1"

diff --git a/lib/backend/k8s/k8s.go b/lib/backend/k8s/k8s.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	capi "github.com/projectcalico/libcalico-go/lib/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"

diff --git a/lib/backend/k8s/k8s_fv_test.go b/lib/backend/k8s/k8s_fv_test.go
@@ -22,7 +22,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	capi "github.com/projectcalico/libcalico-go/lib/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"

diff --git a/lib/backend/k8s/resources/customnoderesource.go b/lib/backend/k8s/resources/customnoderesource.go
@@ -21,7 +21,7 @@ import (
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/lib/backend/k8s/resources/customresource.go b/lib/backend/k8s/resources/customresource.go
@@ -17,9 +17,9 @@ package resources
 import (
 	"reflect"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/lib/backend/k8s/resources/names.go b/lib/backend/k8s/resources/names.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/projectcalico/libcalico-go/lib/net"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 // This file contains various name conversion methods that can be used to convert

diff --git a/lib/backend/k8s/resources/node.go b/lib/backend/k8s/resources/node.go
@@ -15,7 +15,7 @@
 package resources
 
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/errors"
@@ -27,7 +27,7 @@ import (
 
 const (
 	nodeBgpIpv4CidrAnnotation = "projectcalico.org/IPv4Address"
-	nodeBgpAsnAnnotation = "projectcalico.org/ASNumber"
+	nodeBgpAsnAnnotation      = "projectcalico.org/ASNumber"
 )
 
 func NewNodeClient(c *kubernetes.Clientset, r *rest.RESTClient) K8sResourceClient {

diff --git a/lib/backend/k8s/resources/retrywrapper.go b/lib/backend/k8s/resources/retrywrapper.go
@@ -17,7 +17,7 @@ package resources
 import (
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 const (

diff --git a/lib/backend/k8s/syncer.go b/lib/backend/k8s/syncer.go
@@ -17,11 +17,11 @@ package k8s
 import (
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/compat"
 	"github.com/projectcalico/libcalico-go/lib/backend/k8s/resources"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
+	log "github.com/sirupsen/logrus"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"

diff --git a/lib/backend/k8s/syncer_test.go b/lib/backend/k8s/syncer_test.go
@@ -17,12 +17,12 @@ package k8s
 import (
 	"sync"
 
-	log "github.com/Sirupsen/logrus"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/net"
+	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
 	k8sapi "k8s.io/client-go/pkg/api/v1"

diff --git a/lib/backend/model/bgpconfig.go b/lib/backend/model/bgpconfig.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"regexp"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/projectcalico/libcalico-go/lib/errors"
 )

diff --git a/lib/backend/model/bgppeer.go b/lib/backend/model/bgppeer.go
@@ -20,10 +20,10 @@ import (
 
 	"reflect"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 	"github.com/projectcalico/libcalico-go/lib/net"
 	"github.com/projectcalico/libcalico-go/lib/numorstring"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/block.go b/lib/backend/model/block.go
@@ -20,9 +20,9 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 	"github.com/projectcalico/libcalico-go/lib/net"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/block_affinity.go b/lib/backend/model/block_affinity.go
@@ -20,9 +20,9 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 	"github.com/projectcalico/libcalico-go/lib/net"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/felixconfig.go b/lib/backend/model/felixconfig.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"regexp"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/projectcalico/libcalico-go/lib/errors"
 )

diff --git a/lib/backend/model/hostendpoint.go b/lib/backend/model/hostendpoint.go
@@ -21,9 +21,9 @@ import (
 
 	"reflect"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 	"github.com/projectcalico/libcalico-go/lib/net"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/hostendpointstatus.go b/lib/backend/model/hostendpointstatus.go
@@ -21,8 +21,8 @@ import (
 
 	"reflect"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/ipam_handle.go b/lib/backend/model/ipam_handle.go
@@ -19,8 +19,8 @@ import (
 	"reflect"
 	"regexp"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/ippool.go b/lib/backend/model/ippool.go
@@ -21,10 +21,10 @@ import (
 
 	"reflect"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 	"github.com/projectcalico/libcalico-go/lib/ipip"
 	"github.com/projectcalico/libcalico-go/lib/net"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/keys.go b/lib/backend/model/keys.go
@@ -23,8 +23,8 @@ import (
 	net2 "net"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/net"
+	log "github.com/sirupsen/logrus"
 )
 
 // RawString is used a value type to indicate that the value is a bare non-JSON string

diff --git a/lib/backend/model/node.go b/lib/backend/model/node.go
@@ -21,10 +21,10 @@ import (
 
 	"reflect"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
 	"github.com/projectcalico/libcalico-go/lib/net"
 	"github.com/projectcalico/libcalico-go/lib/numorstring"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/policy.go b/lib/backend/model/policy.go
@@ -22,8 +22,8 @@ import (
 
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/profile.go b/lib/backend/model/profile.go
@@ -22,8 +22,8 @@ import (
 
 	"sort"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

diff --git a/lib/backend/model/statusreports.go b/lib/backend/model/statusreports.go
@@ -19,8 +19,8 @@ import (
 	"reflect"
 	"regexp"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,8 +22,8 @@ import ( @@
     	"sort"
-    	log "github.com/Sirupsen/logrus"
     	"github.com/projectcalico/libcalico-go/lib/errors"
+    	log "github.com/sirupsen/logrus"
     )
     var (
@@ Expand Down @@