Move to relay address config to object

Add test for mgm config parser

management/server/config.go

@@ -32,10 +32,10 @@ const (
 
 // Config of the Management service
 type Config struct {
-	Stuns        []*Host
-	TURNConfig   *TURNConfig
-	RelayAddress string
-	Signal       *Host
+	Stuns       []*Host
+	TURNConfig  *TURNConfig
+	RelayConfig *RelayConfig
+	Signal      *Host
 
 	Datadir                string
 	DataStoreEncryptionKey string
@@ -72,6 +72,10 @@ type TURNConfig struct {
 	Turns                []*Host
 }
 
+type RelayConfig struct {
+	Address string
+}
+
 // HttpServerConfig is a config of the HTTP Management service server
 type HttpServerConfig struct {
 	LetsEncryptDomain string

management/server/grpcserver.go

@@ -518,9 +518,9 @@ func toWiretrusteeConfig(config *Config, turnCredentials *TURNRelayToken, relayT
 	}
 
 	var relayCfg *proto.RelayConfig
-	if config.RelayAddress != "" {
+	if config.RelayConfig != nil && config.RelayConfig.Address != "" {
 		relayCfg = &proto.RelayConfig{
-			Urls: []string{config.RelayAddress},
+			Urls: []string{config.RelayConfig.Address},
 		}
 
 		if relayToken != nil {

management/server/token_mgr.go

@@ -31,12 +31,17 @@ type TimeBasedAuthSecretsManager struct {
 
 type TURNRelayToken auth.Token
 
-func NewTimeBasedAuthSecretsManager(updateManager *PeersUpdateManager, turnCfg *TURNConfig, relayAddress string) *TimeBasedAuthSecretsManager {
+func NewTimeBasedAuthSecretsManager(updateManager *PeersUpdateManager, turnCfg *TURNConfig, relayConfig *RelayConfig) *TimeBasedAuthSecretsManager {
+
+	var relayAddr string
+	if relayConfig != nil {
+		relayAddr = relayConfig.Address
+	}
 	return &TimeBasedAuthSecretsManager{
 		mux:           sync.Mutex{},
 		updateManager: updateManager,
 		turnCfg:       turnCfg,
-		relayAddr:     relayAddress,
+		relayAddr:     relayAddr,
 		hmacToken:     auth.NewTimedHMAC(turnCfg.Secret, turnCfg.CredentialsTTL.Duration),
 		cancelMap:     make(map[string]chan struct{}),
 	}