From 7e9f65ad1b009989054a10939b497e373e72a88b Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Tue, 15 Feb 2022 11:25:50 -0500 Subject: [PATCH] remove corednsAddrr from token --- logic/accesskeys.go | 1 - models/accessToken.go | 1 - netclient/config/config.go | 1 - servercfg/serverconf.go | 6 ++++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/logic/accesskeys.go b/logic/accesskeys.go index 840ea8bc..bcbf5f50 100644 --- a/logic/accesskeys.go +++ b/logic/accesskeys.go @@ -52,7 +52,6 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models var accessToken models.AccessToken s := servercfg.GetServerConfig() servervals := models.ServerConfig{ - CoreDNSAddr: s.CoreDNSAddr, GRPCConnString: s.GRPCConnString, GRPCSSL: s.GRPCSSL, CheckinInterval: s.CheckinInterval, diff --git a/models/accessToken.go b/models/accessToken.go index cdcb2f96..8e516afd 100644 --- a/models/accessToken.go +++ b/models/accessToken.go @@ -12,7 +12,6 @@ type ClientConfig struct { } type ServerConfig struct { - CoreDNSAddr string `json:"corednsaddr"` GRPCConnString string `json:"grpcconn"` GRPCSSL string `json:"grpcssl"` CheckinInterval string `json:"checkininterval"` diff --git a/netclient/config/config.go b/netclient/config/config.go index f8299df2..5e21f1c6 100644 --- a/netclient/config/config.go +++ b/netclient/config/config.go @@ -184,7 +184,6 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) { cfg.Node.LocalRange = accesstoken.ClientConfig.LocalRange cfg.Server.GRPCSSL = accesstoken.ServerConfig.GRPCSSL cfg.Server.CheckinInterval = accesstoken.ServerConfig.CheckinInterval - cfg.Server.CoreDNSAddr = accesstoken.ServerConfig.CoreDNSAddr if c.String("grpcserver") != "" { cfg.Server.GRPCAddress = c.String("grpcserver") } diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index e169aa17..5ea8b419 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -207,6 +207,8 @@ func GetGRPCConnString() string { conn = os.Getenv("SERVER_GRPC_CONN_STRING") } else if config.Config.Server.GRPCConnString != "" { conn = config.Config.Server.GRPCConnString + } else { + conn = config.Config.Server.GRPCHost + ":" + config.Config.Server.GRPCPort } return conn } @@ -414,8 +416,8 @@ func IsGRPCSSL() bool { if os.Getenv("GRPC_SSL") == "on" { isssl = true } - } else if config.Config.Server.DNSMode != "" { - if config.Config.Server.DNSMode == "on" { + } else if config.Config.Server.GRPCSSL != "" { + if config.Config.Server.GRPCSSL == "on" { isssl = true } }