Browse Source

Move ca_certs from 'remote' to 'terraform'

Did this as the CA Cert if needed for all terraform commands, not
just remote.  So just made more sense to move it to base of vargs.
pull/4/head
Jacob McCann 9 years ago
parent
commit
8d46f853c5
  1. 6
      main.go

6
main.go

@ -14,12 +14,12 @@ type terraform struct {
Remote remote `json:"remote"` Remote remote `json:"remote"`
Plan bool `json:"plan"` Plan bool `json:"plan"`
Vars map[string]string `json:"vars"` Vars map[string]string `json:"vars"`
Cacert string `json:"ca_cert"`
} }
type remote struct { type remote struct {
Backend string `json:"backend"` Backend string `json:"backend"`
Config map[string]string `json:"config"` Config map[string]string `json:"config"`
Cacert string `json:"ca_cert"`
} }
func main() { func main() {
@ -33,8 +33,8 @@ func main() {
var commands []*exec.Cmd var commands []*exec.Cmd
remote := vargs.Remote remote := vargs.Remote
if remote.Cacert != "" { if vargs.Cacert != "" {
commands = append(commands, installCaCert(remote.Cacert)) commands = append(commands, installCaCert(vargs.Cacert))
} }
if remote.Backend != "" { if remote.Backend != "" {
commands = append(commands, remoteConfigCommand(remote)) commands = append(commands, remoteConfigCommand(remote))

Loading…
Cancel
Save