This commit is contained in:
Mitchell Hashimoto 2015-06-08 21:34:20 -07:00
parent fa2bcb8bc5
commit 23a48d6619
13 changed files with 16 additions and 17 deletions

View File

@ -1,9 +1,9 @@
package digitalocean
import (
"golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/multistep"
"golang.org/x/crypto/ssh"
)
func sshAddress(state multistep.StateBag) (string, error) {

View File

@ -1,9 +1,9 @@
package googlecompute
import (
"golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/multistep"
"golang.org/x/crypto/ssh"
)
// sshAddress returns the ssh address.

View File

@ -1,10 +1,10 @@
package null
import (
gossh "golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh"
gossh "golang.org/x/crypto/ssh"
"io/ioutil"
)

View File

@ -1,10 +1,10 @@
package openstack
import (
"golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/multistep"
"golang.org/x/crypto/ssh"
"time"
"github.com/mitchellh/gophercloud-fork-40444fb"

View File

@ -3,10 +3,10 @@ package common
import (
"fmt"
"golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
packerssh "github.com/mitchellh/packer/communicator/ssh"
"golang.org/x/crypto/ssh"
)
func SSHAddress(state multistep.StateBag) (string, error) {

View File

@ -3,10 +3,10 @@ package qemu
import (
"fmt"
gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh"
gossh "golang.org/x/crypto/ssh"
)
func sshAddress(state multistep.StateBag) (string, error) {

View File

@ -3,10 +3,10 @@ package common
import (
"fmt"
gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh"
gossh "golang.org/x/crypto/ssh"
)
func SSHAddress(state multistep.StateBag) (string, error) {

View File

@ -7,10 +7,10 @@ import (
"log"
"os"
gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh"
gossh "golang.org/x/crypto/ssh"
)
func SSHAddressFunc(config *SSHConfig) func(multistep.StateBag) (string, error) {

View File

@ -3,12 +3,11 @@ package iso
import (
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
"github.com/mitchellh/packer/packer"
"path/filepath"
)
// This step upload the VMX to the remote host
//
// Uses:
@ -18,8 +17,8 @@ import (
//
// Produces:
// <nothing>
type StepUploadVMX struct{
RemoteType string
type StepUploadVMX struct {
RemoteType string
}
func (c *StepUploadVMX) Run(state multistep.StateBag) multistep.StepAction {
@ -31,7 +30,7 @@ func (c *StepUploadVMX) Run(state multistep.StateBag) multistep.StepAction {
if c.RemoteType == "esx5" {
remoteDriver, ok := driver.(RemoteDriver)
if ok {
remoteVmxPath := filepath.ToSlash(filepath.Join(fmt.Sprintf("%s",remoteDriver), filepath.Base(vmxPath)))
remoteVmxPath := filepath.ToSlash(filepath.Join(fmt.Sprintf("%s", remoteDriver), filepath.Base(vmxPath)))
if err := remoteDriver.upload(remoteVmxPath, vmxPath); err != nil {
state.Put("error", fmt.Errorf("Error writing VMX: %s", err))
return multistep.ActionHalt

View File

@ -1,12 +1,12 @@
package common
import (
gossh "golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh"
"github.com/mitchellh/packer/packer"
gossh "golang.org/x/crypto/ssh"
"log"
"strings"
"time"

View File

@ -3,10 +3,10 @@ package ssh
import (
"bufio"
"bytes"
"golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/packer/packer"
"golang.org/x/crypto/ssh"
"io"
"io/ioutil"
"log"

View File

@ -4,9 +4,9 @@ package ssh
import (
"bytes"
"golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/packer/packer"
"golang.org/x/crypto/ssh"
"net"
"testing"
)

View File

@ -6,7 +6,7 @@ import (
func TestLongestCommonPrefix(t *testing.T) {
cases := []struct {
Input []string
Input []string
Output string
}{
{