From 6ab7efb358ddb624801f0f34a5c84743a5679233 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Tue, 1 Jun 2021 20:50:46 +0300 Subject: [PATCH] [#577] cmd/node: Use new config for node configuration Signed-off-by: Pavel Karpy --- cmd/neofs-node/attributes.go | 22 ++++------------------ cmd/neofs-node/config.go | 20 +++++--------------- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/cmd/neofs-node/attributes.go b/cmd/neofs-node/attributes.go index 4b87a93fa..1dedcf7ad 100644 --- a/cmd/neofs-node/attributes.go +++ b/cmd/neofs-node/attributes.go @@ -5,8 +5,9 @@ import ( "strconv" "github.com/nspcc-dev/neofs-api-go/pkg/netmap" + "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" "github.com/nspcc-dev/neofs-node/pkg/util/attributes" - "github.com/spf13/viper" ) const ( @@ -15,8 +16,8 @@ const ( defaultPrice = 0 ) -func parseAttributes(v *viper.Viper) []*netmap.NodeAttribute { - stringAttributes := readAttributes(v) +func parseAttributes(c *config.Config) []*netmap.NodeAttribute { + stringAttributes := nodeconfig.Attributes(c) attrs, err := attributes.ParseV2Attributes(stringAttributes, nil) if err != nil { @@ -26,21 +27,6 @@ func parseAttributes(v *viper.Viper) []*netmap.NodeAttribute { return addWellKnownAttributes(attrs) } -func readAttributes(v *viper.Viper) (attrs []string) { - const maxAttributes = 100 - - for i := 0; i < maxAttributes; i++ { - attr := v.GetString(cfgNodeAttributePrefix + "_" + strconv.Itoa(i)) - if attr == "" { - return - } - - attrs = append(attrs, attr) - } - - return attrs -} - type wellKnownNodeAttrDesc struct { explicit bool defaultVal string diff --git a/cmd/neofs-node/config.go b/cmd/neofs-node/config.go index 819780f50..bf37d3247 100644 --- a/cmd/neofs-node/config.go +++ b/cmd/neofs-node/config.go @@ -20,6 +20,7 @@ import ( shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard" loggerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/logger" metricsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/metrics" + nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" "github.com/nspcc-dev/neofs-node/misc" "github.com/nspcc-dev/neofs-node/pkg/core/container" netmapCore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" @@ -52,12 +53,6 @@ import ( ) const ( - // config keys for cfgNodeInfo - cfgNodeKey = "node.key" - cfgBootstrapAddress = "node.address" - cfgNodeAttributePrefix = "node.attribute" - cfgNodeRelay = "node.relay" - // config keys for cfgGRPC cfgListenAddress = "grpc.endpoint" cfgTLSEnabled = "grpc.tls.enabled" @@ -273,7 +268,7 @@ func initCfg(path string) *cfg { viperCfg := initViper(path) - key, err := crypto.LoadPrivateKey(viperCfg.GetString(cfgNodeKey)) + key, err := crypto.LoadPrivateKey(nodeconfig.Key(appCfg)) fatalOnErr(err) u160Accounting, err := util.Uint160DecodeStringLE( @@ -302,8 +297,7 @@ func initCfg(path string) *cfg { log, err := logger.NewLogger(logPrm) fatalOnErr(err) - netAddr, err := network.AddressFromString(viperCfg.GetString(cfgBootstrapAddress)) - fatalOnErr(err) + netAddr := nodeconfig.BootstrapAddress(appCfg) maxChunkSize := uint64(maxMsgSize) * 3 / 4 // 25% to meta, 75% to payload maxAddrAmount := uint64(maxChunkSize) / addressSize // each address is about 72 bytes @@ -335,7 +329,7 @@ func initCfg(path string) *cfg { reputationWorkerPool, err := ants.NewPool(notificationHandlerPoolSize) fatalOnErr(err) - relayOnly := viperCfg.GetBool(cfgNodeRelay) + relayOnly := nodeconfig.Relay(appCfg) c := &cfg{ ctx: context.Background(), @@ -362,7 +356,7 @@ func initCfg(path string) *cfg { }, cfgNodeInfo: cfgNodeInfo{ bootType: StorageNode, - attributes: parseAttributes(viperCfg), + attributes: parseAttributes(appCfg), }, cfgGRPC: cfgGRPC{ maxChunkSize: maxChunkSize, @@ -414,10 +408,6 @@ func initViper(path string) *viper.Viper { } func defaultConfiguration(v *viper.Viper) { - v.SetDefault(cfgNodeKey, "") // node key - v.SetDefault(cfgBootstrapAddress, "") // announced address of the node - v.SetDefault(cfgNodeRelay, false) - v.SetDefault(cfgMorphRPCAddress, []string{}) v.SetDefault(cfgMorphNotifyRPCAddress, []string{}) v.SetDefault(cfgMorphNotifyDialTimeout, 5*time.Second)