issue #30: fix decode crash because of maptsructure bug; debug config…

… decode logging

config/config.go

@@ -84,6 +84,7 @@ func newDecoderConfig(result interface{}) *mapstructure.DecoderConfig {
 }
 
 var hooks = []mapstructure.DecodeHookFunc{
+	DebugHook,
 	mapstructure.StringToTimeDurationHookFunc(),
 	StringToURLHook,
 	StringToIPHook,

config/config_test.go

@@ -7,9 +7,9 @@ package config
 
 import (
 	"testing"
-
 	"time"
 
+	"github.com/facebookgo/stack"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -211,3 +211,29 @@ func TestDeltaUpdate(t *testing.T) {
 	assert.Equal(t, "val3", l2.Val2.Val1)
 	assert.Equal(t, "val5", l2.Val2.Val2)
 }
+
+func TestNextSquash(t *testing.T) {
+	// TODO(skipor): fix mapstructure #70
+	t.Skip("Skipped until fix https://github.com/mitchellh/mapstructure/issues/70")
+	data := &struct {
+		Level1 struct {
+			Level2 struct {
+				Foo string
+			} `config:",squash"`
+		} `config:",squash"`
+	}{}
+
+	defer func() {
+		r := recover()
+		if r == nil {
+			return
+		}
+		t.Fatalf("panic: %s\n %s", r, stack.Callers(3))
+	}()
+
+	err := Decode(M{
+		"foo": "baz",
+	}, &data)
+	require.NoError(t, err)
+	assert.Equal(t, "baz", data.Level1.Level2.Foo)
+}

config/hooks.go

@@ -15,9 +15,11 @@ import (
 
 	"github.com/asaskevich/govalidator"
 	"github.com/c2h5oh/datasize"
+	"github.com/facebookgo/stack"
 	"github.com/facebookgo/stackerr"
 
 	"github.com/yandex/pandora/plugin"
+	"github.com/yandex/pandora/tag"
 )
 
 const PluginNameKey = "type"
@@ -106,6 +108,25 @@ func PluginFactoryHook(f reflect.Type, t reflect.Type, data interface{}) (p inte
 	return plugin.NewFactory(t, name, fillConf)
 }
 
+// DebugHook used to debug config decode.
+func DebugHook(f reflect.Type, t reflect.Type, data interface{}) (p interface{}, err error) {
+	p, err = data, nil
+	if !tag.Debug {
+		return
+	}
+	callers := stack.Callers(2)
+	var decodeCallers int
+	for _, caller := range callers {
+		if caller.Name == "(*Decoder).decode" {
+			decodeCallers++
+		}
+	}
+
+	offset := strings.Repeat("    ", decodeCallers)
+	fmt.Printf("%s %s from %s %v\n", offset, t, f, data)
+	return
+}
+
 func parseConf(t reflect.Type, data interface{}) (name string, fillConf func(conf interface{}) error, err error) {
 	confData, err := toStringKeyMap(data)
 	if err != nil {
@@ -133,6 +154,10 @@ func parseConf(t reflect.Type, data interface{}) (name string, fillConf func(con
 	}
 	name = names[0]
 	fillConf = func(conf interface{}) error {
+		if tag.Debug {
+			fmt.Printf("Decoding %s %s plugin\n"+"%s from %v",
+				t, name, reflect.TypeOf(conf).Elem(), confData)
+		}
 		err := DecodeAndValidate(confData, conf)
 		if err != nil {
 			err = fmt.Errorf("%s %s plugin\n"+

gun/phttp/client.go

@@ -21,7 +21,8 @@ type Client interface {
 }
 
 type ClientConfig struct {
-	Transport TransportConfig `config:",squash"`
+	// TODO: squash after fix https://github.com/mitchellh/mapstructure/issues/70
+	Transport TransportConfig // `config:",squash"`
 	Dialer    DialerConfig    `config:"dial"`
 }
 

gun/phttp/http_test.go

@@ -0,0 +1,24 @@
+// Copyright (c) 2017 Yandex LLC. All rights reserved.
+// Use of this source code is governed by a MPL 2.0
+// license that can be found in the LICENSE file.
+// Author: Vladimir Skipor <skipor@yandex-team.ru>
+
+package phttp
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"github.com/yandex/pandora/config"
+)
+
+var _ = Describe("Base", func() {
+	It("GunClientConfig decode", func() {
+		conf := NewDefaultHTTPGunClientConfig()
+		data := map[interface{}]interface{}{
+			"target": "test-trbo01e.haze.yandex.net:3000",
+		}
+		err := config.DecodeAndValidate(data, &conf)
+		Expect(err).To(BeNil())
+	})
+})

tag/debug.go

@@ -0,0 +1,10 @@
+// Copyright (c) 2017 Yandex LLC. All rights reserved.
+// Use of this source code is governed by a MPL 2.0
+// license that can be found in the LICENSE file.
+// Author: Vladimir Skipor <skipor@yandex-team.ru>
+
+// +build debug
+
+package tag
+
+const Debug = true

tag/no_degug.go

@@ -0,0 +1,10 @@
+// Copyright (c) 2017 Yandex LLC. All rights reserved.
+// Use of this source code is governed by a MPL 2.0
+// license that can be found in the LICENSE file.
+// Author: Vladimir Skipor <skipor@yandex-team.ru>
+
+// +build !debug
+
+package tag
+
+const Debug = false