diff --git a/builder/linode/builder.go b/builder/linode/builder.go index def4b1f2e..3bc3dfb3f 100644 --- a/builder/linode/builder.go +++ b/builder/linode/builder.go @@ -6,6 +6,7 @@ import ( "context" "errors" "fmt" + "log" "github.com/hashicorp/packer/common" "github.com/linode/linodego" @@ -96,3 +97,18 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (ret return artifact, nil } + +func commHost(host string) func(multistep.StateBag) (string, error) { + return func(state multistep.StateBag) (string, error) { + if host != "" { + log.Printf("Using ssh_host value: %s", host) + return host, nil + } + + instance := state.Get("instance").(*linodego.Instance) + if len(instance.IPv4) == 0 { + return "", fmt.Errorf("Linode instance %d has no IPv4 addresses!", instance.ID) + } + return instance.IPv4[0].String(), nil + } +} diff --git a/builder/linode/ssh.go b/builder/linode/ssh.go deleted file mode 100644 index 5142da9a6..000000000 --- a/builder/linode/ssh.go +++ /dev/null @@ -1,24 +0,0 @@ -package linode - -import ( - "fmt" - "log" - - "github.com/hashicorp/packer/helper/multistep" - "github.com/linode/linodego" -) - -func commHost(host string) func(multistep.StateBag) (string, error) { - return func(state multistep.StateBag) (string, error) { - if host != "" { - log.Printf("Using ssh_host value: %s", host) - return host, nil - } - - instance := state.Get("instance").(*linodego.Instance) - if len(instance.IPv4) == 0 { - return "", fmt.Errorf("Linode instance %d has no IPv4 addresses!", instance.ID) - } - return instance.IPv4[0].String(), nil - } -}