Move go proto to pkg/proto, add .gitattributes

C4T-BuT-S4D · Nov 17, 2023 · 2c3d1f9 · 2c3d1f9
1 parent 98745f7
commit 2c3d1f9
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 3,155 deletions.
diff --git a/cmd/client/cli/add.go b/cmd/client/cli/add.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/c4t-but-s4d/neo/v2/internal/client"
 	"github.com/c4t-but-s4d/neo/v2/pkg/archive"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 type addCLI struct {

diff --git a/cmd/client/cli/tail.go b/cmd/client/cli/tail.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/c4t-but-s4d/neo/v2/internal/client"
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 type tailCLI struct {

diff --git a/cmd/client/cli/update.go b/cmd/client/cli/update.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/c4t-but-s4d/neo/v2/internal/client"
 
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 type updateCLI struct {

diff --git a/cmd/client/cli/utils.go b/cmd/client/cli/utils.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/samber/lo"
 
-	"github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	"github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 func isBinary(data []byte) bool {

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -28,9 +28,9 @@ import (
 	"github.com/c4t-but-s4d/neo/v2/pkg/mu"
 	"github.com/c4t-but-s4d/neo/v2/pkg/neohttp"
 	"github.com/c4t-but-s4d/neo/v2/pkg/neosync"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 func main() {

diff --git a/internal/client/client.go b/internal/client/client.go
@@ -10,9 +10,9 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/c4t-but-s4d/neo/v2/pkg/filestream"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 func New(cc grpc.ClientConnInterface, id string) *Client {

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -7,7 +7,7 @@ import (
 
 	"google.golang.org/protobuf/types/known/durationpb"
 
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 type ExploitsConfig struct {

diff --git a/internal/exploit/cache.go b/internal/exploit/cache.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 func NewCache() *Cache {

diff --git a/internal/exploit/cache_test.go b/internal/exploit/cache_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"google.golang.org/protobuf/testing/protocmp"
 
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 func TestCache_Diff(t *testing.T) {

diff --git a/internal/exploit/runner.go b/internal/exploit/runner.go
@@ -21,7 +21,7 @@ import (
 	"github.com/c4t-but-s4d/neo/v2/internal/models"
 	"github.com/c4t-but-s4d/neo/v2/internal/queue"
 	"github.com/c4t-but-s4d/neo/v2/pkg/joblogger"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 var (

diff --git a/internal/exploit/storage.go b/internal/exploit/storage.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/c4t-but-s4d/neo/v2/internal/client"
 	"github.com/c4t-but-s4d/neo/v2/pkg/archive"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 func NewStorage(cache *Cache, exploitDir string, client *client.Client) *Storage {

diff --git a/internal/exploit/storage_test.go b/internal/exploit/storage_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/c4t-but-s4d/neo/v2/pkg/archive"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 func mockStorage() (*Storage, func() error) {

diff --git a/internal/server/exploits/server.go b/internal/server/exploits/server.go
@@ -14,8 +14,8 @@ import (
 	serverConfig "github.com/c4t-but-s4d/neo/v2/internal/server/config"
 	"github.com/c4t-but-s4d/neo/v2/pkg/gstream"
 	"github.com/c4t-but-s4d/neo/v2/pkg/hostbucket"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 	"github.com/c4t-but-s4d/neo/v2/pkg/pubsub"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
 )
 
 func New(cfg *serverConfig.Config, storage *CachedStorage) *Server {

diff --git a/internal/server/exploits/server_test.go b/internal/server/exploits/server_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/c4t-but-s4d/neo/v2/internal/server/config"
 	"github.com/c4t-but-s4d/neo/v2/pkg/hostbucket"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
 )
 
 func testServer(t *testing.T) (*Server, func()) {

diff --git a/internal/server/exploits/storage.go b/internal/server/exploits/storage.go
@@ -10,7 +10,7 @@ import (
 	bolt "go.etcd.io/bbolt"
 	"google.golang.org/protobuf/proto"
 
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 )
 
 const (

diff --git a/internal/server/exploits/storage_test.go b/internal/server/exploits/storage_test.go
@@ -12,8 +12,8 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"
 
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
 )
 
 func testDB() (*bolt.DB, func()) {

diff --git a/internal/server/fs/server.go b/internal/server/fs/server.go
@@ -12,7 +12,7 @@ import (
 	serverConfig "github.com/c4t-but-s4d/neo/v2/internal/server/config"
 	"github.com/c4t-but-s4d/neo/v2/internal/server/utils"
 	"github.com/c4t-but-s4d/neo/v2/pkg/filestream"
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
 )
 
 func New(cfg *serverConfig.Config) (*Server, error) {

diff --git a/internal/server/logs/logline.go b/internal/server/logs/logline.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/mitchellh/mapstructure"
 
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 func NewLogLineFromValues(vals map[string]interface{}) (*LogLine, error) {

diff --git a/internal/server/logs/server.go b/internal/server/logs/server.go
@@ -10,7 +10,7 @@ import (
 	"github.com/c4t-but-s4d/neo/v2/internal/server/common"
 	"github.com/c4t-but-s4d/neo/v2/internal/server/utils"
 	"github.com/c4t-but-s4d/neo/v2/pkg/gstream"
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 const (

diff --git a/pkg/filestream/filestream.go b/pkg/filestream/filestream.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
 )
 
 const (

diff --git a/pkg/filestream/filestream_test.go b/pkg/filestream/filestream_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 
-	fspb "github.com/c4t-but-s4d/neo/v2/proto/go/fileserver"
+	fspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/fileserver"
 )
 
 type failedReadWriter struct {

diff --git a/pkg/hostbucket/hostbucket.go b/pkg/hostbucket/hostbucket.go
@@ -6,8 +6,8 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 
+	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
 	"github.com/c4t-but-s4d/neo/v2/pkg/rendezvous"
-	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
 )
 
 func New(teams map[string]string) *HostBucket {

diff --git a/pkg/joblogger/logger.go b/pkg/joblogger/logger.go
@@ -8,7 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/c4t-but-s4d/neo/v2/internal/logger"
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 // 1 MB.

diff --git a/pkg/joblogger/sender.go b/pkg/joblogger/sender.go
@@ -9,7 +9,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/c4t-but-s4d/neo/v2/internal/client"
-	logspb "github.com/c4t-but-s4d/neo/v2/proto/go/logs"
+	logspb "github.com/c4t-but-s4d/neo/v2/pkg/proto/logs"
 )
 
 const (

diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
@@ -2,15 +2,15 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/c4t-but-s4d/neo/v2/proto/go
+    default: github.com/c4t-but-s4d/neo/v2/pkg/proto
 plugins:
   # Go
   - name: go
-    out: go
+    out: ../pkg/proto
     opt:
       - paths=source_relative
   - name: go-grpc
-    out: go
+    out: ../pkg/proto
     opt:
       - paths=source_relative
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"sync"
     	"time"
-    	epb "github.com/c4t-but-s4d/neo/v2/proto/go/exploits"
+    	epb "github.com/c4t-but-s4d/neo/v2/pkg/proto/exploits"
     )
     func NewCache() *Cache {
@@ Expand Down @@