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

helper/ssh: convert to InstanceState

This commit is contained in:
Mitchell Hashimoto 2014-09-16 16:55:02 -07:00
parent 0de633abeb
commit f117e33c9d
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helper/ssh/provisioner.go
View File

@ -43,8 +43,8 @@ type SSHConfig struct {
} }
// VerifySSH is used to verify the ConnInfo is usable by remote-exec // VerifySSH is used to verify the ConnInfo is usable by remote-exec
func VerifySSH(s *terraform.ResourceState) error { func VerifySSH(s *terraform.InstanceState) error {
connType := s.ConnInfo["type"] connType := s.Ephemeral.ConnInfo["type"]
switch connType { switch connType {
case "": case "":
case "ssh": case "ssh":
@ -54,9 +54,9 @@ func VerifySSH(s *terraform.ResourceState) error {
return nil return nil
} }
// ParseSSHConfig is used to convert the ConnInfo of the ResourceState into // ParseSSHConfig is used to convert the ConnInfo of the InstanceState into
// a SSHConfig struct // a SSHConfig struct
func ParseSSHConfig(s *terraform.ResourceState) (*SSHConfig, error) { func ParseSSHConfig(s *terraform.InstanceState) (*SSHConfig, error) {
sshConf := &SSHConfig{} sshConf := &SSHConfig{}
decConf := &mapstructure.DecoderConfig{ decConf := &mapstructure.DecoderConfig{
WeaklyTypedInput: true, WeaklyTypedInput: true,
@ -66,7 +66,7 @@ func ParseSSHConfig(s *terraform.ResourceState) (*SSHConfig, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := dec.Decode(s.ConnInfo); err != nil { if err := dec.Decode(s.Ephemeral.ConnInfo); err != nil {
return nil, err return nil, err
} }
if sshConf.User == "" { if sshConf.User == "" {

10
helper/ssh/provisioner_test.go
View File

@ -7,22 +7,25 @@ import (
) )
func TestResourceProvider_verifySSH(t *testing.T) { func TestResourceProvider_verifySSH(t *testing.T) {
r := &terraform.ResourceState{ r := &terraform.InstanceState{
Ephemeral: terraform.EphemeralState{
ConnInfo: map[string]string{ ConnInfo: map[string]string{
"type": "telnet", "type": "telnet",
}, },
},
} }
if err := VerifySSH(r); err == nil { if err := VerifySSH(r); err == nil {
t.Fatalf("expected error with telnet") t.Fatalf("expected error with telnet")
} }
r.ConnInfo["type"] = "ssh" r.Ephemeral.ConnInfo["type"] = "ssh"
if err := VerifySSH(r); err != nil { if err := VerifySSH(r); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
} }
func TestResourceProvider_sshConfig(t *testing.T) { func TestResourceProvider_sshConfig(t *testing.T) {
r := &terraform.ResourceState{ r := &terraform.InstanceState{
Ephemeral: terraform.EphemeralState{
ConnInfo: map[string]string{ ConnInfo: map[string]string{
"type": "ssh", "type": "ssh",
"user": "root", "user": "root",
@ -32,6 +35,7 @@ func TestResourceProvider_sshConfig(t *testing.T) {
"port": "22", "port": "22",
"timeout": "30s", "timeout": "30s",
}, },
},
} }
conf, err := ParseSSHConfig(r) conf, err := ParseSSHConfig(r)