Consolidate mapperclient packages (#257)

build/mapper.Dockerfile

@@ -20,6 +20,8 @@ RUN go test ./mapper/...
 FROM test as builder
 ARG TARGETOS
 ARG TARGETARCH
+
+RUN echo "Building for $TARGETOS/$TARGETARCH - Running on $(uname -m)"
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -trimpath -o /main ./mapper/cmd
 
 # add version file

src/kafka-watcher/cmd/main.go

@@ -15,7 +15,7 @@ import (
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetrysender"
 	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/config"
 	logwatcher2 "github.com/otterize/network-mapper/src/kafka-watcher/pkg/logwatcher"
-	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/mapperclient"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	sharedconfig "github.com/otterize/network-mapper/src/shared/config"
 	"github.com/otterize/network-mapper/src/shared/version"
 	"github.com/sirupsen/logrus"
@@ -46,7 +46,7 @@ func main() {
 
 	ctrl.SetLogger(logrusr.New(logrus.StandardLogger()))
 
-	mapperClient := mapperclient.NewMapperClient(viper.GetString(sharedconfig.MapperApiUrlKey))
+	mapperClient := mapperclient.New(viper.GetString(sharedconfig.MapperApiUrlKey))
 
 	mode := viper.GetString(config.KafkaLogReadModeKey)
 

src/kafka-watcher/pkg/logwatcher/filewatcher.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/nxadm/tail"
 	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/config"
-	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/mapperclient"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"io"
@@ -20,7 +20,7 @@ type LogFileWatcher struct {
 	server        types.NamespacedName
 }
 
-func NewLogFileWatcher(mapperClient mapperclient.MapperClient, authzFilePath string, server types.NamespacedName) (*LogFileWatcher, error) {
+func NewLogFileWatcher(mapperClient *mapperclient.Client, authzFilePath string, server types.NamespacedName) (*LogFileWatcher, error) {
 	w := &LogFileWatcher{
 		baseWatcher: baseWatcher{
 			mu:           sync.Mutex{},

src/kafka-watcher/pkg/logwatcher/kubeneteslogwatcher.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"github.com/otterize/intents-operator/src/shared/errors"
 	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/config"
-	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/mapperclient"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"golang.org/x/exp/slices"
@@ -28,7 +28,7 @@ type KubernetesLogWatcher struct {
 	kafkaServers []types.NamespacedName
 }
 
-func NewKubernetesLogWatcher(mapperClient mapperclient.MapperClient, kafkaServers []types.NamespacedName) (*KubernetesLogWatcher, error) {
+func NewKubernetesLogWatcher(mapperClient *mapperclient.Client, kafkaServers []types.NamespacedName) (*KubernetesLogWatcher, error) {
 	conf, err := rest.InClusterConfig()
 
 	if err != nil && !errors.Is(err, rest.ErrNotInCluster) {

src/kafka-watcher/pkg/logwatcher/watcher.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"github.com/oriser/regroup"
-	mapperclient2 "github.com/otterize/network-mapper/src/kafka-watcher/pkg/mapperclient"
 	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/prometheus"
+	"github.com/otterize/network-mapper/src/mapperclient"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/types"
@@ -37,7 +37,7 @@ type Watcher interface {
 type baseWatcher struct {
 	mu           sync.Mutex
 	seen         SeenRecordsStore
-	mapperClient mapperclient2.MapperClient
+	mapperClient *mapperclient.Client
 }
 
 func (b *baseWatcher) flush() SeenRecordsStore {
@@ -61,8 +61,8 @@ func (b *baseWatcher) reportResults(ctx context.Context) error {
 	logrus.Infof("Reporting %d records", cRecords)
 	prometheus.IncrementKafkaTopicReports(cRecords)
 
-	results := lo.MapToSlice(records, func(r AuthorizerRecord, t time.Time) mapperclient2.KafkaMapperResult {
-		return mapperclient2.KafkaMapperResult{
+	results := lo.MapToSlice(records, func(r AuthorizerRecord, t time.Time) mapperclient.KafkaMapperResult {
+		return mapperclient.KafkaMapperResult{
 			SrcIp:           r.Host,
 			ServerPodName:   r.Server.Name,
 			ServerNamespace: r.Server.Namespace,
@@ -72,7 +72,7 @@ func (b *baseWatcher) reportResults(ctx context.Context) error {
 		}
 	})
 
-	return b.mapperClient.ReportKafkaMapperResults(ctx, mapperclient2.KafkaMapperResults{Results: results})
+	return b.mapperClient.ReportKafkaMapperResults(ctx, mapperclient.KafkaMapperResults{Results: results})
 }
 
 func (b *baseWatcher) processLogRecord(kafkaServer types.NamespacedName, record string) {