linter

microsoft · Mar 14, 2024 · d89ec22 · d89ec22
1 parent 1ca06f2
commit d89ec22
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/pkg/module/metrics/dns.go b/pkg/module/metrics/dns.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cilium/cilium/api/v1/flow"
 	v1 "github.com/cilium/cilium/api/v1/flow"
 	api "github.com/microsoft/retina/crd/api/v1alpha1"
 	"github.com/microsoft/retina/pkg/exporter"
@@ -83,7 +82,7 @@ func (d *DNSMetrics) getLabels() []string {
 	return labels
 }
 
-func (d *DNSMetrics) values(flow *flow.Flow) []string {
+func (d *DNSMetrics) values(flow *v1.Flow) []string {
 	flowDns, dnsType, numResponses := utils.GetDns(flow)
 	if flowDns == nil {
 		return nil

diff --git a/pkg/module/metrics/dns_test.go b/pkg/module/metrics/dns_test.go
@@ -11,10 +11,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/microsoft/retina/pkg/log"
 	"github.com/microsoft/retina/pkg/metrics"
+	"github.com/microsoft/retina/pkg/utils"
 	"github.com/prometheus/client_golang/prometheus"
 	"gotest.tools/v3/assert"
-
-	"github.com/microsoft/retina/pkg/utils"
 )
 
 func TestGetLabels(t *testing.T) {

diff --git a/pkg/plugin/dropreason/dropreason_linux_test.go b/pkg/plugin/dropreason/dropreason_linux_test.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/cilium/ebpf/perf"
 	"github.com/golang/mock/gomock"
+	kcfg "github.com/microsoft/retina/pkg/config"
 	"github.com/microsoft/retina/pkg/enricher"
 	"github.com/microsoft/retina/pkg/log"
 	"github.com/microsoft/retina/pkg/metrics"

diff --git a/pkg/plugin/linuxutil/types_linux.go b/pkg/plugin/linuxutil/types_linux.go
@@ -6,6 +6,7 @@ import (
 	kcfg "github.com/microsoft/retina/pkg/config"
 
 	"github.com/cakturk/go-netstat/netstat"
+	kcfg "github.com/microsoft/retina/pkg/config"
 	"github.com/microsoft/retina/pkg/log"
 	"github.com/microsoft/retina/pkg/plugin/api"
 )

diff --git a/pkg/plugin/mockplugin/mockplugin.go b/pkg/plugin/mockplugin/mockplugin.go
@@ -9,6 +9,7 @@ import (
 	kcfg "github.com/microsoft/retina/pkg/config"
 
 	hubblev1 "github.com/cilium/cilium/pkg/hubble/api/v1"
+	kcfg "github.com/microsoft/retina/pkg/config"
 	"github.com/microsoft/retina/pkg/log"
 	"github.com/microsoft/retina/pkg/plugin/api"
 )

diff --git a/pkg/plugin/packetparser/packetparser_linux_test.go b/pkg/plugin/packetparser/packetparser_linux_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/microsoft/retina/pkg/metrics"
 	"github.com/microsoft/retina/pkg/plugin/packetparser/mocks"
 	"github.com/microsoft/retina/pkg/watchers/endpoint"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/vishvananda/netlink"