treewide: Tidy up remaining imports

Signed-off-by: Tom Payne <tom@isovalent.com>
gazandic · Jan 6, 2022 · 8e25d64 · 8e25d64
1 parent 20d19f3
commit 8e25d64
Show file tree

Hide file tree

Showing 624 changed files with 1,789 additions and 1,812 deletions.
diff --git a/bugtool/cmd/root.go b/bugtool/cmd/root.go
@@ -18,11 +18,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cilium/cilium/pkg/components"
-	"github.com/cilium/cilium/pkg/defaults"
-
 	"github.com/cilium/workerpool"
 	"github.com/spf13/cobra"
+
+	"github.com/cilium/cilium/pkg/components"
+	"github.com/cilium/cilium/pkg/defaults"
 )
 
 // BugtoolRootCmd is the top level command for the bugtool.

diff --git a/cilium-health/cmd/get.go b/cilium-health/cmd/get.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"text/tabwriter"
 
+	"github.com/spf13/cobra"
+
 	ciliumClient "github.com/cilium/cilium/pkg/client"
 	"github.com/cilium/cilium/pkg/command"
-
-	"github.com/spf13/cobra"
 )
 
 // healthGetCmd represents the get command

diff --git a/cilium-health/cmd/root.go b/cilium-health/cmd/root.go
@@ -8,15 +8,15 @@ import (
 	"os"
 	"strings"
 
-	clientPkg "github.com/cilium/cilium/pkg/health/client"
-	"github.com/cilium/cilium/pkg/logging"
-	"github.com/cilium/cilium/pkg/logging/logfields"
-	"github.com/cilium/cilium/pkg/option"
-
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 	"github.com/spf13/viper"
+
+	clientPkg "github.com/cilium/cilium/pkg/health/client"
+	"github.com/cilium/cilium/pkg/logging"
+	"github.com/cilium/cilium/pkg/logging/logfields"
+	"github.com/cilium/cilium/pkg/option"
 )
 
 const targetName = "cilium-health"

diff --git a/cilium-health/cmd/status.go b/cilium-health/cmd/status.go
@@ -7,11 +7,11 @@ import (
 	"os"
 	"text/tabwriter"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/api/v1/health/models"
 	"github.com/cilium/cilium/pkg/command"
 	clientPkg "github.com/cilium/cilium/pkg/health/client"
-
-	"github.com/spf13/cobra"
 )
 
 var (

diff --git a/cilium-health/launch/endpoint.go b/cilium-health/launch/endpoint.go
@@ -14,6 +14,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containernetworking/plugins/pkg/ns"
+	"github.com/vishvananda/netlink"
+
 	"github.com/cilium/cilium/api/v1/models"
 	"github.com/cilium/cilium/pkg/datapath/connector"
 	"github.com/cilium/cilium/pkg/datapath/linux/route"
@@ -36,9 +39,6 @@ import (
 	"github.com/cilium/cilium/pkg/pidfile"
 	"github.com/cilium/cilium/pkg/policy"
 	"github.com/cilium/cilium/pkg/sysctl"
-
-	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/vishvananda/netlink"
 )
 
 const (

diff --git a/cilium-health/responder/main.go b/cilium-health/responder/main.go
@@ -14,12 +14,12 @@ import (
 	"os"
 	"os/signal"
 
+	flag "github.com/spf13/pflag"
+	"golang.org/x/sys/unix"
+
 	healthDefaults "github.com/cilium/cilium/pkg/health/defaults"
 	"github.com/cilium/cilium/pkg/health/probe/responder"
 	"github.com/cilium/cilium/pkg/pidfile"
-
-	flag "github.com/spf13/pflag"
-	"golang.org/x/sys/unix"
 )
 
 func main() {

diff --git a/cilium/cmd/bpf_bandwidth_list.go b/cilium/cmd/bpf_bandwidth_list.go
@@ -11,13 +11,12 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/api/resource"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/bwmap"
-
-	"github.com/spf13/cobra"
-
-	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 var bpfBandwidthListCmd = &cobra.Command{

diff --git a/cilium/cmd/bpf_ct_flush.go b/cilium/cmd/bpf_ct_flush.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/ctmap"
-
-	"github.com/spf13/cobra"
 )
 
 // bpfCtFlushCmd represents the bpf_ct_flush command

diff --git a/cilium/cmd/bpf_ct_list.go b/cilium/cmd/bpf_ct_list.go
@@ -10,14 +10,14 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/api/v1/client/daemon"
 	"github.com/cilium/cilium/api/v1/models"
 	"github.com/cilium/cilium/pkg/bpf"
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/ctmap"
-
-	"github.com/spf13/cobra"
 )
 
 // bpfCtListCmd represents the bpf_ct_list command

diff --git a/cilium/cmd/bpf_ct_list_test.go b/cilium/cmd/bpf_ct_list_test.go
@@ -13,15 +13,15 @@ import (
 	"os"
 	"testing"
 
+	. "gopkg.in/check.v1"
+
 	"github.com/cilium/cilium/pkg/byteorder"
 	"github.com/cilium/cilium/pkg/checker"
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/maps/ctmap"
 	"github.com/cilium/cilium/pkg/testutils/mockmaps"
 	"github.com/cilium/cilium/pkg/tuple"
 	"github.com/cilium/cilium/pkg/types"
-
-	. "gopkg.in/check.v1"
 )
 
 func Test(t *testing.T) { TestingT(t) }

diff --git a/cilium/cmd/bpf_egress_delete.go b/cilium/cmd/bpf_egress_delete.go
@@ -6,10 +6,10 @@ package cmd
 import (
 	"net"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/egressmap"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_egress_get.go b/cilium/cmd/bpf_egress_get.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/egressmap"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_egress_list.go b/cilium/cmd/bpf_egress_list.go
@@ -10,11 +10,11 @@ import (
 	"os"
 	"text/tabwriter"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/egressmap"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_egress_update.go b/cilium/cmd/bpf_egress_update.go
@@ -8,10 +8,10 @@ import (
 	"net"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/egressmap"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_endpoint_delete.go b/cilium/cmd/bpf_endpoint_delete.go
@@ -6,10 +6,10 @@ package cmd
 import (
 	"net"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/lxcmap"
-
-	"github.com/spf13/cobra"
 )
 
 var bpfEndpointDeleteCmd = &cobra.Command{

diff --git a/cilium/cmd/bpf_endpoint_list.go b/cilium/cmd/bpf_endpoint_list.go
@@ -6,11 +6,11 @@ package cmd
 import (
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/lxcmap"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_ipcache_get.go b/cilium/cmd/bpf_ipcache_get.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/cilium/cilium/pkg/common"
-	"github.com/cilium/cilium/pkg/maps/ipcache"
-
 	iradix "github.com/hashicorp/go-immutable-radix"
 	"github.com/spf13/cobra"
+
+	"github.com/cilium/cilium/pkg/common"
+	"github.com/cilium/cilium/pkg/maps/ipcache"
 )
 
 const usage = "IP address must be in dotted decimal (192.168.1.1) or IPv6 (feab::f02b) form"

diff --git a/cilium/cmd/bpf_ipcache_get_test.go b/cilium/cmd/bpf_ipcache_get_test.go
@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/cilium/cilium/pkg/checker"
-
 	. "gopkg.in/check.v1"
+
+	"github.com/cilium/cilium/pkg/checker"
 )
 
 type BPFIPCacheGetSuite struct{}

diff --git a/cilium/cmd/bpf_ipcache_list.go b/cilium/cmd/bpf_ipcache_list.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/ipcache"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_ipmasq_list.go b/cilium/cmd/bpf_ipmasq_list.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/ipmasq"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_lb_list.go b/cilium/cmd/bpf_lb_list.go
@@ -6,13 +6,13 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/bpf"
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/loadbalancer"
 	"github.com/cilium/cilium/pkg/maps/lbmap"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_lb_maglev_get.go b/cilium/cmd/bpf_lb_maglev_get.go
@@ -7,12 +7,12 @@ import (
 	"errors"
 	"strconv"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/ebpf"
 	"github.com/cilium/cilium/pkg/maps/lbmap"
-
-	"github.com/spf13/cobra"
 )
 
 var bpfMaglevGetCmd = &cobra.Command{

diff --git a/cilium/cmd/bpf_metrics_list.go b/cilium/cmd/bpf_metrics_list.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/metricsmap"
 	monitorAPI "github.com/cilium/cilium/pkg/monitor/api"
-
-	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cilium/cmd/bpf_metrics_list_test.go b/cilium/cmd/bpf_metrics_list_test.go
@@ -11,12 +11,12 @@ import (
 	"sort"
 	"strings"
 
+	. "gopkg.in/check.v1"
+
 	"github.com/cilium/cilium/pkg/checker"
 	"github.com/cilium/cilium/pkg/maps/metricsmap"
 	monitorAPI "github.com/cilium/cilium/pkg/monitor/api"
 	"github.com/cilium/cilium/pkg/testutils/mockmaps"
-
-	. "gopkg.in/check.v1"
 )
 
 type BPFMetricsMapSuite struct{}

diff --git a/cilium/cmd/bpf_mountfs_show.go b/cilium/cmd/bpf_mountfs_show.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"text/tabwriter"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/command"
 	"github.com/cilium/cilium/pkg/mountinfo"
-
-	"github.com/spf13/cobra"
 )
 
 // bpfmountfsShowCmd represents the bpf file system show command

diff --git a/cilium/cmd/bpf_nat_flush.go b/cilium/cmd/bpf_nat_flush.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cilium/cilium/pkg/common"
 	"github.com/cilium/cilium/pkg/maps/nat"
-
-	"github.com/spf13/cobra"
 )
 
 // bpfNatFlushCmd represents the bpf_nat_flush command