From f5ac6a5752140fb8a76c28bcb88f42b9d8fcd416 Mon Sep 17 00:00:00 2001 From: nirav-rafay Date: Fri, 31 Dec 2021 14:45:15 +0530 Subject: [PATCH] resolved review comments --- components/adminsrv/go.mod | 7 +------ components/adminsrv/main.go | 13 ++++++------- components/common/buf.gen.yaml | 2 +- components/common/go.mod | 4 +--- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/components/adminsrv/go.mod b/components/adminsrv/go.mod index 2695651..1d6e1ca 100644 --- a/components/adminsrv/go.mod +++ b/components/adminsrv/go.mod @@ -55,9 +55,4 @@ require ( gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect -) - -replace ( - github.com/RafaySystems/rcloud-base/components/adminsrv v0.0.0-unpublished => /home/infracloud/development/vscode-workspace/rafay/rcloud-base/components/adminsrv/ - github.com/RafaySystems/rcloud-base/components/common v0.0.0-unpublished => /home/infracloud/development/vscode-workspace/rafay/rcloud-base/components/common/ -) +) \ No newline at end of file diff --git a/components/adminsrv/main.go b/components/adminsrv/main.go index e7bcd70..02e669b 100644 --- a/components/adminsrv/main.go +++ b/components/adminsrv/main.go @@ -12,7 +12,6 @@ import ( "github.com/RafaySystems/rcloud-base/components/adminsrv/pkg/service" pbrpcv3 "github.com/RafaySystems/rcloud-base/components/adminsrv/proto/rpc/v3" - rpcv3 "github.com/RafaySystems/rcloud-base/components/adminsrv/proto/rpc/v3" "github.com/RafaySystems/rcloud-base/components/common/pkg/auth/interceptors" authv3 "github.com/RafaySystems/rcloud-base/components/common/pkg/auth/v3" "github.com/RafaySystems/rcloud-base/components/common/pkg/gateway" @@ -172,9 +171,9 @@ func runRPC(wg *sync.WaitGroup, ctx context.Context) { defer ps.Close() defer configPool.Close() - partnerServer := rpcv3.NewPartnerServer(ps) - organizationServer := rpcv3.NewOrganizationServer(os) - projectServer := rpcv3.NewProjectServer(pps) + partnerServer := pbrpcv3.NewPartnerServer(ps) + organizationServer := pbrpcv3.NewOrganizationServer(os) + projectServer := pbrpcv3.NewProjectServer(pps) l, err := net.Listen("tcp", fmt.Sprintf(":%d", rpcPort)) if err != nil { @@ -208,9 +207,9 @@ func runRPC(wg *sync.WaitGroup, ctx context.Context) { _log.Infow("context done") }() - rpcv3.RegisterPartnerServer(s, partnerServer) - rpcv3.RegisterOrganizationServer(s, organizationServer) - rpcv3.RegisterProjectServer(s, projectServer) + pbrpcv3.RegisterPartnerServer(s, partnerServer) + pbrpcv3.RegisterOrganizationServer(s, organizationServer) + pbrpcv3.RegisterProjectServer(s, projectServer) _log.Infow("starting rpc server", "port", rpcPort) err = s.Serve(l) diff --git a/components/common/buf.gen.yaml b/components/common/buf.gen.yaml index 9a15188..511e41e 100644 --- a/components/common/buf.gen.yaml +++ b/components/common/buf.gen.yaml @@ -2,7 +2,7 @@ version: v1 managed: enabled: true go_package_prefix: - default: github.com/RafaySystems/rcloud-base/common + default: github.com/RafaySystems/rcloud-base/components/common except: - buf.build/googleapis/googleapis - buf.build/grpc-ecosystem/grpc-gateway diff --git a/components/common/go.mod b/components/common/go.mod index 1ed7e3b..28bc11c 100644 --- a/components/common/go.mod +++ b/components/common/go.mod @@ -28,6 +28,4 @@ require ( golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect golang.org/x/text v0.3.6 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect -) - -replace github.com/RafaySystems/rcloud-base/components/common/ => ./ +) \ No newline at end of file