Merge branch 'rowanjacobs-socks5-proxy-library'

cloudfoundry · Oct 25, 2017 · 7304aa2 · 7304aa2
2 parents e6db21b + 2760b35
commit 7304aa2
Show file tree

Hide file tree

Showing 19 changed files with 362 additions and 63 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/bosh/boshfakes/fake_director.go b/bosh/boshfakes/fake_director.go
diff --git a/bosh/boshfakes/fake_proxy.go b/bosh/boshfakes/fake_proxy.go
diff --git a/bosh/boshfakes/fake_runner.go b/bosh/boshfakes/fake_runner.go
diff --git a/bosh/cli_coordinator.go b/bosh/cli_coordinator.go
@@ -8,7 +8,6 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy"
 	"github.com/cloudfoundry/bosh-deployment-resource/concourse"
 
 	boshcmd "github.com/cloudfoundry/bosh-cli/cmd"
@@ -19,13 +18,19 @@ import (
 	goflags "github.com/jessevdk/go-flags"
 )
 
+//go:generate counterfeiter . Proxy
+type Proxy interface {
+	Start(string, string) error
+	Addr() (string, error)
+}
+
 type CLICoordinator struct {
 	source concourse.Source
 	out    io.Writer
-	proxy  proxy.Proxy
+	proxy  Proxy
 }
 
-func NewCLICoordinator(source concourse.Source, out io.Writer, proxy proxy.Proxy) CLICoordinator {
+func NewCLICoordinator(source concourse.Source, out io.Writer, proxy Proxy) CLICoordinator {
 	return CLICoordinator{
 		source: source,
 		out:    out,