Run goimports on code base

cloudflare · Feb 4, 2020 · 9b6b9ea · 9b6b9ea
1 parent 80bcf9c
commit 9b6b9ea
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 34 deletions.
diff --git a/cmd/cnetflow/cnetflow.go b/cmd/cnetflow/cnetflow.go
@@ -3,14 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"runtime"
 
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"net/http"
+
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var (

diff --git a/cmd/cnflegacy/cnflegacy.go b/cmd/cnflegacy/cnflegacy.go
@@ -3,14 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"runtime"
 
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"net/http"
+
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var (

diff --git a/cmd/csflow/csflow.go b/cmd/csflow/csflow.go
@@ -3,14 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"runtime"
 
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"net/http"
+
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var (

diff --git a/cmd/goflow/goflow.go b/cmd/goflow/goflow.go
@@ -3,15 +3,17 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"runtime"
 
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"net/http"
 
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	"sync"
 )
 

diff --git a/decoders/netflow/netflow.go b/decoders/netflow/netflow.go
@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/cloudflare/goflow/v3/decoders/utils"
 	"sync"
+
+	"github.com/cloudflare/goflow/v3/decoders/utils"
 )
 
 type FlowBaseTemplateSet map[uint16]map[uint32]map[uint16]interface{}

diff --git a/decoders/netflowlegacy/netflow.go b/decoders/netflowlegacy/netflow.go
@@ -3,6 +3,7 @@ package netflowlegacy
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/cloudflare/goflow/v3/decoders/utils"
 )
 

diff --git a/decoders/netflowlegacy/netflow_test.go b/decoders/netflowlegacy/netflow_test.go
@@ -2,8 +2,9 @@ package netflowlegacy
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDecodeNetFlowV5(t *testing.T) {

diff --git a/decoders/sflow/sflow.go b/decoders/sflow/sflow.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+
 	"github.com/cloudflare/goflow/v3/decoders/utils"
 )
 

diff --git a/decoders/sflow/sflow_test.go b/decoders/sflow/sflow_test.go
@@ -2,8 +2,9 @@ package sflow
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSFlowDecode(t *testing.T) {

diff --git a/pb/flow.pb.go b/pb/flow.pb.go
diff --git a/producer/producer_nf.go b/producer/producer_nf.go
@@ -5,11 +5,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/cloudflare/goflow/v3/decoders/netflow"
-	flowmessage "github.com/cloudflare/goflow/v3/pb"
 	"net"
 	"sync"
 	"time"
+
+	"github.com/cloudflare/goflow/v3/decoders/netflow"
+	flowmessage "github.com/cloudflare/goflow/v3/pb"
 )
 
 type SamplingRateSystem interface {

diff --git a/producer/producer_nflegacy.go b/producer/producer_nflegacy.go
@@ -3,9 +3,10 @@ package producer
 import (
 	"encoding/binary"
 	"errors"
+	"net"
+
 	"github.com/cloudflare/goflow/v3/decoders/netflowlegacy"
 	flowmessage "github.com/cloudflare/goflow/v3/pb"
-	"net"
 )
 
 func ConvertNetFlowLegacyRecord(baseTime uint32, uptime uint32, record netflowlegacy.RecordsNetFlowV5) *flowmessage.FlowMessage {

diff --git a/producer/producer_sf.go b/producer/producer_sf.go
@@ -3,9 +3,10 @@ package producer
 import (
 	"encoding/binary"
 	"errors"
+	"net"
+
 	"github.com/cloudflare/goflow/v3/decoders/sflow"
 	flowmessage "github.com/cloudflare/goflow/v3/pb"
-	"net"
 )
 
 func GetSFlowFlowSamples(packet *sflow.Packet) []interface{} {

diff --git a/producer/producer_test.go b/producer/producer_test.go
@@ -1,10 +1,11 @@
 package producer
 
 import (
+	"testing"
+
 	"github.com/cloudflare/goflow/v3/decoders/netflow"
 	"github.com/cloudflare/goflow/v3/decoders/sflow"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestProcessMessageNetFlow(t *testing.T) {

diff --git a/transport/transport_test.go b/transport/transport_test.go
@@ -1,9 +1,10 @@
 package transport
 
 import (
+	"testing"
+
 	flowmessage "github.com/cloudflare/goflow/v3/pb"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestHash(t *testing.T) {

diff --git a/utils/metrics.go b/utils/metrics.go
@@ -1,9 +1,10 @@
 package utils
 
 import (
-	"github.com/prometheus/client_golang/prometheus"
 	"strconv"
 	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 var (

diff --git a/utils/netflow.go b/utils/netflow.go
@@ -3,14 +3,15 @@ package utils
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/cloudflare/goflow/v3/decoders/netflow"
-	flowmessage "github.com/cloudflare/goflow/v3/pb"
-	"github.com/cloudflare/goflow/v3/producer"
-	"github.com/prometheus/client_golang/prometheus"
 	"net/http"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/cloudflare/goflow/v3/decoders/netflow"
+	flowmessage "github.com/cloudflare/goflow/v3/pb"
+	"github.com/cloudflare/goflow/v3/producer"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type TemplateSystem struct {

diff --git a/utils/nflegacy.go b/utils/nflegacy.go
@@ -2,11 +2,12 @@ package utils
 
 import (
 	"bytes"
+	"time"
+
 	"github.com/cloudflare/goflow/v3/decoders/netflowlegacy"
 	flowmessage "github.com/cloudflare/goflow/v3/pb"
 	"github.com/cloudflare/goflow/v3/producer"
 	"github.com/prometheus/client_golang/prometheus"
-	"time"
 )
 
 type StateNFLegacy struct {

diff --git a/utils/sflow.go b/utils/sflow.go
@@ -2,12 +2,13 @@ package utils
 
 import (
 	"bytes"
+	"net"
+	"time"
+
 	"github.com/cloudflare/goflow/v3/decoders/sflow"
 	flowmessage "github.com/cloudflare/goflow/v3/pb"
 	"github.com/cloudflare/goflow/v3/producer"
 	"github.com/prometheus/client_golang/prometheus"
-	"net"
-	"time"
 )
 
 type StateSFlow struct {

diff --git a/utils/utils.go b/utils/utils.go
@@ -4,14 +4,15 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/cloudflare/goflow/v3/decoders"
+	"net"
+	"strconv"
+	"time"
+
+	decoder "github.com/cloudflare/goflow/v3/decoders"
 	"github.com/cloudflare/goflow/v3/decoders/netflow"
 	flowmessage "github.com/cloudflare/goflow/v3/pb"
 	reuseport "github.com/libp2p/go-reuseport"
 	"github.com/prometheus/client_golang/prometheus"
-	"net"
-	"strconv"
-	"time"
 )
 
 func GetServiceAddresses(srv string) (addrs []string, err error) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ package netflowlegacy @@
     import (
     	"bytes"
     	"fmt"
     	"github.com/cloudflare/goflow/v3/decoders/utils"
     )
@@ Expand Down @@