ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15973 from synthdnb/consul-crash-fix 

Fix crash when using consul backend
This commit is contained in:
James Bardin 2017-09-05 10:22:08 -04:00 committed by GitHub
parent cbb512d374 f12a237747
commit 2863a51095
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/remote-state/consul/backend.go
View File

@ -134,21 +134,15 @@ func (b *Backend) clientRaw() (*consulapi.Client, error) {
config.Datacenter = v.(string) config.Datacenter = v.(string)
} }
tlsConfig := &consulapi.TLSConfig{}
if v, ok := data.GetOk("ca_file"); ok && v.(string) != "" { if v, ok := data.GetOk("ca_file"); ok && v.(string) != "" {
tlsConfig.CAFile = v.(string) config.TLSConfig.CAFile = v.(string)
} }
if v, ok := data.GetOk("cert_file"); ok && v.(string) != "" { if v, ok := data.GetOk("cert_file"); ok && v.(string) != "" {
tlsConfig.CertFile = v.(string) config.TLSConfig.CertFile = v.(string)
} }
if v, ok := data.GetOk("key_file"); ok && v.(string) != "" { if v, ok := data.GetOk("key_file"); ok && v.(string) != "" {
tlsConfig.KeyFile = v.(string) config.TLSConfig.KeyFile = v.(string)
} }
cc, err := consulapi.SetupTLSConfig(tlsConfig)
if err != nil {
return nil, err
}
config.Transport.TLSClientConfig = cc
if v, ok := data.GetOk("http_auth"); ok && v.(string) != "" { if v, ok := data.GetOk("http_auth"); ok && v.(string) != "" {
auth := v.(string) auth := v.(string)