Commit b1497b95 authored by jszwedko's avatar jszwedko Committed by Mitchell Hashimoto

code.google.com/p/go.crypto/ssh -> golang.org/x/crypto/ssh

code.google.com/p/go.crypto/ssh is now at golang.org/x/crypto/ssh as of
https://code.google.com/p/go/source/detail?spec=svn.crypto.69e2a90ed92d03812364aeb947b7068dc42e561e&repo=crypto&r=8fec09c61d5d66f460d227fd1df3473d7e015bc6

Using the code.google.com import redirects properly, but runs into
issues if you try to use a subpackage of `ssh`, e.g. `agent` which
refers to golang.org/x/crypto/ssh causing conflicts if your types expect
code.google.com/p/go.crypto/ssh.

This is a precursor to a PR for #1066.
parent 8367c0bd
package common package common
import ( import (
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/mitchellh/goamz/ec2"
......
package digitalocean package digitalocean
import ( import (
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"fmt" "fmt"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
) )
......
package googlecompute package googlecompute
import ( import (
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"fmt" "fmt"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
) )
......
package null package null
import ( import (
gossh "code.google.com/p/go.crypto/ssh" gossh "golang.org/x/crypto/ssh"
"fmt" "fmt"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh" "github.com/mitchellh/packer/communicator/ssh"
......
package openstack package openstack
import ( import (
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
......
...@@ -3,7 +3,7 @@ package common ...@@ -3,7 +3,7 @@ package common
import ( import (
"fmt" "fmt"
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh" commonssh "github.com/mitchellh/packer/common/ssh"
packerssh "github.com/mitchellh/packer/communicator/ssh" packerssh "github.com/mitchellh/packer/communicator/ssh"
......
...@@ -3,7 +3,7 @@ package qemu ...@@ -3,7 +3,7 @@ package qemu
import ( import (
"fmt" "fmt"
gossh "code.google.com/p/go.crypto/ssh" gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh" commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh" "github.com/mitchellh/packer/communicator/ssh"
......
...@@ -3,7 +3,7 @@ package common ...@@ -3,7 +3,7 @@ package common
import ( import (
"fmt" "fmt"
gossh "code.google.com/p/go.crypto/ssh" gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh" commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh" "github.com/mitchellh/packer/communicator/ssh"
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"log" "log"
"os" "os"
gossh "code.google.com/p/go.crypto/ssh" gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh" commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh" "github.com/mitchellh/packer/communicator/ssh"
......
...@@ -14,10 +14,10 @@ import ( ...@@ -14,10 +14,10 @@ import (
"strings" "strings"
"time" "time"
gossh "code.google.com/p/go.crypto/ssh"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh" "github.com/mitchellh/packer/communicator/ssh"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
gossh "golang.org/x/crypto/ssh"
) )
// ESX5 driver talks to an ESXi5 hypervisor remotely over SSH to build // ESX5 driver talks to an ESXi5 hypervisor remotely over SSH to build
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
) )
// FileSigner returns an ssh.Signer for a key file. // FileSigner returns an ssh.Signer for a key file.
......
package common package common
import ( import (
gossh "code.google.com/p/go.crypto/ssh" gossh "golang.org/x/crypto/ssh"
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
......
...@@ -3,7 +3,7 @@ package ssh ...@@ -3,7 +3,7 @@ package ssh
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -4,7 +4,7 @@ package ssh ...@@ -4,7 +4,7 @@ package ssh
import ( import (
"bytes" "bytes"
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"fmt" "fmt"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"net" "net"
......
package ssh package ssh
import ( import (
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"log" "log"
) )
......
package ssh package ssh
import ( import (
"code.google.com/p/go.crypto/ssh" "golang.org/x/crypto/ssh"
"reflect" "reflect"
"testing" "testing"
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment