connect: fix two CA tests that were broken in a previous PR (#60)

hashicorp · Jun 25, 2018 · 82a4b3c · 82a4b3c
1 parent 01fefd3
commit 82a4b3c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/agent/connect_ca_endpoint.go b/agent/connect_ca_endpoint.go
@@ -85,7 +85,7 @@ func fixupConfig(conf *structs.CAConfiguration) {
 				conf.Config[k] = ca.Uint8ToString(raw)
 			}
 		}
-		if conf.Config["PrivateKey"] != "" {
+		if v, ok := conf.Config["PrivateKey"]; ok && v != "" {
 			conf.Config["PrivateKey"] = "hidden"
 		}
 	}

diff --git a/api/connect_ca.go b/api/connect_ca.go
@@ -32,7 +32,19 @@ type ConsulCAProviderConfig struct {
 // ConsulCAProviderConfig.
 func ParseConsulCAConfig(raw map[string]interface{}) (*ConsulCAProviderConfig, error) {
 	var config ConsulCAProviderConfig
-	if err := mapstructure.WeakDecode(raw, &config); err != nil {
+	decodeConf := &mapstructure.DecoderConfig{
+		DecodeHook:       mapstructure.StringToTimeDurationHookFunc(),
+		ErrorUnused:      true,
+		Result:           &config,
+		WeaklyTypedInput: true,
+	}
+
+	decoder, err := mapstructure.NewDecoder(decodeConf)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := decoder.Decode(raw); err != nil {
 		return nil, fmt.Errorf("error decoding config: %s", err)
 	}