From 2e3bc90c2ac75dda3ea5c2ce086a99e8cef0086d Mon Sep 17 00:00:00 2001 From: nickolasdaniel Date: Wed, 14 Jul 2021 13:47:26 +0300 Subject: [PATCH] Changed RemoteHost struct fields in order to match its corresponding fields in config --- config/rpcconn.go | 112 +++++++------- config/rpcconn_test.go | 330 ++++++++++++++++++++--------------------- 2 files changed, 221 insertions(+), 221 deletions(-) diff --git a/config/rpcconn.go b/config/rpcconn.go index 54c3b9449..189d209ad 100644 --- a/config/rpcconn.go +++ b/config/rpcconn.go @@ -156,18 +156,18 @@ func (rC RPCConn) Clone() (cln *RPCConn) { // RemoteHost connection config type RemoteHost struct { - ID string - Address string - Transport string - Synchronous bool - TLS bool - KeyPath string - CertPath string - CaPath string - ConnAttempts int - Reconnects int - ConnectTimeout time.Duration - ReplyTimeout time.Duration + ID string + Address string + Transport string + Synchronous bool + ConnectAttempts int + Reconnects int + ConnectTimeout time.Duration + ReplyTimeout time.Duration + TLS bool + ClientKey string + ClientCertificate string + CaCertificate string } func (rh *RemoteHost) loadFromJSONCfg(jsnCfg *RemoteHostJson) (err error) { @@ -193,16 +193,16 @@ func (rh *RemoteHost) loadFromJSONCfg(jsnCfg *RemoteHostJson) (err error) { rh.TLS = *jsnCfg.Tls } if jsnCfg.Client_key != nil { - rh.KeyPath = *jsnCfg.Client_key + rh.ClientKey = *jsnCfg.Client_key } if jsnCfg.Client_certificate != nil { - rh.CertPath = *jsnCfg.Client_certificate + rh.ClientCertificate = *jsnCfg.Client_certificate } if jsnCfg.Ca_certificate != nil { - rh.CaPath = *jsnCfg.Ca_certificate + rh.CaCertificate = *jsnCfg.Ca_certificate } if jsnCfg.Connect_attempts != nil { - rh.ConnAttempts = *jsnCfg.Connect_attempts + rh.ConnectAttempts = *jsnCfg.Connect_attempts } if jsnCfg.Reconnects != nil { rh.Reconnects = *jsnCfg.Reconnects @@ -235,17 +235,17 @@ func (rh *RemoteHost) AsMapInterface() (mp map[string]interface{}) { if rh.TLS { mp[utils.TLSNoCaps] = rh.TLS } - if rh.KeyPath != utils.EmptyString { - mp[utils.KeyPathCgr] = rh.KeyPath + if rh.ClientKey != utils.EmptyString { + mp[utils.KeyPathCgr] = rh.ClientKey } - if rh.CertPath != utils.EmptyString { - mp[utils.CertPathCgr] = rh.CertPath + if rh.ClientCertificate != utils.EmptyString { + mp[utils.CertPathCgr] = rh.ClientCertificate } - if rh.CaPath != utils.EmptyString { - mp[utils.CAPathCgr] = rh.CaPath + if rh.CaCertificate != utils.EmptyString { + mp[utils.CAPathCgr] = rh.CaCertificate } - if rh.ConnAttempts != 0 { - mp[utils.ConnectAttemptsCfg] = rh.ConnAttempts + if rh.ConnectAttempts != 0 { + mp[utils.ConnectAttemptsCfg] = rh.ConnectAttempts } if rh.Reconnects != 0 { mp[utils.ReconnectsCfg] = rh.Reconnects @@ -262,18 +262,18 @@ func (rh *RemoteHost) AsMapInterface() (mp map[string]interface{}) { // Clone returns a deep copy of RemoteHost func (rh RemoteHost) Clone() (cln *RemoteHost) { return &RemoteHost{ - ID: rh.ID, - Address: rh.Address, - Transport: rh.Transport, - Synchronous: rh.Synchronous, - TLS: rh.TLS, - KeyPath: rh.KeyPath, - CertPath: rh.CertPath, - CaPath: rh.CaPath, - ConnAttempts: rh.ConnAttempts, - Reconnects: rh.Reconnects, - ConnectTimeout: rh.ConnectTimeout, - ReplyTimeout: rh.ReplyTimeout, + ID: rh.ID, + Address: rh.Address, + Transport: rh.Transport, + Synchronous: rh.Synchronous, + TLS: rh.TLS, + ClientKey: rh.ClientKey, + ClientCertificate: rh.ClientCertificate, + CaCertificate: rh.CaCertificate, + ConnectAttempts: rh.ConnectAttempts, + Reconnects: rh.Reconnects, + ConnectTimeout: rh.ConnectTimeout, + ReplyTimeout: rh.ReplyTimeout, } } @@ -292,10 +292,10 @@ func UpdateRPCCons(rpcConns RPCConns, newHosts map[string]*RemoteHost) (connIDs rh.Transport = newHost.Transport rh.Synchronous = newHost.Synchronous rh.TLS = newHost.TLS - rh.KeyPath = newHost.KeyPath - rh.CertPath = newHost.CertPath - rh.CaPath = newHost.CaPath - rh.ConnAttempts = newHost.ConnAttempts + rh.ClientKey = newHost.ClientKey + rh.ClientCertificate = newHost.ClientCertificate + rh.CaCertificate = newHost.CaCertificate + rh.ConnectAttempts = newHost.ConnectAttempts rh.Reconnects = newHost.Reconnects rh.ConnectTimeout = newHost.ConnectTimeout rh.ReplyTimeout = newHost.ReplyTimeout @@ -318,10 +318,10 @@ func RemoveRPCCons(rpcConns RPCConns, hosts utils.StringSet) (connIDs utils.Stri rh.Transport = "" rh.Synchronous = false rh.TLS = false - rh.KeyPath = "" - rh.CertPath = "" - rh.CaPath = "" - rh.ConnAttempts = 0 + rh.ClientKey = "" + rh.ClientCertificate = "" + rh.CaCertificate = "" + rh.ConnectAttempts = 0 rh.Reconnects = 0 rh.ConnectTimeout = 0 rh.ReplyTimeout = 0 @@ -363,17 +363,17 @@ func diffRemoteHostJson(v1, v2 *RemoteHost) (d *RemoteHostJson) { if v1.TLS != v2.TLS { d.Tls = utils.BoolPointer(v2.TLS) } - if v1.KeyPath != v2.KeyPath { - d.Client_key = utils.StringPointer(v2.KeyPath) + if v1.ClientKey != v2.ClientKey { + d.Client_key = utils.StringPointer(v2.ClientKey) } - if v1.CertPath != v2.CertPath { - d.Client_certificate = utils.StringPointer(v2.CertPath) + if v1.ClientCertificate != v2.ClientCertificate { + d.Client_certificate = utils.StringPointer(v2.ClientCertificate) } - if v1.CaPath != v2.CaPath { - d.Ca_certificate = utils.StringPointer(v2.CaPath) + if v1.ClientCertificate != v2.ClientCertificate { + d.Ca_certificate = utils.StringPointer(v2.CaCertificate) } - if v1.ConnAttempts != v2.ConnAttempts { - d.Connect_attempts = utils.IntPointer(v2.ConnAttempts) + if v1.ConnectAttempts != v2.ConnectAttempts { + d.Connect_attempts = utils.IntPointer(v2.ConnectAttempts) } if v1.Reconnects != v2.Reconnects { d.Reconnects = utils.IntPointer(v2.Reconnects) @@ -424,10 +424,10 @@ func equalsRemoteHosts(v1, v2 []*RemoteHost) bool { v1[i].Transport != v2[i].Transport || v1[i].Synchronous != v2[i].Synchronous || v1[i].TLS != v2[i].TLS || - v1[i].KeyPath != v2[i].KeyPath || - v1[i].CertPath != v2[i].CertPath || - v1[i].CaPath != v2[i].CaPath || - v1[i].ConnAttempts != v2[i].ConnAttempts || + v1[i].ClientKey != v2[i].ClientKey || + v1[i].ClientCertificate != v2[i].ClientCertificate || + v1[i].CaCertificate != v2[i].CaCertificate || + v1[i].ConnectAttempts != v2[i].ConnectAttempts || v1[i].Reconnects != v2[i].Reconnects || v1[i].ConnectTimeout != v2[i].ConnectTimeout || v1[i].ReplyTimeout != v2[i].ReplyTimeout { diff --git a/config/rpcconn_test.go b/config/rpcconn_test.go index a247d120d..e16fb790c 100644 --- a/config/rpcconn_test.go +++ b/config/rpcconn_test.go @@ -86,17 +86,17 @@ func TestRPCConnsloadFromJsonCfgCase1(t *testing.T) { PoolSize: 1, Conns: []*RemoteHost{ { - Address: "127.0.0.1:2012", - Transport: "*json", - Synchronous: false, - TLS: false, - KeyPath: "key_path", - CertPath: "cert_path", - CaPath: "ca_path", - ConnAttempts: 5, - Reconnects: 2, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + Address: "127.0.0.1:2012", + Transport: "*json", + Synchronous: false, + ConnectAttempts: 5, + Reconnects: 2, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "key_path", + ClientCertificate: "cert_path", + CaCertificate: "ca_path", }, }, }, @@ -150,17 +150,17 @@ func TestRPCConnsloadFromJsonCfgCase2(t *testing.T) { PoolSize: 0, Conns: []*RemoteHost{ { - Address: "127.0.0.1:2012", - Transport: "*json", - Synchronous: false, - TLS: false, - KeyPath: "", - CertPath: "", - CaPath: "", - ConnAttempts: 0, - Reconnects: 0, - ConnectTimeout: 0 * time.Minute, - ReplyTimeout: 0 * time.Minute, + Address: "127.0.0.1:2012", + Transport: "*json", + Synchronous: false, + TLS: false, + ConnectAttempts: 0, + Reconnects: 0, + ConnectTimeout: 0 * time.Minute, + ReplyTimeout: 0 * time.Minute, + ClientKey: "", + ClientCertificate: "", + CaCertificate: "", }, }, }, @@ -335,17 +335,17 @@ func TestRPCConnsClone(t *testing.T) { PoolSize: 1, Conns: []*RemoteHost{ { - Address: "127.0.0.1:2012", - Transport: "*json", - Synchronous: false, - TLS: false, - KeyPath: "", - CertPath: "", - CaPath: "", - ConnAttempts: 0, - Reconnects: 0, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + Address: "127.0.0.1:2012", + Transport: "*json", + Synchronous: false, + ConnectAttempts: 0, + Reconnects: 0, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "", + ClientCertificate: "", + CaCertificate: "", }, }, }, @@ -385,18 +385,18 @@ func TestUpdateRPCCons(t *testing.T) { newHosts := map[string]*RemoteHost{ "RPC1": { - ID: "RPC1", - Address: utils.MetaInternal, - Transport: utils.EmptyString, - Synchronous: true, - TLS: true, - KeyPath: "key", - CertPath: "cert", - CaPath: "ca", - ConnAttempts: 2, - Reconnects: 2, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "RPC1", + Address: utils.MetaInternal, + Transport: utils.EmptyString, + Synchronous: true, + ConnectAttempts: 2, + Reconnects: 2, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: true, + ClientKey: "key", + ClientCertificate: "cert", + CaCertificate: "ca", }, } expectedID := utils.StringSet{utils.MetaInternal: {}} @@ -406,18 +406,18 @@ func TestUpdateRPCCons(t *testing.T) { PoolSize: 0, Conns: []*RemoteHost{ { - ID: "RPC1", - Address: utils.MetaInternal, - Transport: utils.EmptyString, - Synchronous: true, - TLS: true, - KeyPath: "key", - CertPath: "cert", - CaPath: "ca", - ConnAttempts: 2, - Reconnects: 2, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "RPC1", + Address: utils.MetaInternal, + Transport: utils.EmptyString, + Synchronous: true, + ConnectAttempts: 2, + Reconnects: 2, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: true, + ClientKey: "key", + ClientCertificate: "cert", + CaCertificate: "ca", }, { ID: "RPC2", @@ -451,18 +451,18 @@ func TestRemoveRPCCons(t *testing.T) { TLS: false, }, { - ID: "RPC2", - Address: utils.MetaInternal, - Transport: utils.EmptyString, - Synchronous: false, - TLS: false, - KeyPath: "key", - CertPath: "cert", - CaPath: "ca", - ConnAttempts: 2, - Reconnects: 2, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "RPC2", + Address: utils.MetaInternal, + Transport: utils.EmptyString, + Synchronous: false, + ConnectAttempts: 2, + Reconnects: 2, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "key", + ClientCertificate: "cert", + CaCertificate: "ca", }, }, }, @@ -500,18 +500,18 @@ func TestDiffRPCConnJson(t *testing.T) { PoolSize: 2, Conns: []*RemoteHost{ { - ID: "host1_ID", - Address: "127.0.0.1:8080", - Transport: "tcp", - Synchronous: false, - TLS: false, - KeyPath: "key1", - CertPath: "path1", - CaPath: "ca_path1", - ConnAttempts: 2, - Reconnects: 5, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "host1_ID", + Address: "127.0.0.1:8080", + Transport: "tcp", + Synchronous: false, + ConnectAttempts: 2, + Reconnects: 5, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "key1", + ClientCertificate: "path1", + CaCertificate: "ca_path1", }, }, } @@ -521,18 +521,18 @@ func TestDiffRPCConnJson(t *testing.T) { PoolSize: 3, Conns: []*RemoteHost{ { - ID: "host2_ID", - Address: "0.0.0.0:8080", - Transport: "udp", - Synchronous: true, - TLS: true, - KeyPath: "key2", - CertPath: "path2", - CaPath: "ca_path2", - ConnAttempts: 3, - Reconnects: 4, - ConnectTimeout: 2 * time.Minute, - ReplyTimeout: 2 * time.Minute, + ID: "host2_ID", + Address: "0.0.0.0:8080", + Transport: "udp", + Synchronous: true, + ConnectAttempts: 3, + Reconnects: 4, + ConnectTimeout: 2 * time.Minute, + ReplyTimeout: 2 * time.Minute, + TLS: true, + ClientKey: "key2", + ClientCertificate: "path2", + CaCertificate: "ca_path2", }, }, } @@ -591,35 +591,35 @@ func TestDiffRPCConnJson(t *testing.T) { func TestEqualsRemoteHosts(t *testing.T) { v1 := []*RemoteHost{ { - ID: "host1_ID", - Address: "127.0.0.1:8080", - Transport: "tcp", - Synchronous: false, - TLS: false, - KeyPath: "key1", - CertPath: "path1", - CaPath: "ca_path1", - ConnAttempts: 2, - Reconnects: 5, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "host1_ID", + Address: "127.0.0.1:8080", + Transport: "tcp", + Synchronous: false, + ConnectAttempts: 2, + Reconnects: 5, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "key1", + ClientCertificate: "path1", + CaCertificate: "ca_path1", }, } v2 := []*RemoteHost{ { - ID: "host2_ID", - Address: "0.0.0.0:8080", - Transport: "udp", - Synchronous: true, - TLS: true, - KeyPath: "key2", - CertPath: "path2", - CaPath: "ca_path2", - ConnAttempts: 3, - Reconnects: 4, - ConnectTimeout: 2 * time.Minute, - ReplyTimeout: 2 * time.Minute, + ID: "host2_ID", + Address: "0.0.0.0:8080", + Transport: "udp", + Synchronous: true, + ConnectAttempts: 3, + Reconnects: 4, + ConnectTimeout: 2 * time.Minute, + ReplyTimeout: 2 * time.Minute, + TLS: true, + ClientKey: "key2", + ClientCertificate: "path2", + CaCertificate: "ca_path2", }, } @@ -644,18 +644,18 @@ func TestEqualsRPCConn(t *testing.T) { PoolSize: 2, Conns: []*RemoteHost{ { - ID: "host1_ID", - Address: "127.0.0.1:8080", - Transport: "tcp", - Synchronous: false, - TLS: false, - KeyPath: "key1", - CertPath: "path1", - CaPath: "ca_path1", - ConnAttempts: 2, - Reconnects: 5, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "host1_ID", + Address: "127.0.0.1:8080", + Transport: "tcp", + Synchronous: false, + ConnectAttempts: 2, + Reconnects: 5, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "key1", + ClientCertificate: "path1", + CaCertificate: "ca_path1", }, }, } @@ -665,18 +665,18 @@ func TestEqualsRPCConn(t *testing.T) { PoolSize: 3, Conns: []*RemoteHost{ { - ID: "host2_ID", - Address: "0.0.0.0:8080", - Transport: "udp", - Synchronous: true, - TLS: true, - KeyPath: "key2", - CertPath: "path2", - CaPath: "ca_path2", - ConnAttempts: 3, - Reconnects: 4, - ConnectTimeout: 2 * time.Minute, - ReplyTimeout: 2 * time.Minute, + ID: "host2_ID", + Address: "0.0.0.0:8080", + Transport: "udp", + Synchronous: true, + ConnectAttempts: 3, + Reconnects: 4, + ConnectTimeout: 2 * time.Minute, + ReplyTimeout: 2 * time.Minute, + TLS: true, + ClientKey: "key2", + ClientCertificate: "path2", + CaCertificate: "ca_path2", }, }, } @@ -705,18 +705,18 @@ func TestDiffRPCConnsJson(t *testing.T) { PoolSize: 2, Conns: []*RemoteHost{ { - ID: "host1_ID", - Address: "127.0.0.1:8080", - Transport: "tcp", - Synchronous: false, - TLS: false, - KeyPath: "key1", - CertPath: "path1", - CaPath: "ca_path1", - ConnAttempts: 2, - Reconnects: 5, - ConnectTimeout: 1 * time.Minute, - ReplyTimeout: 1 * time.Minute, + ID: "host1_ID", + Address: "127.0.0.1:8080", + Transport: "tcp", + Synchronous: false, + ConnectAttempts: 2, + Reconnects: 5, + ConnectTimeout: 1 * time.Minute, + ReplyTimeout: 1 * time.Minute, + TLS: false, + ClientKey: "key1", + ClientCertificate: "path1", + CaCertificate: "ca_path1", }, }, }, @@ -728,18 +728,18 @@ func TestDiffRPCConnsJson(t *testing.T) { PoolSize: 3, Conns: []*RemoteHost{ { - ID: "host2_ID", - Address: "0.0.0.0:8080", - Transport: "udp", - Synchronous: true, - TLS: true, - KeyPath: "key2", - CertPath: "path2", - CaPath: "ca_path2", - ConnAttempts: 3, - Reconnects: 4, - ConnectTimeout: 2 * time.Minute, - ReplyTimeout: 2 * time.Minute, + ID: "host2_ID", + Address: "0.0.0.0:8080", + Transport: "udp", + Synchronous: true, + ConnectAttempts: 3, + Reconnects: 4, + ConnectTimeout: 2 * time.Minute, + ReplyTimeout: 2 * time.Minute, + TLS: true, + ClientKey: "key2", + ClientCertificate: "path2", + CaCertificate: "ca_path2", }, }, },