fix: Fix proto module path (#21)

Signed-off-by: Anurag Rajawat <[email protected]>
5GSEC · Oct 8, 2024 · 9c607e1 · 9c607e1
1 parent 889c6ba
commit 9c607e1
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 29 deletions.
diff --git a/protobuf/golang/go.mod b/protobuf/golang/go.mod
@@ -1,4 +1,4 @@
-module github.com/5GSEC/SentryFlow/protobuf
+module github.com/5GSEC/SentryFlow/protobuf/golang
 
 go 1.22
 

diff --git a/protobuf/golang/sentryflow.pb.go b/protobuf/golang/sentryflow.pb.go
diff --git a/protobuf/golang/sentryflow_grpc.pb.go b/protobuf/golang/sentryflow_grpc.pb.go
diff --git a/protobuf/golang/sentryflow_metrics.pb.go b/protobuf/golang/sentryflow_metrics.pb.go
diff --git a/protobuf/golang/sentryflow_metrics_grpc.pb.go b/protobuf/golang/sentryflow_metrics_grpc.pb.go
diff --git a/protobuf/python/sentryflow_metrics_pb2.py b/protobuf/python/sentryflow_metrics_pb2.py
diff --git a/protobuf/python/sentryflow_pb2.py b/protobuf/python/sentryflow_pb2.py
diff --git a/protobuf/sentryflow.proto b/protobuf/sentryflow.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package protobuf;
 
-option go_package = "github.com/5GSEC/SentryFlow/protobuf";
+option go_package = "github.com/5GSEC/SentryFlow/protobuf/golang";
 
 message ClientInfo {
   string hostName = 1;

diff --git a/protobuf/sentryflow_metrics.proto b/protobuf/sentryflow_metrics.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package protobuf;
 
-option go_package = "github.com/5GSEC/SentryFlow/protobuf";
+option go_package = "github.com/5GSEC/SentryFlow/protobuf/golang";
 
 message APIClassifierRequest {
   repeated string API = 1;

diff --git a/sentryflow/go.mod b/sentryflow/go.mod
@@ -3,12 +3,11 @@ module github.com/5GSEC/SentryFlow
 go 1.23
 
 require (
-	github.com/5GSEC/SentryFlow/protobuf v0.0.0-00010101000000-000000000000
+	github.com/5GSEC/SentryFlow/protobuf/golang v0.0.0-00010101000000-000000000000
 	github.com/golang/protobuf v1.5.4
 	github.com/google/uuid v1.6.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	go.opentelemetry.io/proto/otlp v1.3.1
 	go.uber.org/zap v1.27.0
 	google.golang.org/grpc v1.67.0
 	google.golang.org/protobuf v1.34.2
@@ -36,7 +35,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -87,4 +85,4 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/5GSEC/SentryFlow/protobuf => ../protobuf/golang
+replace github.com/5GSEC/SentryFlow/protobuf/golang => ../protobuf/golang
diff --git a/sentryflow/go.sum b/sentryflow/go.sum
@@ -1,3 +1,5 @@
+github.com/5GSEC/SentryFlow/protobuf v0.0.0-20240513071927-c6689c164ec8 h1:vOjDsj/1zs1O4V2UG2SINC7/maAx3WEQsE0bz5n0skI=
+github.com/5GSEC/SentryFlow/protobuf v0.0.0-20240513071927-c6689c164ec8/go.mod h1:cvmCAKkLBDXx6Rlk97XQQuAtcOhkM/wsWNbxGOC3yfE=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -51,8 +53,6 @@ github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2
 github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
@@ -140,8 +140,6 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
-go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

diff --git a/sentryflow/pkg/core/sentryflow.go b/sentryflow/pkg/core/sentryflow.go
@@ -21,7 +21,7 @@ import (
 	"github.com/5GSEC/SentryFlow/pkg/k8s"
 	"github.com/5GSEC/SentryFlow/pkg/receiver"
 	"github.com/5GSEC/SentryFlow/pkg/util"
-	"github.com/5GSEC/SentryFlow/protobuf"
+	protobuf "github.com/5GSEC/SentryFlow/protobuf/golang"
 )
 
 type Manager struct {

diff --git a/sentryflow/pkg/core/server.go b/sentryflow/pkg/core/server.go
@@ -14,7 +14,7 @@ import (
 
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/5GSEC/SentryFlow/protobuf"
+	protobuf "github.com/5GSEC/SentryFlow/protobuf/golang"
 )
 
 func (m *Manager) startGrpcServer(port uint16) {

diff --git a/sentryflow/pkg/exporter/exporter.go b/sentryflow/pkg/exporter/exporter.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/5GSEC/SentryFlow/pkg/config"
 	"github.com/5GSEC/SentryFlow/pkg/util"
-	"github.com/5GSEC/SentryFlow/protobuf"
+	protobuf "github.com/5GSEC/SentryFlow/protobuf/golang"
 )
 
 // clientList represents a list of gRPC clients and their associated channels for

diff --git a/sentryflow/pkg/receiver/receiver.go b/sentryflow/pkg/receiver/receiver.go
@@ -14,7 +14,7 @@ import (
 	"github.com/5GSEC/SentryFlow/pkg/config"
 	istiosidecar "github.com/5GSEC/SentryFlow/pkg/receiver/svcmesh/istio/sidecar"
 	"github.com/5GSEC/SentryFlow/pkg/util"
-	"github.com/5GSEC/SentryFlow/protobuf"
+	protobuf "github.com/5GSEC/SentryFlow/protobuf/golang"
 )
 
 // Init initializes the API event sources based on the provided configuration. It