feat: remove proto

Signed-off-by: PoAn Yang <poan.yang@suse.com>
longhorn · Apr 8, 2024 · 22c21b5 · 22c21b5
1 parent 1a18f22
commit 22c21b5
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 599 deletions.
diff --git a/app/cmd/server.go b/app/cmd/server.go
@@ -9,11 +9,12 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 
+	"github.com/longhorn/types/pkg/smrpc"
 	"google.golang.org/grpc"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/grpc/reflection"
 
-	smrpc "github.com/longhorn/longhorn-share-manager/pkg/rpc"
+	"github.com/longhorn/longhorn-share-manager/pkg/rpc"
 	"github.com/longhorn/longhorn-share-manager/pkg/server"
 	"github.com/longhorn/longhorn-share-manager/pkg/util"
 	"github.com/longhorn/longhorn-share-manager/pkg/volume"
@@ -126,9 +127,9 @@ func start(vol volume.Volume) error {
 		}
 
 		s := grpc.NewServer()
-		srv := smrpc.NewShareManagerServer(manager)
+		srv := rpc.NewShareManagerServer(manager)
 		smrpc.RegisterShareManagerServiceServer(s, srv)
-		healthpb.RegisterHealthServer(s, smrpc.NewShareManagerHealthCheckServer(srv))
+		healthpb.RegisterHealthServer(s, rpc.NewShareManagerHealthCheckServer(srv))
 		reflection.Register(s)
 
 		logrus.Infof("Listening on share manager gRPC server %s", listenPort)

diff --git a/generate_grpc.sh b/generate_grpc.sh
diff --git a/...gration/rpc/share_manager/github/com/longhorn/longhorn_share_manager/pkg/rpc/smrpc_pb2.py b/...gration/rpc/share_manager/github/com/longhorn/longhorn_share_manager/pkg/rpc/smrpc_pb2.py
diff --git a/...on/rpc/share_manager/github/com/longhorn/longhorn_share_manager/pkg/rpc/smrpc_pb2_grpc.py b/...on/rpc/share_manager/github/com/longhorn/longhorn_share_manager/pkg/rpc/smrpc_pb2_grpc.py
diff --git a/pkg/client/share_manager_client.go b/pkg/client/share_manager_client.go
@@ -3,11 +3,11 @@ package client
 import (
 	"context"
 
+	rpc "github.com/longhorn/types/pkg/smrpc"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	rpc "github.com/longhorn/longhorn-share-manager/pkg/rpc"
 	"github.com/longhorn/longhorn-share-manager/pkg/types"
 )
 

diff --git a/pkg/rpc/server.go b/pkg/rpc/server.go
@@ -1,4 +1,4 @@
-package smrpc
+package rpc
 
 import (
 	"fmt"
@@ -8,19 +8,17 @@ import (
 	"time"
 
 	"github.com/google/fscrypt/filesystem"
+	lhexec "github.com/longhorn/go-common-libs/exec"
+	lhtypes "github.com/longhorn/go-common-libs/types"
+	"github.com/longhorn/types/pkg/smrpc"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
-
-	"k8s.io/mount-utils"
-
 	grpccodes "google.golang.org/grpc/codes"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 	grpcstatus "google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
-
-	lhexec "github.com/longhorn/go-common-libs/exec"
-	lhtypes "github.com/longhorn/go-common-libs/types"
+	"k8s.io/mount-utils"
 
 	"github.com/longhorn/longhorn-share-manager/pkg/server"
 	"github.com/longhorn/longhorn-share-manager/pkg/server/nfs"
@@ -37,6 +35,7 @@ const (
 )
 
 type ShareManagerServer struct {
+	smrpc.UnimplementedShareManagerServiceServer
 	sync.RWMutex
 
 	logger  logrus.FieldLogger
@@ -50,7 +49,7 @@ func NewShareManagerServer(manager *server.ShareManager) *ShareManagerServer {
 	}
 }
 
-func (s *ShareManagerServer) FilesystemTrim(ctx context.Context, req *FilesystemTrimRequest) (resp *emptypb.Empty, err error) {
+func (s *ShareManagerServer) FilesystemTrim(ctx context.Context, req *smrpc.FilesystemTrimRequest) (resp *emptypb.Empty, err error) {
 	s.Lock()
 	defer s.Unlock()