Refactor: disco service (#1194)

apache · Jan 11, 2022 · 339a0b0 · 339a0b0
1 parent 11cabb3
commit 339a0b0
Show file tree

Hide file tree

Showing 86 changed files with 6,471 additions and 7,971 deletions.
diff --git a/datasource/common.go b/datasource/common.go
@@ -17,11 +17,6 @@
 
 package datasource
 
-import (
-	pb "github.com/go-chassis/cari/discovery"
-	"github.com/go-chassis/cari/pkg/errsvc"
-)
-
 const (
 	SPLIT                 = "/"
 	ServiceKeyPrefix      = "/cse-sr/ms/files"
@@ -41,16 +36,3 @@ const (
 	ResourceHeartbeat    = "heartbeat"
 	ResourceHeartbeatSet = "heartbeatSet"
 )
-
-// WrapErrResponse is temp func here to wait finish to refact the discosvc pkg
-func WrapErrResponse(respErr error) (*pb.Response, error) {
-	err, ok := respErr.(*errsvc.Error)
-	if !ok {
-		return pb.CreateResponse(pb.ErrInternal, err.Error()), err
-	}
-	resp := pb.CreateResponseWithSCErr(err)
-	if err.InternalError() {
-		return resp, err
-	}
-	return resp, nil
-}
diff --git a/datasource/dep.go b/datasource/dep.go
@@ -27,8 +27,8 @@ const AllVersions = "0.0.0+"
 
 // DependencyManager contains the CRUD of microservice dependencies
 type DependencyManager interface {
-	SearchProviderDependency(ctx context.Context, request *pb.GetDependenciesRequest) (*pb.GetProDependenciesResponse, error)
-	SearchConsumerDependency(ctx context.Context, request *pb.GetDependenciesRequest) (*pb.GetConDependenciesResponse, error)
-	AddOrUpdateDependencies(ctx context.Context, dependencyInfos []*pb.ConsumerDependency, override bool) (*pb.Response, error)
+	ListConsumers(ctx context.Context, request *pb.GetDependenciesRequest) (*pb.GetProDependenciesResponse, error)
+	ListProviders(ctx context.Context, request *pb.GetDependenciesRequest) (*pb.GetConDependenciesResponse, error)
+	PutDependencies(ctx context.Context, dependencyInfos []*pb.ConsumerDependency, override bool) error
 	DependencyHandle(ctx context.Context) error
 }