github/paralus
1
0
Fork 0
mirror of https://github.com/paralus/paralus.git synced 2026-03-04 18:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved review comments

Browse Source
This commit is contained in:
nirav-rafay
2021-12-31 14:45:15 +05:30
parent adc5532cf6
commit f5ac6a5752
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/adminsrv/go.mod
View File

@@ -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/
)
)

13
components/adminsrv/main.go
View File

@@ -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)

2
components/common/buf.gen.yaml
View File

@@ -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

4
components/common/go.mod
View File

@@ -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/ => ./
)