From 6ac9f7f305c755953e8885079bf86aeaf3a19126 Mon Sep 17 00:00:00 2001 From: Gaius Date: Wed, 22 Mar 2023 15:16:42 +0800 Subject: [PATCH] feat: rename SecurityService to Security (#2206) Signed-off-by: Gaius --- go.mod | 2 +- go.sum | 4 ++-- manager/rpcserver/security_server_v1.go | 2 +- pkg/rpc/manager/client/client_v1.go | 8 ++++---- pkg/rpc/manager/client/client_v2.go | 8 ++++---- pkg/rpc/manager/server/server.go | 4 ++-- pkg/rpc/security/client/v1.go | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 6f31276ac..8f759f7e7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2 go 1.20 require ( - d7y.io/api v1.8.1 + d7y.io/api v1.8.2 github.com/RichardKnop/machinery v1.10.6 github.com/Showmax/go-fqdn v1.0.0 github.com/VividCortex/mysqlerr v1.0.0 diff --git a/go.sum b/go.sum index 25bd4b866..5513dac6f 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -d7y.io/api v1.8.1 h1:eeKZZc5EEMdsk4SMNZ2wBy8tiGbXsNG9dmmMvejFOfE= -d7y.io/api v1.8.1/go.mod h1:xMezpFrEljSfy/LINGkqg07BC2hzXqfTg7pzq5PIIZ8= +d7y.io/api v1.8.2 h1:Sw+PhYMjq70t+wyG2AjhOnU/jJtctLzMs3xPySkAiPw= +d7y.io/api v1.8.2/go.mod h1:xMezpFrEljSfy/LINGkqg07BC2hzXqfTg7pzq5PIIZ8= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= diff --git a/manager/rpcserver/security_server_v1.go b/manager/rpcserver/security_server_v1.go index 6082d5237..bc9537eb4 100644 --- a/manager/rpcserver/security_server_v1.go +++ b/manager/rpcserver/security_server_v1.go @@ -41,7 +41,7 @@ type securityServerV1 struct { } // newSecurityServerV1 returns v1 version of the security server. -func newSecurityServerV1(selfSignedCert *SelfSignedCert) securityv1.CertificateServiceServer { +func newSecurityServerV1(selfSignedCert *SelfSignedCert) securityv1.CertificateServer { return &securityServerV1{ selfSignedCert: selfSignedCert, } diff --git a/pkg/rpc/manager/client/client_v1.go b/pkg/rpc/manager/client/client_v1.go index 0c8b2d02e..fec8a5dc4 100644 --- a/pkg/rpc/manager/client/client_v1.go +++ b/pkg/rpc/manager/client/client_v1.go @@ -67,9 +67,9 @@ func GetV1ByAddr(ctx context.Context, target string, opts ...grpc.DialOption) (V } return &v1{ - ManagerClient: managerv1.NewManagerClient(conn), - CertificateServiceClient: securityv1.NewCertificateServiceClient(conn), - ClientConn: conn, + ManagerClient: managerv1.NewManagerClient(conn), + CertificateClient: securityv1.NewCertificateClient(conn), + ClientConn: conn, }, nil } @@ -120,7 +120,7 @@ type V1 interface { // v1 provides v1 version of the manager grpc function. type v1 struct { managerv1.ManagerClient - securityv1.CertificateServiceClient + securityv1.CertificateClient *grpc.ClientConn } diff --git a/pkg/rpc/manager/client/client_v2.go b/pkg/rpc/manager/client/client_v2.go index fcf15a777..5105e902a 100644 --- a/pkg/rpc/manager/client/client_v2.go +++ b/pkg/rpc/manager/client/client_v2.go @@ -67,9 +67,9 @@ func GetV2ByAddr(ctx context.Context, target string, opts ...grpc.DialOption) (V } return &v2{ - ManagerClient: managerv2.NewManagerClient(conn), - CertificateServiceClient: securityv1.NewCertificateServiceClient(conn), - ClientConn: conn, + ManagerClient: managerv2.NewManagerClient(conn), + CertificateClient: securityv1.NewCertificateClient(conn), + ClientConn: conn, }, nil } @@ -120,7 +120,7 @@ type V2 interface { // v2 provides v2 version of the manager grpc function. type v2 struct { managerv2.ManagerClient - securityv1.CertificateServiceClient + securityv1.CertificateClient *grpc.ClientConn } diff --git a/pkg/rpc/manager/server/server.go b/pkg/rpc/manager/server/server.go index 67b35ce04..584e19abf 100644 --- a/pkg/rpc/manager/server/server.go +++ b/pkg/rpc/manager/server/server.go @@ -58,7 +58,7 @@ const ( ) // New returns grpc server instance and register service on grpc server. -func New(managerServerV1 managerv1.ManagerServer, managerServerV2 managerv2.ManagerServer, securityServer securityv1.CertificateServiceServer, opts ...grpc.ServerOption) *grpc.Server { +func New(managerServerV1 managerv1.ManagerServer, managerServerV2 managerv2.ManagerServer, securityServer securityv1.CertificateServer, opts ...grpc.ServerOption) *grpc.Server { limiter := rpc.NewRateLimiterInterceptor(DefaultQPS, DefaultBurst) grpcServer := grpc.NewServer(append([]grpc.ServerOption{ @@ -92,7 +92,7 @@ func New(managerServerV1 managerv1.ManagerServer, managerServerV2 managerv2.Mana managerv2.RegisterManagerServer(grpcServer, managerServerV2) // Register security on grpc server. - securityv1.RegisterCertificateServiceServer(grpcServer, securityServer) + securityv1.RegisterCertificateServer(grpcServer, securityServer) // Register health on grpc server. healthpb.RegisterHealthServer(grpcServer, health.NewServer()) diff --git a/pkg/rpc/security/client/v1.go b/pkg/rpc/security/client/v1.go index daf5a1a8f..0612e15ab 100644 --- a/pkg/rpc/security/client/v1.go +++ b/pkg/rpc/security/client/v1.go @@ -76,8 +76,8 @@ func GetV1(ctx context.Context, target string, opts ...grpc.DialOption) (V1, err } return &v1{ - CertificateServiceClient: securityv1.NewCertificateServiceClient(conn), - ClientConn: conn, + CertificateClient: securityv1.NewCertificateClient(conn), + ClientConn: conn, }, nil } @@ -106,7 +106,7 @@ type V1 interface { // clientV1 provides v1 version of the manager grpc function. type v1 struct { - securityv1.CertificateServiceClient + securityv1.CertificateClient *grpc.ClientConn } @@ -115,5 +115,5 @@ func (v *v1) IssueCertificate(ctx context.Context, req *securityv1.CertificateRe ctx, cancel := context.WithTimeout(ctx, contextTimeout) defer cancel() - return v.CertificateServiceClient.IssueCertificate(ctx, req, opts...) + return v.CertificateClient.IssueCertificate(ctx, req, opts...) }