TrueCloudLab/frostfs-testcases
26
0
Fork 21
Code Issues 2 Pull requests 3 Releases Activity Actions

[#1351] cli: Fix connection scheme loss during endpoint parsing

Browse source 
In previous implementation NeoFS CLI app used `network.Address.HostAddr`
as a server URI, which caused scheme loss since host address doesn't
contain it.

Rename `HostAddr` to `URIAddr` and make it to return URI address with
`grpcs` scheme if TLS is enabled. Make `TLSEnabled` unexported since it
was used to provide default `tls.Config` only (it is used by default in
SDK).

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-05-04 15:34:26 +03:00 • committed by LeL
parent 3a44010180
commit cd545f0160
11 changed files with 39 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/neofs-node/config/node/config_test.go
View file

@ -89,12 +89,10 @@ func TestNodeSection(t *testing.T) {
expectedAddr := []struct {
str string
host string
tls bool
}{
{
str: "/dns4/localhost/tcp/8083/tls",
host: "localhost:8083",
tls: true,
host: "grpcs://localhost:8083",
},
{
str: "/dns4/s01.neofs.devenv/tcp/8080",
@ -118,8 +116,7 @@ func TestNodeSection(t *testing.T) {
addrs.IterateAddresses(func(addr network.Address) bool {
require.Equal(t, expectedAddr[ind].str, addr.String())
require.Equal(t, expectedAddr[ind].host, addr.HostAddr())
require.Equal(t, expectedAddr[ind].tls, addr.TLSEnabled())
require.Equal(t, expectedAddr[ind].host, addr.URIAddr())
ind++