feat: remove proto

Signed-off-by: PoAn Yang <poan.yang@suse.com>
longhorn · Feb 28, 2024 · 38eaf64 · 38eaf64
1 parent 3bd089d
commit 38eaf64
Show file tree

Hide file tree

Showing 40 changed files with 94 additions and 10,770 deletions.
diff --git a/app/cmd/start.go b/app/cmd/start.go
@@ -31,15 +31,14 @@ import (
 	helperutil "github.com/longhorn/go-spdk-helper/pkg/util"
 	spdk "github.com/longhorn/longhorn-spdk-engine/pkg/spdk"
 	spdkutil "github.com/longhorn/longhorn-spdk-engine/pkg/util"
-	spdkrpc "github.com/longhorn/longhorn-spdk-engine/proto/spdkrpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
+	spdkrpc "github.com/longhorn/types/pkg/spdkrpc"
 
 	"github.com/longhorn/longhorn-instance-manager/pkg/disk"
 	"github.com/longhorn/longhorn-instance-manager/pkg/health"
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 	"github.com/longhorn/longhorn-instance-manager/pkg/instance"
 	"github.com/longhorn/longhorn-instance-manager/pkg/process"
 	"github.com/longhorn/longhorn-instance-manager/pkg/proxy"
-
 	"github.com/longhorn/longhorn-instance-manager/pkg/types"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"
 )

diff --git a/generate_grpc.sh b/generate_grpc.sh
diff --git a/pkg/api/instance.go b/pkg/api/instance.go
@@ -1,10 +1,9 @@
 package api
 
 import (
+	rpc "github.com/longhorn/types/pkg/imrpc"
+	"github.com/longhorn/types/pkg/spdkrpc"
 	"google.golang.org/protobuf/types/known/emptypb"
-
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
-	"github.com/longhorn/longhorn-spdk-engine/proto/spdkrpc"
 )
 
 var (

diff --git a/pkg/api/process.go b/pkg/api/process.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
 )
 
 type Process struct {

diff --git a/pkg/client/disk.go b/pkg/client/disk.go
@@ -5,13 +5,13 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	rpc "github.com/longhorn/types/pkg/imrpc"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/longhorn/longhorn-instance-manager/pkg/api"
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 	"github.com/longhorn/longhorn-instance-manager/pkg/meta"
 	"github.com/longhorn/longhorn-instance-manager/pkg/types"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"

diff --git a/pkg/client/instance.go b/pkg/client/instance.go
@@ -5,13 +5,13 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	rpc "github.com/longhorn/types/pkg/imrpc"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/longhorn/longhorn-instance-manager/pkg/api"
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 	"github.com/longhorn/longhorn-instance-manager/pkg/meta"
 	"github.com/longhorn/longhorn-instance-manager/pkg/types"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"

diff --git a/pkg/client/process_manager.go b/pkg/client/process_manager.go
@@ -5,14 +5,14 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	rpc "github.com/longhorn/types/pkg/imrpc"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/longhorn/longhorn-instance-manager/pkg/api"
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 	"github.com/longhorn/longhorn-instance-manager/pkg/meta"
 	"github.com/longhorn/longhorn-instance-manager/pkg/types"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"

diff --git a/pkg/client/proxy.go b/pkg/client/proxy.go
@@ -4,19 +4,18 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	emeta "github.com/longhorn/longhorn-engine/pkg/meta"
+	eclient "github.com/longhorn/longhorn-engine/pkg/replica/client"
+	rpc "github.com/longhorn/types/pkg/imrpc"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 	"github.com/longhorn/longhorn-instance-manager/pkg/meta"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"
-
-	emeta "github.com/longhorn/longhorn-engine/pkg/meta"
-	eclient "github.com/longhorn/longhorn-engine/pkg/replica/client"
 )
 
 var (

diff --git a/pkg/client/proxy_backup.go b/pkg/client/proxy_backup.go
@@ -4,10 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 
+	rpc "github.com/longhorn/types/pkg/imrpc"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/types/known/emptypb"
-
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 )
 
 func (c *ProxyClient) CleanupBackupMountPoints() (err error) {

diff --git a/pkg/client/proxy_metrics.go b/pkg/client/proxy_metrics.go
@@ -3,7 +3,7 @@ package client
 import (
 	"github.com/pkg/errors"
 
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
 )
 
 func (c *ProxyClient) MetricsGet(engineName, volumeName, serviceAddress string) (metrics *Metrics, err error) {

diff --git a/pkg/client/proxy_replica.go b/pkg/client/proxy_replica.go
@@ -3,12 +3,9 @@ package client
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
-
 	etypes "github.com/longhorn/longhorn-engine/pkg/types"
-	eptypes "github.com/longhorn/longhorn-engine/proto/ptypes"
-
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
+	"github.com/pkg/errors"
 )
 
 func (c *ProxyClient) ReplicaAdd(dataEngine, engineName, volumeName, serviceAddress, replicaName,
@@ -99,7 +96,7 @@ func (c *ProxyClient) ReplicaList(dataEngine, engineName, volumeName,
 	for _, cr := range resp.ReplicaList.Replicas {
 		rInfoList = append(rInfoList, &etypes.ControllerReplicaInfo{
 			Address: cr.Address.Address,
-			Mode:    eptypes.GRPCReplicaModeToReplicaMode(cr.Mode),
+			Mode:    etypes.GRPCReplicaModeToReplicaMode(cr.Mode),
 		})
 	}
 
@@ -258,7 +255,7 @@ func (c *ProxyClient) ReplicaModeUpdate(dataEngine, serviceAddress, replicaAddre
 			DataEngine:         rpc.DataEngine(driver),
 		},
 		ReplicaAddress: replicaAddress,
-		Mode:           eptypes.ReplicaModeToGRPCReplicaMode(etypes.Mode(mode)),
+		Mode:           etypes.ReplicaModeToGRPCReplicaMode(etypes.Mode(mode)),
 	}
 	_, err = c.service.ReplicaModeUpdate(getContextWithGRPCTimeout(c.ctx), req)
 	if err != nil {

diff --git a/pkg/client/proxy_snapshot.go b/pkg/client/proxy_snapshot.go
@@ -7,9 +7,8 @@ import (
 
 	etypes "github.com/longhorn/longhorn-engine/pkg/types"
 	eutil "github.com/longhorn/longhorn-engine/pkg/util"
-	eptypes "github.com/longhorn/longhorn-engine/proto/ptypes"
-
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	"github.com/longhorn/types/pkg/enginerpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
 )
 
 func (c *ProxyClient) VolumeSnapshot(dataEngine, engineName, volumeName, serviceAddress,
@@ -55,7 +54,7 @@ func (c *ProxyClient) VolumeSnapshot(dataEngine, engineName, volumeName, service
 			DataEngine:         rpc.DataEngine(driver),
 			VolumeName:         volumeName,
 		},
-		SnapshotVolume: &eptypes.VolumeSnapshotRequest{
+		SnapshotVolume: &enginerpc.VolumeSnapshotRequest{
 			Name:   volumeSnapshotName,
 			Labels: labels,
 		},

diff --git a/pkg/client/proxy_volume.go b/pkg/client/proxy_volume.go
@@ -7,9 +7,8 @@ import (
 	"github.com/pkg/errors"
 
 	etypes "github.com/longhorn/longhorn-engine/pkg/types"
-	eptypes "github.com/longhorn/longhorn-engine/proto/ptypes"
-
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	"github.com/longhorn/types/pkg/enginerpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
 )
 
 func (c *ProxyClient) VolumeGet(dataEngine, engineName, volumeName, serviceAddress string) (info *etypes.VolumeInfo, err error) {
@@ -90,7 +89,7 @@ func (c *ProxyClient) VolumeExpand(dataEngine, engineName, volumeName, serviceAd
 			DataEngine:         rpc.DataEngine(driver),
 			VolumeName:         volumeName,
 		},
-		Expand: &eptypes.VolumeExpandRequest{
+		Expand: &enginerpc.VolumeExpandRequest{
 			Size: size,
 		},
 	}
@@ -131,7 +130,7 @@ func (c *ProxyClient) VolumeFrontendStart(dataEngine, engineName, volumeName, se
 			DataEngine:         rpc.DataEngine(driver),
 			VolumeName:         volumeName,
 		},
-		FrontendStart: &eptypes.VolumeFrontendStartRequest{
+		FrontendStart: &enginerpc.VolumeFrontendStartRequest{
 			Frontend: frontendName,
 		},
 	}
@@ -207,7 +206,7 @@ func (c *ProxyClient) VolumeUnmapMarkSnapChainRemovedSet(dataEngine, engineName,
 			DataEngine:         rpc.DataEngine(driver),
 			VolumeName:         volumeName,
 		},
-		UnmapMarkSnap: &eptypes.VolumeUnmapMarkSnapChainRemovedSetRequest{Enabled: enabled},
+		UnmapMarkSnap: &enginerpc.VolumeUnmapMarkSnapChainRemovedSetRequest{Enabled: enabled},
 	}
 	_, err = c.service.VolumeUnmapMarkSnapChainRemovedSet(getContextWithGRPCTimeout(c.ctx), req)
 	if err != nil {
@@ -247,7 +246,7 @@ func (c *ProxyClient) VolumeSnapshotMaxCountSet(dataEngine, engineName, volumeNa
 			DataEngine:         rpc.DataEngine(driver),
 			VolumeName:         volumeName,
 		},
-		Count: &eptypes.VolumeSnapshotMaxCountSetRequest{Count: int32(count)},
+		Count: &enginerpc.VolumeSnapshotMaxCountSetRequest{Count: int32(count)},
 	}
 	_, err = c.service.VolumeSnapshotMaxCountSet(getContextWithGRPCTimeout(c.ctx), req)
 	if err != nil {
@@ -287,7 +286,7 @@ func (c *ProxyClient) VolumeSnapshotMaxSizeSet(dataEngine, engineName, volumeNam
 			DataEngine:         rpc.DataEngine(driver),
 			VolumeName:         volumeName,
 		},
-		Size: &eptypes.VolumeSnapshotMaxSizeSetRequest{Size: size},
+		Size: &enginerpc.VolumeSnapshotMaxSizeSetRequest{Size: size},
 	}
 	_, err = c.service.VolumeSnapshotMaxSizeSet(getContextWithGRPCTimeout(c.ctx), req)
 	if err != nil {

diff --git a/pkg/client/types.go b/pkg/client/types.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	rpc "github.com/longhorn/types/pkg/imrpc"
 )
 
 const (

diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -6,19 +6,19 @@ import (
 	"sync"
 	"time"
 
+	"github.com/longhorn/longhorn-spdk-engine/pkg/api"
+	spdkclient "github.com/longhorn/longhorn-spdk-engine/pkg/client"
+	rpc "github.com/longhorn/types/pkg/imrpc"
+	spdkrpc "github.com/longhorn/types/pkg/spdkrpc"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	grpccodes "google.golang.org/grpc/codes"
 	grpcstatus "google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
 	"github.com/longhorn/longhorn-instance-manager/pkg/meta"
 	"github.com/longhorn/longhorn-instance-manager/pkg/types"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"
-	"github.com/longhorn/longhorn-spdk-engine/pkg/api"
-	spdkclient "github.com/longhorn/longhorn-spdk-engine/pkg/client"
-	spdkrpc "github.com/longhorn/longhorn-spdk-engine/proto/spdkrpc"
 )
 
 const (
@@ -39,6 +39,7 @@ type BlockDiskOps struct {
 }
 
 type Server struct {
+	rpc.UnimplementedDiskServiceServer
 	sync.RWMutex
 
 	ctx           context.Context