Skip to content

Commit

Permalink
code.google.com/p/go.crypto/ssh -> golang.org/x/crypto/ssh
Browse files Browse the repository at this point in the history
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 hashicorp#1066.
  • Loading branch information
jszwedko authored and mitchellh committed May 28, 2015
1 parent 8367c0b commit b1497b9
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion builder/amazon/common/ssh.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package common

import (
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/goamz/ec2"
Expand Down
2 changes: 1 addition & 1 deletion builder/digitalocean/ssh.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package digitalocean

import (
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/multistep"
)
Expand Down
2 changes: 1 addition & 1 deletion builder/googlecompute/ssh.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package googlecompute

import (
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/multistep"
)
Expand Down
2 changes: 1 addition & 1 deletion builder/null/ssh.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package null

import (
gossh "code.google.com/p/go.crypto/ssh"
gossh "golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh"
Expand Down
2 changes: 1 addition & 1 deletion builder/openstack/ssh.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package openstack

import (
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/multistep"
Expand Down
2 changes: 1 addition & 1 deletion builder/parallels/common/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package common
import (
"fmt"

"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
packerssh "github.com/mitchellh/packer/communicator/ssh"
Expand Down
2 changes: 1 addition & 1 deletion builder/qemu/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package qemu
import (
"fmt"

gossh "code.google.com/p/go.crypto/ssh"
gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh"
Expand Down
2 changes: 1 addition & 1 deletion builder/virtualbox/common/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package common
import (
"fmt"

gossh "code.google.com/p/go.crypto/ssh"
gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh"
Expand Down
2 changes: 1 addition & 1 deletion builder/vmware/common/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"log"
"os"

gossh "code.google.com/p/go.crypto/ssh"
gossh "golang.org/x/crypto/ssh"
"github.com/mitchellh/multistep"
commonssh "github.com/mitchellh/packer/common/ssh"
"github.com/mitchellh/packer/communicator/ssh"
Expand Down
2 changes: 1 addition & 1 deletion builder/vmware/iso/driver_esx5.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"strings"
"time"

gossh "code.google.com/p/go.crypto/ssh"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh"
"github.com/mitchellh/packer/packer"
gossh "golang.org/x/crypto/ssh"
)

// ESX5 driver talks to an ESXi5 hypervisor remotely over SSH to build
Expand Down
2 changes: 1 addition & 1 deletion common/ssh/key.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io/ioutil"
"os"

"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
)

// FileSigner returns an ssh.Signer for a key file.
Expand Down
2 changes: 1 addition & 1 deletion common/step_connect_ssh.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package common

import (
gossh "code.google.com/p/go.crypto/ssh"
gossh "golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/multistep"
Expand Down
2 changes: 1 addition & 1 deletion communicator/ssh/communicator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ssh
import (
"bufio"
"bytes"
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"errors"
"fmt"
"github.com/mitchellh/packer/packer"
Expand Down
2 changes: 1 addition & 1 deletion communicator/ssh/communicator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package ssh

import (
"bytes"
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"fmt"
"github.com/mitchellh/packer/packer"
"net"
Expand Down
2 changes: 1 addition & 1 deletion communicator/ssh/password.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ssh

import (
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"log"
)

Expand Down
2 changes: 1 addition & 1 deletion communicator/ssh/password_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ssh

import (
"code.google.com/p/go.crypto/ssh"
"golang.org/x/crypto/ssh"
"reflect"
"testing"
)
Expand Down

0 comments on commit b1497b9

Please sign in to comment.