Use keyfile and CAPath in Consul settings

sedkis · sedkis · commit b1ba999f50ed · 2024-11-21T09:44:48.000-06:00
diff --git a/storage/kv/consul.go b/storage/kv/consul.go
@@ -72,6 +72,14 @@ func newConsul(conf config.ConsulConfig) (Store, error) {
 		defaultCfg.TLSConfig.CertFile = conf.TLSConfig.CertFile
 	}
 
+	if conf.TLSConfig.KeyFile != "" {
+		defaultCfg.TLSConfig.KeyFile = conf.TLSConfig.KeyFile
+	}
+
+	if conf.TLSConfig.CAPath != "" {
+		defaultCfg.TLSConfig.CAPath = conf.TLSConfig.CAPath
+	}
+
 	if conf.TLSConfig.CAFile != "" {
 		defaultCfg.TLSConfig.CAFile = conf.TLSConfig.CAFile
 	}

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,14 @@ func newConsul(conf config.ConsulConfig) (Store, error) {`
`72`	`72`	`defaultCfg.TLSConfig.CertFile = conf.TLSConfig.CertFile`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ if conf.TLSConfig.KeyFile != "" {`
	`76`	`+ defaultCfg.TLSConfig.KeyFile = conf.TLSConfig.KeyFile`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ if conf.TLSConfig.CAPath != "" {`
	`80`	`+ defaultCfg.TLSConfig.CAPath = conf.TLSConfig.CAPath`
	`81`	`+ }`
	`82`	`+`
`75`	`83`	`if conf.TLSConfig.CAFile != "" {`
`76`	`84`	`defaultCfg.TLSConfig.CAFile = conf.TLSConfig.CAFile`
`77`	`85`	`}`