Merge pull request #2906 from oasislabs/matevz/bug/yaml-stringmapstring

common/flags: Fix parsing of metrics.labels, if provided in config .yml

.changelog/2905.bugfix.md

@@ -0,0 +1,4 @@
+common/flags: Fix parsing of metrics.labels, if provided in config .yml
+
+[Bug in viper library](https://github.com/spf13/viper/issues/608) was fixed
+upstream and drop-in replacement for `GetStringMapString` was removed.

go/go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/libp2p/go-libp2p-core v0.0.3
 	github.com/libp2p/go-msgio v0.0.3 // indirect
 	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/mitchellh/mapstructure v1.2.2 // indirect
+	github.com/mitchellh/mapstructure v1.3.0 // indirect
 	github.com/multiformats/go-multiaddr v0.0.4
 	github.com/multiformats/go-multiaddr-net v0.0.1
 	github.com/multiformats/go-multihash v0.0.6 // indirect
@@ -49,10 +49,11 @@ require (
 	github.com/seccomp/libseccomp-golang v0.9.1
 	github.com/smartystreets/assertions v1.0.0 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.6.3
+	github.com/spf13/viper v1.7.0
 	github.com/steveyen/gtreap v0.0.0-20150807155958-0abe01ef9be2 // indirect
 	github.com/stretchr/testify v1.5.1
 	github.com/tendermint/go-amino v0.15.0
@@ -67,12 +68,12 @@ require (
 	gitlab.com/yawning/dynlib.git v0.0.0-20190911075527-1e6ab3739fd8
 	golang.org/x/crypto v0.0.0-20200406173513-056763e48d71
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
-	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
-	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
+	golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25 // indirect
+	google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a
 	google.golang.org/grpc v1.29.1
 	google.golang.org/grpc/security/advancedtls v0.0.0-20200504170109-c8482678eb49
 	google.golang.org/protobuf v1.21.0
-	gopkg.in/ini.v1 v1.55.0 // indirect
+	gopkg.in/ini.v1 v1.56.0 // indirect
 )
 
 go 1.13

go/oasis-node/cmd/common/flags/flags.go

@@ -3,8 +3,6 @@
 package flags
 
 import (
-	"strings"
-
 	flag "github.com/spf13/pflag"
 	"github.com/spf13/viper"
 )
@@ -92,27 +90,6 @@ func DryRun() bool {
 	return viper.GetBool(CfgDryRun)
 }
 
-// GetStringMapString is a drop-in replacement for viper.GetStringMapString due to https://github.com/spf13/viper/issues/608.
-func GetStringMapString(key string) map[string]string {
-	labels := map[string]string{}
-	val := viper.GetString(key)
-
-	// viper.GetString() wraps the string inside [] parenthesis, unwrap it.
-	if len(val) < 2 {
-		return labels
-	}
-	val = val[1 : len(val)-1]
-
-	for _, lPair := range strings.Split(val, ",") {
-		kv := strings.Split(lPair, "=")
-		if len(kv) != 2 || kv[0] == "" {
-			continue
-		}
-		labels[kv[0]] = kv[1]
-	}
-	return labels
-}
-
 func init() {
 	VerboseFlags.BoolP(cfgVerbose, "v", false, "verbose output")
 

go/oasis-node/cmd/common/logging.go

@@ -8,7 +8,6 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/oasislabs/oasis-core/go/common/logging"
-	"github.com/oasislabs/oasis-core/go/oasis-node/cmd/common/flags"
 )
 
 const (
@@ -32,7 +31,7 @@ func initLogging() error {
 			return errDefault
 		}
 
-		for k, v := range flags.GetStringMapString(cfgLogLevel) {
+		for k, v := range viper.GetStringMapString(cfgLogLevel) {
 			if k == "default" {
 				continue
 			}

go/oasis-node/cmd/common/metrics/metrics.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/oasislabs/oasis-core/go/common/service"
 	"github.com/oasislabs/oasis-core/go/common/version"
-	"github.com/oasislabs/oasis-core/go/oasis-node/cmd/common/flags"
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/env"
 )
 
@@ -199,7 +198,7 @@ func (s *pushService) worker() {
 func newPushService() (service.BackgroundService, error) {
 	addr := viper.GetString(CfgMetricsAddr)
 	jobName := viper.GetString(CfgMetricsJobName)
-	labels := flags.GetStringMapString(CfgMetricsLabels)
+	labels := viper.GetStringMapString(CfgMetricsLabels)
 	interval := viper.GetDuration(CfgMetricsInterval)
 
 	if jobName == "" {
@@ -269,7 +268,7 @@ func GetDefaultPushLabels(ti *env.TestInstanceInfo) map[string]string {
 			labels[EscapeLabelCharacters(f.Name)] = f.Value.String()
 		})
 		// Override any labels passed to oasis-test-runner via CLI.
-		for k, v := range flags.GetStringMapString(CfgMetricsLabels) {
+		for k, v := range viper.GetStringMapString(CfgMetricsLabels) {
 			labels[k] = v
 		}
 

go/oasis-test-runner/cmd/cmp/cmp.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/oasislabs/oasis-core/go/common/logging"
 	nodeCommon "github.com/oasislabs/oasis-core/go/oasis-node/cmd/common"
-	"github.com/oasislabs/oasis-core/go/oasis-node/cmd/common/flags"
 	"github.com/oasislabs/oasis-core/go/oasis-node/cmd/common/metrics"
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/cmd/common"
 )
@@ -442,7 +441,7 @@ func runCmp(cmd *cobra.Command, args []string) {
 
 		// Set other required Prometheus labels, if passed.
 		// TODO: Integrate test parameters and parameter set combinations if multiple values provided like we do in oasis-test-runner.
-		for k, v := range flags.GetStringMapString(metrics.CfgMetricsLabels) {
+		for k, v := range viper.GetStringMapString(metrics.CfgMetricsLabels) {
 			sLabels[k] = v
 			tLabels[k] = v
 		}