From 79d9969aa8b3d19f3f601e7cb369fd3fd4cd5a4e Mon Sep 17 00:00:00 2001 From: gamab Date: Mon, 9 Sep 2024 16:14:02 +0200 Subject: [PATCH] Rename NewResourceClient funcs --- pkg/services/apiserver/service.go | 4 ++-- pkg/storage/unified/resource/client.go | 4 ++-- pkg/storage/unified/sql/test/integration_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go index 3e0d98d3a8b..26bc18ed2eb 100644 --- a/pkg/services/apiserver/service.go +++ b/pkg/services/apiserver/service.go @@ -545,9 +545,9 @@ func (s *service) running(ctx context.Context) error { func newResourceClient(conn *grpc.ClientConn, cfg *setting.Cfg) (resource.ResourceStoreClient, error) { if cfg.StackID != "" { - return resource.NewResourceClientCloud(conn, cfg) + return resource.NewCloudResourceClient(conn, cfg) } - return resource.NewResourceClientGRPC(conn) + return resource.NewGRPCResourceClient(conn) } func ensureKubeConfig(restConfig *clientrest.Config, dir string) error { diff --git a/pkg/storage/unified/resource/client.go b/pkg/storage/unified/resource/client.go index 466a31cf994..79527dd11f5 100644 --- a/pkg/storage/unified/resource/client.go +++ b/pkg/storage/unified/resource/client.go @@ -44,7 +44,7 @@ func NewLocalResourceClient(server ResourceStoreServer) ResourceStoreClient { return NewResourceStoreClient(grpchan.InterceptClientConn(channel, clientInt.UnaryClientInterceptor, clientInt.StreamClientInterceptor)) } -func NewResourceClientGRPC(conn *grpc.ClientConn) (ResourceStoreClient, error) { +func NewGRPCResourceClient(conn *grpc.ClientConn) (ResourceStoreClient, error) { // scenario: remote on-prem clientInt, err := authnlib.NewGrpcClientInterceptor( &authnlib.GrpcClientConfig{}, @@ -59,7 +59,7 @@ func NewResourceClientGRPC(conn *grpc.ClientConn) (ResourceStoreClient, error) { return NewResourceStoreClient(grpchan.InterceptClientConn(conn, clientInt.UnaryClientInterceptor, clientInt.StreamClientInterceptor)), nil } -func NewResourceClientCloud(conn *grpc.ClientConn, cfg *setting.Cfg) (ResourceStoreClient, error) { +func NewCloudResourceClient(conn *grpc.ClientConn, cfg *setting.Cfg) (ResourceStoreClient, error) { // scenario: remote cloud grpcClientConfig := clientCfgMapping(grpcutils.ReadGrpcClientConfig(cfg)) diff --git a/pkg/storage/unified/sql/test/integration_test.go b/pkg/storage/unified/sql/test/integration_test.go index d27c8d91b57..c1d0bc0c50c 100644 --- a/pkg/storage/unified/sql/test/integration_test.go +++ b/pkg/storage/unified/sql/test/integration_test.go @@ -357,7 +357,7 @@ func TestClientServer(t *testing.T) { t.Run("Create a client", func(t *testing.T) { conn, err := grpc.NewClient(svc.GetAddress(), grpc.WithTransportCredentials(insecure.NewCredentials())) require.NoError(t, err) - client, err = resource.NewResourceClientGRPC(conn) + client, err = resource.NewGRPCResourceClient(conn) require.NoError(t, err) })