feat: remove proto

Signed-off-by: PoAn Yang <poan.yang@suse.com>
longhorn · Apr 17, 2024 · 7fb72b1 · 7fb72b1
1 parent 0e4e46e
commit 7fb72b1
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 2,166 deletions.
diff --git a/api/types.go b/api/types.go
@@ -3,10 +3,9 @@ package api
 import (
 	"context"
 
+	rpc "github.com/longhorn/types/pkg/generated/bimrpc"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
-
-	"github.com/longhorn/backing-image-manager/pkg/rpc"
 )
 
 type BackingImage struct {

diff --git a/generate_grpc.sh b/generate_grpc.sh
diff --git a/pkg/client/manager_client.go b/pkg/client/manager_client.go
@@ -3,14 +3,14 @@ package client
 import (
 	"fmt"
 
+	rpc "github.com/longhorn/types/pkg/generated/bimrpc"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/longhorn/backing-image-manager/api"
 	"github.com/longhorn/backing-image-manager/pkg/meta"
-	"github.com/longhorn/backing-image-manager/pkg/rpc"
 	"github.com/longhorn/backing-image-manager/pkg/types"
 )
 

diff --git a/pkg/manager/server.go b/pkg/manager/server.go
@@ -8,12 +8,12 @@ import (
 	"os/signal"
 	"syscall"
 
+	rpc "github.com/longhorn/types/pkg/generated/bimrpc"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 
-	"github.com/longhorn/backing-image-manager/pkg/rpc"
 	"github.com/longhorn/backing-image-manager/pkg/sync"
 	"github.com/longhorn/backing-image-manager/pkg/util"
 )

diff --git a/pkg/manager/service.go b/pkg/manager/service.go
@@ -11,25 +11,25 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/ptypes/empty"
+	butil "github.com/longhorn/backupstore/util"
+	rpc "github.com/longhorn/types/pkg/generated/bimrpc"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	butil "github.com/longhorn/backupstore/util"
-
 	"github.com/longhorn/backing-image-manager/api"
 	"github.com/longhorn/backing-image-manager/pkg/backup"
 	"github.com/longhorn/backing-image-manager/pkg/client"
-	"github.com/longhorn/backing-image-manager/pkg/rpc"
 	"github.com/longhorn/backing-image-manager/pkg/types"
 	"github.com/longhorn/backing-image-manager/pkg/util"
 	"github.com/longhorn/backing-image-manager/pkg/util/broadcaster"
 )
 
 type Manager struct {
+	rpc.UnimplementedBackingImageManagerServiceServer
 	ctx context.Context
 
 	syncAddress  string

diff --git a/pkg/manager/version.go b/pkg/manager/version.go
@@ -1,11 +1,11 @@
 package manager
 
 import (
+	rpc "github.com/longhorn/types/pkg/generated/bimrpc"
 	"golang.org/x/net/context"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/longhorn/backing-image-manager/pkg/meta"
-	"github.com/longhorn/backing-image-manager/pkg/rpc"
 )
 
 func (pm *Manager) VersionGet(ctx context.Context, empty *emptypb.Empty) (*rpc.VersionResponse, error) {