achuprov/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Pull requests Activity

Rename unified client constructors

Browse source 
Client constructor `New` will be used as `package.New()`
in external packages. This definition is not very clear
since it can create new structure or new client or whatever.
`package.NewClient()` is quite unambiguous.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-08-24 10:17:03 +03:00 committed by Stanislav Bogatyrev
parent 55a6509e8f
commit 86d56086e3
8 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2/accounting/client.go
View file

@ -62,7 +62,7 @@ func defaultCfg() *cfg {
} }
} }
func New(opts ...Option) (*Client, error) { func NewClient(opts ...Option) (*Client, error) {
cfg := defaultCfg() cfg := defaultCfg()
for i := range opts { for i := range opts {

6
v2/accounting/test/client_test.go
View file

@ -101,7 +101,7 @@ func TestGRPCClient(t *testing.T) {
server: srv, server: srv,
} }
c, err := accounting.New(accounting.WithGRPCServiceClient(cli)) c, err := accounting.NewClient(accounting.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Balance(ctx, new(accounting.BalanceRequest)) resp, err := c.Balance(ctx, new(accounting.BalanceRequest))
@ -114,7 +114,7 @@ func TestGRPCClient(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := accounting.New( c, err := accounting.NewClient(
accounting.WithGRPCServiceClient( accounting.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -141,7 +141,7 @@ func TestGRPCClient(t *testing.T) {
resp.SetMetaHeader(meta) resp.SetMetaHeader(meta)
} }
c, err := accounting.New( c, err := accounting.NewClient(
accounting.WithGRPCServiceClient( accounting.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{

2
v2/container/client.go
View file

@ -172,7 +172,7 @@ func defaultCfg() *cfg {
} }
} }
func New(opts ...Option) (*Client, error) { func NewClient(opts ...Option) (*Client, error) {
cfg := defaultCfg() cfg := defaultCfg()
for i := range opts { for i := range opts {

36
v2/container/test/client_test.go
View file

@ -402,7 +402,7 @@ func TestGRPCClient_Put(t *testing.T) {
server: srv, server: srv,
} }
c, err := container.New(container.WithGRPCServiceClient(cli)) c, err := container.NewClient(container.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Put(ctx, new(container.PutRequest)) resp, err := c.Put(ctx, new(container.PutRequest))
@ -415,7 +415,7 @@ func TestGRPCClient_Put(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -436,7 +436,7 @@ func TestGRPCClient_Put(t *testing.T) {
resp := testPutResponse() resp := testPutResponse()
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -474,7 +474,7 @@ func TestGRPCClient_Get(t *testing.T) {
server: srv, server: srv,
} }
c, err := container.New(container.WithGRPCServiceClient(cli)) c, err := container.NewClient(container.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Get(ctx, new(container.GetRequest)) resp, err := c.Get(ctx, new(container.GetRequest))
@ -487,7 +487,7 @@ func TestGRPCClient_Get(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -508,7 +508,7 @@ func TestGRPCClient_Get(t *testing.T) {
resp := testGetResponse() resp := testGetResponse()
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -546,7 +546,7 @@ func TestGRPCClient_Delete(t *testing.T) {
server: srv, server: srv,
} }
c, err := container.New(container.WithGRPCServiceClient(cli)) c, err := container.NewClient(container.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Delete(ctx, new(container.DeleteRequest)) resp, err := c.Delete(ctx, new(container.DeleteRequest))
@ -559,7 +559,7 @@ func TestGRPCClient_Delete(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -580,7 +580,7 @@ func TestGRPCClient_Delete(t *testing.T) {
resp := testDelResponse() resp := testDelResponse()
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -618,7 +618,7 @@ func TestGRPCClient_List(t *testing.T) {
server: srv, server: srv,
} }
c, err := container.New(container.WithGRPCServiceClient(cli)) c, err := container.NewClient(container.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.List(ctx, new(container.ListRequest)) resp, err := c.List(ctx, new(container.ListRequest))
@ -631,7 +631,7 @@ func TestGRPCClient_List(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -652,7 +652,7 @@ func TestGRPCClient_List(t *testing.T) {
resp := testListResponse() resp := testListResponse()
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -690,7 +690,7 @@ func TestGRPCClient_SetEACL(t *testing.T) {
server: srv, server: srv,
} }
c, err := container.New(container.WithGRPCServiceClient(cli)) c, err := container.NewClient(container.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.SetExtendedACL(ctx, new(container.SetExtendedACLRequest)) resp, err := c.SetExtendedACL(ctx, new(container.SetExtendedACLRequest))
@ -702,7 +702,7 @@ func TestGRPCClient_SetEACL(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -723,7 +723,7 @@ func TestGRPCClient_SetEACL(t *testing.T) {
resp := testSetEACLResponse() resp := testSetEACLResponse()
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -761,7 +761,7 @@ func TestGRPCClient_GetEACL(t *testing.T) {
server: srv, server: srv,
} }
c, err := container.New(container.WithGRPCServiceClient(cli)) c, err := container.NewClient(container.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.GetExtendedACL(ctx, new(container.GetExtendedACLRequest)) resp, err := c.GetExtendedACL(ctx, new(container.GetExtendedACLRequest))
@ -773,7 +773,7 @@ func TestGRPCClient_GetEACL(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -794,7 +794,7 @@ func TestGRPCClient_GetEACL(t *testing.T) {
resp := testGetEACLResponse() resp := testGetEACLResponse()
c, err := container.New( c, err := container.NewClient(
container.WithGRPCServiceClient( container.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{

2
v2/object/client.go
View file

@ -168,7 +168,7 @@ func defaultCfg() *cfg {
} }
} }
func New(opts ...Option) (*Client, error) { func NewClient(opts ...Option) (*Client, error) {
cfg := defaultCfg() cfg := defaultCfg()
for i := range opts { for i := range opts {

18
v2/object/test/client_test.go
View file

@ -274,7 +274,7 @@ func TestGRPCClient_Head(t *testing.T) {
server: srv, server: srv,
} }
c, err := object.New(object.WithGRPCServiceClient(cli)) c, err := object.NewClient(object.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Head(ctx, new(object.HeadRequest)) resp, err := c.Head(ctx, new(object.HeadRequest))
@ -287,7 +287,7 @@ func TestGRPCClient_Head(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := object.New( c, err := object.NewClient(
object.WithGRPCServiceClient( object.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -308,7 +308,7 @@ func TestGRPCClient_Head(t *testing.T) {
resp := testHeadResponse() resp := testHeadResponse()
c, err := object.New( c, err := object.NewClient(
object.WithGRPCServiceClient( object.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -346,7 +346,7 @@ func TestGRPCClient_Delete(t *testing.T) {
server: srv, server: srv,
} }
c, err := object.New(object.WithGRPCServiceClient(cli)) c, err := object.NewClient(object.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Delete(ctx, new(object.DeleteRequest)) resp, err := c.Delete(ctx, new(object.DeleteRequest))
@ -359,7 +359,7 @@ func TestGRPCClient_Delete(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := object.New( c, err := object.NewClient(
object.WithGRPCServiceClient( object.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -380,7 +380,7 @@ func TestGRPCClient_Delete(t *testing.T) {
resp := testDeleteResponse() resp := testDeleteResponse()
c, err := object.New( c, err := object.NewClient(
object.WithGRPCServiceClient( object.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{
@ -418,7 +418,7 @@ func TestGRPCClient_GetRangeHash(t *testing.T) {
server: srv, server: srv,
} }
c, err := object.New(object.WithGRPCServiceClient(cli)) c, err := object.NewClient(object.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.GetRangeHash(ctx, new(object.GetRangeHashRequest)) resp, err := c.GetRangeHash(ctx, new(object.GetRangeHashRequest))
@ -431,7 +431,7 @@ func TestGRPCClient_GetRangeHash(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := object.New( c, err := object.NewClient(
object.WithGRPCServiceClient( object.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -452,7 +452,7 @@ func TestGRPCClient_GetRangeHash(t *testing.T) {
resp := testGetRangeHashResponse() resp := testGetRangeHashResponse()
c, err := object.New( c, err := object.NewClient(
object.WithGRPCServiceClient( object.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{

2
v2/session/client.go
View file

@ -62,7 +62,7 @@ func defaultCfg() *cfg {
} }
} }
func New(opts ...Option) (*Client, error) { func NewClient(opts ...Option) (*Client, error) {
cfg := defaultCfg() cfg := defaultCfg()
for i := range opts { for i := range opts {

6
v2/session/test/client_test.go
View file

@ -97,7 +97,7 @@ func TestGRPCClient(t *testing.T) {
server: srv, server: srv,
} }
c, err := session.New(session.WithGRPCServiceClient(cli)) c, err := session.NewClient(session.WithGRPCServiceClient(cli))
require.NoError(t, err) require.NoError(t, err)
resp, err := c.Create(ctx, new(session.CreateRequest)) resp, err := c.Create(ctx, new(session.CreateRequest))
@ -110,7 +110,7 @@ func TestGRPCClient(t *testing.T) {
require.Error(t, signature.VerifyServiceMessage(req)) require.Error(t, signature.VerifyServiceMessage(req))
c, err := session.New( c, err := session.NewClient(
session.WithGRPCServiceClient( session.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: new(testGRPCServer), server: new(testGRPCServer),
@ -137,7 +137,7 @@ func TestGRPCClient(t *testing.T) {
resp.SetMetaHeader(meta) resp.SetMetaHeader(meta)
} }
c, err := session.New( c, err := session.NewClient(
session.WithGRPCServiceClient( session.WithGRPCServiceClient(
&testGRPCClient{ &testGRPCClient{
server: &testGRPCServer{ server: &testGRPCServer{