gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-29 00:14:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

remove commented out code

Browse source
This commit is contained in:
Matthew R. Kasun 2022-02-15 08:10:51 -05:00
parent 950ce4b4da
commit 5e3654faa9
3 changed files with 4 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
logic/accesskeys.go
View file

@ -52,13 +52,8 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
var accessToken models.AccessToken var accessToken models.AccessToken
s := servercfg.GetServerConfig() s := servercfg.GetServerConfig()
servervals := models.ServerConfig{ servervals := models.ServerConfig{
CoreDNSAddr: s.CoreDNSAddr, CoreDNSAddr: s.CoreDNSAddr,
//APIConnString: s.APIConnString, GRPCConnString: s.GRPCConnString,
//APIHost: s.APIHost,
//APIPort: s.APIPort,
GRPCConnString: s.GRPCConnString,
//GRPCHost: s.GRPCHost,
//GRPCPort: s.GRPCPort,
GRPCSSL: s.GRPCSSL, GRPCSSL: s.GRPCSSL,
CheckinInterval: s.CheckinInterval, CheckinInterval: s.CheckinInterval,
} }

18
models/accessToken.go
View file

@ -3,7 +3,6 @@ package models
type AccessToken struct { type AccessToken struct {
ServerConfig ServerConfig
ClientConfig ClientConfig
//WG
} }
type ClientConfig struct { type ClientConfig struct {
@ -13,21 +12,8 @@ type ClientConfig struct {
} }
type ServerConfig struct { type ServerConfig struct {
CoreDNSAddr string `json:"corednsaddr"` CoreDNSAddr string `json:"corednsaddr"`
//APIConnString string `json:"apiconn"` GRPCConnString string `json:"grpcconn"`
//APIHost string `json:"apihost"`
//APIPort string `json:"apiport"`
GRPCConnString string `json:"grpcconn"`
//GRPCHost string `json:"grpchost"`
//GRPCPort string `json:"grpcport"`
GRPCSSL string `json:"grpcssl"` GRPCSSL string `json:"grpcssl"`
CheckinInterval string `json:"checkininterval"` CheckinInterval string `json:"checkininterval"`
} }
type WG struct {
GRPCWireGuard string `json:"grpcwg"`
GRPCWGAddress string `json:"grpcwgaddr"`
GRPCWGPort string `json:"grpcwgport"`
GRPCWGPubKey string `json:"grpcwgpubkey"`
GRPCWGEndpoint string `json:"grpcwgendpoint"`
}

20
netclient/config/config.go
View file

@ -36,7 +36,6 @@ type ClientConfig struct {
type ServerConfig struct { type ServerConfig struct {
CoreDNSAddr string `yaml:"corednsaddr"` CoreDNSAddr string `yaml:"corednsaddr"`
GRPCAddress string `yaml:"grpcaddress"` GRPCAddress string `yaml:"grpcaddress"`
APIAddress string `yaml:"apiaddress"`
AccessKey string `yaml:"accesskey"` AccessKey string `yaml:"accesskey"`
GRPCSSL string `yaml:"grpcssl"` GRPCSSL string `yaml:"grpcssl"`
GRPCWireGuard string `yaml:"grpcwg"` GRPCWireGuard string `yaml:"grpcwg"`
@ -175,22 +174,8 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
return cfg, "", err return cfg, "", err
} }
//if accesstoken.ServerConfig.APIConnString != "" {
// cfg.Server.APIAddress = accesstoken.ServerConfig.APIConnString
//} else {
// cfg.Server.APIAddress = accesstoken.ServerConfig.APIHost
// if accesstoken.ServerConfig.APIPort != "" {
// cfg.Server.APIAddress = cfg.Server.APIAddress + ":" + accesstoken.ServerConfig.APIPort
// }
//}
if accesstoken.ServerConfig.GRPCConnString != "" { if accesstoken.ServerConfig.GRPCConnString != "" {
cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCConnString cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCConnString
//} else {
// cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCHost
// if accesstoken.ServerConfig.GRPCPort != "" {
// cfg.Server.GRPCAddress = cfg.Server.GRPCAddress + ":" + accesstoken.ServerConfig.GRPCPort
// }
} }
cfg.Network = accesstoken.ClientConfig.Network cfg.Network = accesstoken.ClientConfig.Network
@ -199,14 +184,10 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
cfg.Node.LocalRange = accesstoken.ClientConfig.LocalRange cfg.Node.LocalRange = accesstoken.ClientConfig.LocalRange
cfg.Server.GRPCSSL = accesstoken.ServerConfig.GRPCSSL cfg.Server.GRPCSSL = accesstoken.ServerConfig.GRPCSSL
cfg.Server.CheckinInterval = accesstoken.ServerConfig.CheckinInterval cfg.Server.CheckinInterval = accesstoken.ServerConfig.CheckinInterval
//cfg.Server.GRPCWireGuard = accesstoken.WG.GRPCWireGuard
cfg.Server.CoreDNSAddr = accesstoken.ServerConfig.CoreDNSAddr cfg.Server.CoreDNSAddr = accesstoken.ServerConfig.CoreDNSAddr
if c.String("grpcserver") != "" { if c.String("grpcserver") != "" {
cfg.Server.GRPCAddress = c.String("grpcserver") cfg.Server.GRPCAddress = c.String("grpcserver")
} }
if c.String("apiserver") != "" {
cfg.Server.APIAddress = c.String("apiserver")
}
if c.String("key") != "" { if c.String("key") != "" {
cfg.Server.AccessKey = c.String("key") cfg.Server.AccessKey = c.String("key")
} }
@ -232,7 +213,6 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
} else { } else {
cfg.Server.GRPCAddress = c.String("grpcserver") cfg.Server.GRPCAddress = c.String("grpcserver")
cfg.Server.APIAddress = c.String("apiserver")
cfg.Server.AccessKey = c.String("key") cfg.Server.AccessKey = c.String("key")
cfg.Network = c.String("network") cfg.Network = c.String("network")
cfg.Node.Network = c.String("network") cfg.Node.Network = c.String("network")