Make consul provider settings truly optional
Set default values of truly optional settings to empty strings rather than nil, since a nil value triggers prompts for the missing values. Also: * Set default Consul address to `localhost:8500` * Set default scheme to `http` * Accept `CONSUL_HTTP_SCHEME` for consistency with other env var names * Actively read ACL token from env vars (vs leaving it to client lib) Should fix issue #8499
This commit is contained in:
parent
13ce749759
commit
32d08ad45a
|
@ -23,36 +23,43 @@ func Provider() terraform.ResourceProvider {
|
|||
DefaultFunc: schema.MultiEnvDefaultFunc([]string{
|
||||
"CONSUL_ADDRESS",
|
||||
"CONSUL_HTTP_ADDR",
|
||||
}, nil),
|
||||
}, "localhost:8500"),
|
||||
},
|
||||
|
||||
"scheme": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_SCHEME", nil),
|
||||
DefaultFunc: schema.MultiEnvDefaultFunc([]string{
|
||||
"CONSUL_SCHEME",
|
||||
"CONSUL_HTTP_SCHEME",
|
||||
}, "http"),
|
||||
},
|
||||
|
||||
"ca_file": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_CA_FILE", nil),
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_CA_FILE", ""),
|
||||
},
|
||||
|
||||
"cert_file": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_CERT_FILE", nil),
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_CERT_FILE", ""),
|
||||
},
|
||||
|
||||
"key_file": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_KEY_FILE", nil),
|
||||
DefaultFunc: schema.EnvDefaultFunc("CONSUL_KEY_FILE", ""),
|
||||
},
|
||||
|
||||
"token": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
DefaultFunc: schema.MultiEnvDefaultFunc([]string{
|
||||
"CONSUL_TOKEN",
|
||||
"CONSUL_HTTP_TOKEN",
|
||||
}, ""),
|
||||
},
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in New Issue