Move sniffer to new mapperclient pkg

src/sniffer/cmd/main.go

@@ -12,6 +12,7 @@ import (
 	"github.com/otterize/intents-operator/src/shared/telemetries/errorreporter"
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetriesgql"
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetrysender"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/otterize/network-mapper/src/shared/version"
 	"golang.org/x/sync/errgroup"
 	"net/http"
@@ -21,7 +22,6 @@ import (
 
 	"github.com/labstack/echo-contrib/echoprometheus"
 	sharedconfig "github.com/otterize/network-mapper/src/shared/config"
-	"github.com/otterize/network-mapper/src/sniffer/pkg/mapperclient"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/sniffer"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -44,7 +44,7 @@ func main() {
 
 	ctrl.SetLogger(logrusr.New(logrus.StandardLogger()))
 
-	mapperClient := mapperclient.NewMapperClient(viper.GetString(sharedconfig.MapperApiUrlKey))
+	mapperClient := mapperclient.New(viper.GetString(sharedconfig.MapperApiUrlKey))
 
 	healthServer := echo.New()
 	healthServer.HideBanner = true

src/sniffer/pkg/collectors/collector.go

@@ -1,7 +1,7 @@
 package collectors
 
 import (
-	"github.com/otterize/network-mapper/src/sniffer/pkg/mapperclient"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/otterize/nilable"
 	"github.com/sirupsen/logrus"
 	"time"

src/sniffer/pkg/collectors/dnssniffer_test.go

@@ -2,14 +2,14 @@ package collectors
 
 import (
 	"encoding/hex"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/ipresolver"
 	"github.com/otterize/nilable"
 	"testing"
 	"time"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/otterize/network-mapper/src/sniffer/pkg/mapperclient"
 	"github.com/stretchr/testify/suite"
 )
 

src/sniffer/pkg/collectors/socketscanner_test.go

@@ -3,8 +3,8 @@ package collectors
 import (
 	"fmt"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/config"
-	"github.com/otterize/network-mapper/src/sniffer/pkg/mapperclient"
 	"github.com/otterize/nilable"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/suite"

src/sniffer/pkg/collectors/tcpsniffer_test.go

@@ -2,6 +2,7 @@ package collectors
 
 import (
 	"encoding/hex"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/ipresolver"
 	"github.com/otterize/nilable"
 	"github.com/stretchr/testify/require"
@@ -11,7 +12,6 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/otterize/network-mapper/src/sniffer/pkg/mapperclient"
 )
 
 func TestTCPSniffer_TestHandlePacketAWS(t *testing.T) {

src/sniffer/pkg/sniffer/sniffer.go

@@ -3,11 +3,11 @@ package sniffer
 import (
 	"context"
 	"github.com/otterize/intents-operator/src/shared/errors"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/otterize/network-mapper/src/shared/isrunningonaws"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/collectors"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/config"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/ipresolver"
-	"github.com/otterize/network-mapper/src/sniffer/pkg/mapperclient"
 	"github.com/otterize/network-mapper/src/sniffer/pkg/prometheus"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -19,10 +19,10 @@ type Sniffer struct {
 	socketScanner  *collectors.SocketScanner
 	tcpSniffer     *collectors.TCPSniffer
 	lastReportTime time.Time
-	mapperClient   mapperclient.MapperClient
+	mapperClient   *mapperclient.Client
 }
 
-func NewSniffer(mapperClient mapperclient.MapperClient) *Sniffer {
+func NewSniffer(mapperClient *mapperclient.Client) *Sniffer {
 	procFSIPResolver := ipresolver.NewProcFSIPResolver()
 	isRunningOnAws := isrunningonaws.Check()