Skip to content

Commit 3e83482

Browse files
committed
move routerconfig -> router/config
1 parent 9c464b3 commit 3e83482

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

balancers/balancers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"strings"
55

66
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
7-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
7+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
88
)
99

1010
// Deprecated: RoundRobin is RandomChoice now

balancers/balancers_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import (
55

66
"github.com/stretchr/testify/require"
77

8-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/mock"
9-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
10-
118
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
9+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/mock"
10+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
1211
)
1312

1413
func TestPreferLocalDC(t *testing.T) {

balancers/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"fmt"
66

7-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
7+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
88
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
99
)
1010

balancers/config_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55

66
"github.com/stretchr/testify/require"
77

8+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
9+
810
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
9-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
1011
)
1112

1213
func TestFromConfig(t *testing.T) {

config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"google.golang.org/grpc"
1111
grpcCodes "google.golang.org/grpc/codes"
1212

13-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
13+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
1414

1515
"github.com/ydb-platform/ydb-go-sdk/v3/balancers"
1616
"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package routerconfig
2+
3+
// Dedicated package need for prevent cyclo dependencies config -> router -> config
4+
5+
import (
6+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
7+
)
8+
9+
type Config struct {
10+
IsPreferConn PreferConnFunc
11+
AllowFalback bool
12+
SingleConn bool
13+
}
14+
15+
type PreferConnFunc func(c conn.Conn) bool

internal/router/connections_state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"math/rand"
66

77
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
8-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
8+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
99
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xrand"
1010
)
1111

internal/router/connections_state_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77

88
"github.com/stretchr/testify/require"
99

10-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/mock"
11-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
10+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
1211

1312
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
13+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/mock"
1414
)
1515

1616
func TestConnsToNodeIDMap(t *testing.T) {

internal/router/router.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77

88
"google.golang.org/grpc"
99

10-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
11-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/routerconfig"
10+
routerconfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/router/config"
1211

1312
"github.com/ydb-platform/ydb-go-sdk/v3/config"
1413
"github.com/ydb-platform/ydb-go-sdk/v3/discovery"
14+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
1515
discoveryBuilder "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery"
1616
discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery/config"
1717
"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"

internal/routerconfig/routerconfig.go

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)