diff --git a/Gopkg.lock b/Gopkg.lock index beb3b3a0d..137235e59 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -4,8 +4,8 @@ [[projects]] name = "cloud.google.com/go" packages = ["compute/metadata","iam","internal","internal/optional","internal/version","storage"] - revision = "0f0b8420cb699ac4ce059c63bac263f4301fe95b" - version = "v0.12.0" + revision = "eaddaf6dd7ee35fd3c2420c8d27478db176b0485" + version = "v0.15.0" [[projects]] branch = "master" @@ -22,8 +22,8 @@ [[projects]] name = "github.com/aws/aws-sdk-go" packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restxml","private/protocol/xml/xmlutil","service/s3","service/s3/s3iface","service/s3/s3manager","service/sts"] - revision = "85193e1d8a4a2df2f00ccdcd6a796673b1aec368" - version = "v1.10.31" + revision = "f426770fd5a4bae6186b280d4af7dca83a4cdef4" + version = "v1.12.17" [[projects]] name = "github.com/bmatcuk/doublestar" @@ -75,11 +75,17 @@ revision = "d29aa99b7c301778efea4714252b6ef549089d6b" version = "v0.0.124" +[[projects]] + branch = "master" + name = "github.com/cloudfoundry/socks5-proxy" + packages = ["."] + revision = "930de75eb8c55a3325de5dd09a33e3631c53d677" + [[projects]] branch = "master" name = "github.com/cppforlife/go-patch" packages = ["patch"] - revision = "d9e51bef8eda190cdbac94dddd3c304080774726" + revision = "250da0e0e68ce3367b4302f34218f6c064eb9559" [[projects]] branch = "master" @@ -91,7 +97,7 @@ branch = "master" name = "github.com/dustin/go-humanize" packages = ["."] - revision = "259d2a102b871d17f30e3cd9881a642961a1e486" + revision = "77ed807830b4df581417e7f89eb81d4872832b72" [[projects]] name = "github.com/fatih/color" @@ -102,20 +108,20 @@ [[projects]] name = "github.com/go-ini/ini" packages = ["."] - revision = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd" - version = "v1.28.2" + revision = "5b3e00af70a9484542169a976dcab8d03e601a17" + version = "v1.30.0" [[projects]] branch = "master" name = "github.com/golang/protobuf" - packages = ["proto","protoc-gen-go/descriptor","ptypes/any"] - revision = "ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e" + packages = ["proto","protoc-gen-go/descriptor","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"] + revision = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9" [[projects]] - branch = "master" name = "github.com/googleapis/gax-go" packages = ["."] - revision = "2cadd475a3e966ec9b77a21afc530dbacec6d613" + revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f" + version = "v2.0.0" [[projects]] branch = "master" @@ -139,20 +145,19 @@ [[projects]] name = "github.com/jmespath/go-jmespath" packages = ["."] - revision = "3433f3ea46d9f8019119e7dd41274e112a2359a9" - version = "0.2.2" + revision = "0b12d6b5" [[projects]] name = "github.com/mattn/go-colorable" packages = ["."] - revision = "941b50ebc6efddf4c41c8e4537a5f68a4e686b24" - version = "v0.0.8" + revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" + version = "v0.0.9" [[projects]] name = "github.com/mattn/go-isatty" packages = ["."] - revision = "fc9e8d8ef48496124e79ae0df75490096eccf6fe" - version = "v0.0.2" + revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" + version = "v0.0.3" [[projects]] branch = "master" @@ -200,37 +205,37 @@ branch = "master" name = "golang.org/x/crypto" packages = ["curve25519","ed25519","ed25519/internal/edwards25519","ssh","ssh/terminal"] - revision = "eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035" + revision = "2509b142fb2b797aa7587dad548f113b2c0f20ce" [[projects]] branch = "master" name = "golang.org/x/net" packages = ["context","context/ctxhttp","html","html/atom","html/charset","http2","http2/hpack","idna","internal/timeseries","lex/httplex","proxy","trace"] - revision = "1c05540f6879653db88113bc4a2b70aec4bd491f" + revision = "4b14673ba32bee7f5ac0f990a48f033919fd418b" [[projects]] branch = "master" name = "golang.org/x/oauth2" packages = [".","google","internal","jws","jwt"] - revision = "9a379c6b3e95a790ffc43293c2a78dee0d7b6e20" + revision = "bb50c06baba3d0c76f9d125c0719093e315b5b44" [[projects]] branch = "master" name = "golang.org/x/sys" packages = ["unix","windows"] - revision = "07c182904dbd53199946ba614a412c61d3c548f5" + revision = "607525c0eb3534cf37ade3d0f24fb9505c33caf3" [[projects]] branch = "master" name = "golang.org/x/text" - packages = ["encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"] - revision = "cc24f0397b10b6321b1a1322b6bd592984fdabf2" + packages = ["collate","collate/build","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"] + revision = "6eab0e8f74e86c598ec3b6fad4888e0c11482d48" [[projects]] branch = "master" name = "google.golang.org/api" packages = ["gensupport","googleapi","googleapi/internal/uritemplates","googleapi/transport","internal","iterator","option","storage/v1","transport/http"] - revision = "dd6bdadc5852eae2d133075a3690d6ad744add48" + revision = "52fedcc3d56e51c5f1a571d48092238ab2746c73" [[projects]] name = "google.golang.org/appengine" @@ -242,13 +247,13 @@ branch = "master" name = "google.golang.org/genproto" packages = ["googleapis/api/annotations","googleapis/iam/v1","googleapis/rpc/status"] - revision = "ee236bd376b077c7a89f260c026c4735b195e459" + revision = "f676e0f3ac6395ff1a529ae59a6670878a8371a6" [[projects]] name = "google.golang.org/grpc" - packages = [".","codes","connectivity","credentials","grpclb/grpc_lb_v1","grpclog","internal","keepalive","metadata","naming","peer","stats","status","tap","transport"] - revision = "b3ddf786825de56a4178401b7e174ee332173b66" - version = "v1.5.2" + packages = [".","balancer","codes","connectivity","credentials","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","resolver","stats","status","tap","transport"] + revision = "f7bf885db0b7479a537ec317c6e48ce53145f3db" + version = "v1.7.0" [[projects]] branch = "v2" @@ -259,6 +264,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "630ecbe28607c5d56f92c963e05a5a6c861ca29c114e11820eae5ac447bb22db" + inputs-digest = "6f8a30799d422c1fb4f491578e870be43f2a0426514fb4ca656a6cf118debff5" solver-name = "gps-cdcl" solver-version = 1 diff --git a/bosh/boshfakes/fake_director.go b/bosh/boshfakes/fake_director.go index e69e075e1..254edc25d 100644 --- a/bosh/boshfakes/fake_director.go +++ b/bosh/boshfakes/fake_director.go @@ -402,11 +402,7 @@ func (fake *FakeDirector) Invocations() map[string][][]interface{} { defer fake.uploadReleaseMutex.RUnlock() fake.uploadStemcellMutex.RLock() defer fake.uploadStemcellMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations + return fake.invocations } func (fake *FakeDirector) recordInvocation(key string, args []interface{}) { diff --git a/bosh/boshfakes/fake_proxy.go b/bosh/boshfakes/fake_proxy.go new file mode 100644 index 000000000..58154b63e --- /dev/null +++ b/bosh/boshfakes/fake_proxy.go @@ -0,0 +1,152 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package boshfakes + +import ( + "sync" + + "github.com/cloudfoundry/bosh-deployment-resource/bosh" +) + +type FakeProxy struct { + StartStub func(string, string) error + startMutex sync.RWMutex + startArgsForCall []struct { + arg1 string + arg2 string + } + startReturns struct { + result1 error + } + startReturnsOnCall map[int]struct { + result1 error + } + AddrStub func() (string, error) + addrMutex sync.RWMutex + addrArgsForCall []struct{} + addrReturns struct { + result1 string + result2 error + } + addrReturnsOnCall map[int]struct { + result1 string + result2 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeProxy) Start(arg1 string, arg2 string) error { + fake.startMutex.Lock() + ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] + fake.startArgsForCall = append(fake.startArgsForCall, struct { + arg1 string + arg2 string + }{arg1, arg2}) + fake.recordInvocation("Start", []interface{}{arg1, arg2}) + fake.startMutex.Unlock() + if fake.StartStub != nil { + return fake.StartStub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fake.startReturns.result1 +} + +func (fake *FakeProxy) StartCallCount() int { + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + return len(fake.startArgsForCall) +} + +func (fake *FakeProxy) StartArgsForCall(i int) (string, string) { + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + return fake.startArgsForCall[i].arg1, fake.startArgsForCall[i].arg2 +} + +func (fake *FakeProxy) StartReturns(result1 error) { + fake.StartStub = nil + fake.startReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeProxy) StartReturnsOnCall(i int, result1 error) { + fake.StartStub = nil + if fake.startReturnsOnCall == nil { + fake.startReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.startReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeProxy) Addr() (string, error) { + fake.addrMutex.Lock() + ret, specificReturn := fake.addrReturnsOnCall[len(fake.addrArgsForCall)] + fake.addrArgsForCall = append(fake.addrArgsForCall, struct{}{}) + fake.recordInvocation("Addr", []interface{}{}) + fake.addrMutex.Unlock() + if fake.AddrStub != nil { + return fake.AddrStub() + } + if specificReturn { + return ret.result1, ret.result2 + } + return fake.addrReturns.result1, fake.addrReturns.result2 +} + +func (fake *FakeProxy) AddrCallCount() int { + fake.addrMutex.RLock() + defer fake.addrMutex.RUnlock() + return len(fake.addrArgsForCall) +} + +func (fake *FakeProxy) AddrReturns(result1 string, result2 error) { + fake.AddrStub = nil + fake.addrReturns = struct { + result1 string + result2 error + }{result1, result2} +} + +func (fake *FakeProxy) AddrReturnsOnCall(i int, result1 string, result2 error) { + fake.AddrStub = nil + if fake.addrReturnsOnCall == nil { + fake.addrReturnsOnCall = make(map[int]struct { + result1 string + result2 error + }) + } + fake.addrReturnsOnCall[i] = struct { + result1 string + result2 error + }{result1, result2} +} + +func (fake *FakeProxy) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + fake.addrMutex.RLock() + defer fake.addrMutex.RUnlock() + return fake.invocations +} + +func (fake *FakeProxy) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ bosh.Proxy = new(FakeProxy) diff --git a/bosh/boshfakes/fake_runner.go b/bosh/boshfakes/fake_runner.go index b8549d966..a6a3772fe 100644 --- a/bosh/boshfakes/fake_runner.go +++ b/bosh/boshfakes/fake_runner.go @@ -205,11 +205,7 @@ func (fake *FakeRunner) Invocations() map[string][][]interface{} { defer fake.executeMutex.RUnlock() fake.executeWithDefaultOverrideMutex.RLock() defer fake.executeWithDefaultOverrideMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations + return fake.invocations } func (fake *FakeRunner) recordInvocation(key string, args []interface{}) { diff --git a/bosh/cli_coordinator.go b/bosh/cli_coordinator.go index 8d84947b7..4b6d6fddc 100644 --- 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, diff --git a/bosh/cli_coordinator_test.go b/bosh/cli_coordinator_test.go index b64e127e4..1c7fe0a86 100644 --- a/bosh/cli_coordinator_test.go +++ b/bosh/cli_coordinator_test.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/cloudfoundry/bosh-deployment-resource/bosh" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy/proxyfakes" + "github.com/cloudfoundry/bosh-deployment-resource/bosh/boshfakes" "github.com/cloudfoundry/bosh-deployment-resource/concourse" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -13,12 +13,12 @@ import ( var _ = Describe("CLI coordinator", func() { var ( cliCoordinator bosh.CLICoordinator - fakeProxy *proxyfakes.FakeProxy + fakeProxy *boshfakes.FakeProxy source concourse.Source ) BeforeEach(func() { - fakeProxy = &proxyfakes.FakeProxy{} + fakeProxy = &boshfakes.FakeProxy{} fakeProxy.AddrReturns("some-proxy-addr", nil) fakeProxy.AddrReturnsOnCall(0, "", errors.New("proxy is not running")) source = concourse.Source{JumpboxSSHKey: "some-key", JumpboxURL: "some-url"} diff --git a/cmd/check/main.go b/cmd/check/main.go index c0220a3f4..26413a505 100644 --- a/cmd/check/main.go +++ b/cmd/check/main.go @@ -8,9 +8,9 @@ import ( "io/ioutil" "github.com/cloudfoundry/bosh-deployment-resource/bosh" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" "github.com/cloudfoundry/bosh-deployment-resource/check" "github.com/cloudfoundry/bosh-deployment-resource/concourse" + proxy "github.com/cloudfoundry/socks5-proxy" ) func main() { diff --git a/cmd/in/main.go b/cmd/in/main.go index 3b4023221..060cee5e0 100644 --- a/cmd/in/main.go +++ b/cmd/in/main.go @@ -7,9 +7,9 @@ import ( "os" "github.com/cloudfoundry/bosh-deployment-resource/bosh" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" "github.com/cloudfoundry/bosh-deployment-resource/concourse" "github.com/cloudfoundry/bosh-deployment-resource/in" + proxy "github.com/cloudfoundry/socks5-proxy" ) func main() { diff --git a/cmd/out/main.go b/cmd/out/main.go index eba86791d..0c5a52945 100644 --- a/cmd/out/main.go +++ b/cmd/out/main.go @@ -8,10 +8,10 @@ import ( "io/ioutil" "github.com/cloudfoundry/bosh-deployment-resource/bosh" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" "github.com/cloudfoundry/bosh-deployment-resource/concourse" "github.com/cloudfoundry/bosh-deployment-resource/out" "github.com/cloudfoundry/bosh-deployment-resource/storage" + proxy "github.com/cloudfoundry/socks5-proxy" ) func main() { diff --git a/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock b/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock new file mode 100644 index 000000000..8756dedd6 --- /dev/null +++ b/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock @@ -0,0 +1,57 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + branch = "master" + name = "github.com/armon/go-socks5" + packages = ["."] + revision = "e75332964ef517daa070d7c38a9466a0d687e0a5" + +[[projects]] + branch = "master" + name = "github.com/onsi/ginkgo" + packages = [".","config","internal/codelocation","internal/containernode","internal/failer","internal/leafnodes","internal/remote","internal/spec","internal/spec_iterator","internal/specrunner","internal/suite","internal/testingtproxy","internal/writer","reporters","reporters/stenographer","reporters/stenographer/support/go-colorable","reporters/stenographer/support/go-isatty","types"] + revision = "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47" + +[[projects]] + branch = "master" + name = "github.com/onsi/gomega" + packages = [".","format","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"] + revision = "c893efa28eb45626cdaa76c9f653b62488858837" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = ["curve25519","ed25519","ed25519/internal/edwards25519","ssh"] + revision = "b176d7def5d71bdd214203491f89843ed217f420" + +[[projects]] + branch = "master" + name = "golang.org/x/net" + packages = ["context","html","html/atom","html/charset","proxy"] + revision = "1c05540f6879653db88113bc4a2b70aec4bd491f" + +[[projects]] + branch = "master" + name = "golang.org/x/sys" + packages = ["unix"] + revision = "e42485b6e20ae7d2304ec72e535b103ed350cc02" + +[[projects]] + branch = "master" + name = "golang.org/x/text" + packages = ["encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/gen","internal/tag","internal/utf8internal","language","runes","transform","unicode/cldr"] + revision = "3bd178b88a8180be2df394a1fbb81313916f0e7b" + +[[projects]] + branch = "v2" + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "25c4ec802a7d637f88d584ab26798e94ad14c13b" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "c11b3b25febc450566c952c75475f72e09abfc2bace1295d0c089dfe5ecb479b" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.toml b/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.toml new file mode 100644 index 000000000..bccb9c3c8 --- /dev/null +++ b/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.toml @@ -0,0 +1,91 @@ + +## Gopkg.toml example (these lines may be deleted) + +## "metadata" defines metadata about the project that could be used by other independent +## systems. The metadata defined here will be ignored by dep. +# [metadata] +# key1 = "value that convey data to other systems" +# system1-data = "value that is used by a system" +# system2-data = "value that is used by another system" + +## "required" lists a set of packages (not projects) that must be included in +## Gopkg.lock. This list is merged with the set of packages imported by the current +## project. Use it when your project needs a package it doesn't explicitly import - +## including "main" packages. +# required = ["github.com/user/thing/cmd/thing"] + +## "ignored" lists a set of packages (not projects) that are ignored when +## dep statically analyzes source code. Ignored packages can be in this project, +## or in a dependency. +# ignored = ["github.com/user/project/badpkg"] + +## Constraints are rules for how directly imported projects +## may be incorporated into the depgraph. They are respected by +## dep whether coming from the Gopkg.toml of the current project or a dependency. +# [[constraint]] +## Required: the root import path of the project being constrained. +# name = "github.com/user/project" +# +## Recommended: the version constraint to enforce for the project. +## Only one of "branch", "version" or "revision" can be specified. +# version = "1.0.0" +# branch = "master" +# revision = "abc123" +# +## Optional: an alternate location (URL or import path) for the project's source. +# source = "https://github.com/myfork/package.git" +# +## "metadata" defines metadata about the dependency or override that could be used +## by other independent systems. The metadata defined here will be ignored by dep. +# [metadata] +# key1 = "value that convey data to other systems" +# system1-data = "value that is used by a system" +# system2-data = "value that is used by another system" + +## Overrides have the same structure as [[constraint]], but supersede all +## [[constraint]] declarations from all projects. Only [[override]] from +## the current project's are applied. +## +## Overrides are a sledgehammer. Use them only as a last resort. +# [[override]] +## Required: the root import path of the project being constrained. +# name = "github.com/user/project" +# +## Optional: specifying a version constraint override will cause all other +## constraints on this project to be ignored; only the overridden constraint +## need be satisfied. +## Again, only one of "branch", "version" or "revision" can be specified. +# version = "1.0.0" +# branch = "master" +# revision = "abc123" +# +## Optional: specifying an alternate source location as an override will +## enforce that the alternate location is used for that project, regardless of +## what source location any dependent projects specify. +# source = "https://github.com/myfork/package.git" + + + +[[constraint]] + branch = "master" + name = "github.com/armon/go-socks5" + +[[constraint]] + branch = "master" + name = "github.com/cloudfoundry/bosh-deployment-resource" + +[[constraint]] + branch = "master" + name = "github.com/onsi/ginkgo" + +[[constraint]] + branch = "master" + name = "github.com/onsi/gomega" + +[[constraint]] + branch = "master" + name = "golang.org/x/crypto" + +[[constraint]] + branch = "master" + name = "golang.org/x/net" diff --git a/bosh/proxy/exports_test.go b/vendor/github.com/cloudfoundry/socks5-proxy/exports_test.go similarity index 100% rename from bosh/proxy/exports_test.go rename to vendor/github.com/cloudfoundry/socks5-proxy/exports_test.go diff --git a/bosh/proxy/proxyfakes/fake_key_getter.go b/vendor/github.com/cloudfoundry/socks5-proxy/fakes/fake_key_getter.go similarity index 97% rename from bosh/proxy/proxyfakes/fake_key_getter.go rename to vendor/github.com/cloudfoundry/socks5-proxy/fakes/fake_key_getter.go index b57f9b069..3ce22fa70 100644 --- a/bosh/proxy/proxyfakes/fake_key_getter.go +++ b/vendor/github.com/cloudfoundry/socks5-proxy/fakes/fake_key_getter.go @@ -1,10 +1,10 @@ // Code generated by counterfeiter. DO NOT EDIT. -package proxyfakes +package fakes import ( "sync" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" + proxy "github.com/cloudfoundry/socks5-proxy" "golang.org/x/crypto/ssh" ) diff --git a/bosh/proxy/proxyfakes/fake_proxy.go b/vendor/github.com/cloudfoundry/socks5-proxy/fakes/fake_proxy.go similarity index 97% rename from bosh/proxy/proxyfakes/fake_proxy.go rename to vendor/github.com/cloudfoundry/socks5-proxy/fakes/fake_proxy.go index d699f39d1..8a55d596f 100644 --- a/bosh/proxy/proxyfakes/fake_proxy.go +++ b/vendor/github.com/cloudfoundry/socks5-proxy/fakes/fake_proxy.go @@ -1,10 +1,10 @@ // Code generated by counterfeiter. DO NOT EDIT. -package proxyfakes +package fakes import ( "sync" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" + proxy "github.com/cloudfoundry/socks5-proxy" ) type FakeProxy struct { diff --git a/bosh/proxy/host_key_getter.go b/vendor/github.com/cloudfoundry/socks5-proxy/host_key_getter.go similarity index 100% rename from bosh/proxy/host_key_getter.go rename to vendor/github.com/cloudfoundry/socks5-proxy/host_key_getter.go diff --git a/bosh/proxy/host_key_getter_test.go b/vendor/github.com/cloudfoundry/socks5-proxy/host_key_getter_test.go similarity index 94% rename from bosh/proxy/host_key_getter_test.go rename to vendor/github.com/cloudfoundry/socks5-proxy/host_key_getter_test.go index 5974dd649..dd268a502 100644 --- a/bosh/proxy/host_key_getter_test.go +++ b/vendor/github.com/cloudfoundry/socks5-proxy/host_key_getter_test.go @@ -1,8 +1,7 @@ package proxy_test import ( - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" - + proxy "github.com/cloudfoundry/socks5-proxy" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "golang.org/x/crypto/ssh" diff --git a/bosh/proxy/init_test.go b/vendor/github.com/cloudfoundry/socks5-proxy/init_test.go similarity index 100% rename from bosh/proxy/init_test.go rename to vendor/github.com/cloudfoundry/socks5-proxy/init_test.go diff --git a/bosh/proxy/socks5_proxy.go b/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy.go similarity index 100% rename from bosh/proxy/socks5_proxy.go rename to vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy.go diff --git a/bosh/proxy/socks5_proxy_test.go b/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy_test.go similarity index 95% rename from bosh/proxy/socks5_proxy_test.go rename to vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy_test.go index 2c7e5581e..4103f004b 100644 --- a/bosh/proxy/socks5_proxy_test.go +++ b/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy_test.go @@ -9,20 +9,18 @@ import ( "strings" "time" - "golang.org/x/crypto/ssh" - goproxy "golang.org/x/net/proxy" - - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy" - "github.com/cloudfoundry/bosh-deployment-resource/bosh/proxy/proxyfakes" - + proxy "github.com/cloudfoundry/socks5-proxy" + "github.com/cloudfoundry/socks5-proxy/fakes" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "golang.org/x/crypto/ssh" + goproxy "golang.org/x/net/proxy" ) var _ = Describe("Socks5Proxy", func() { var ( socks5Proxy *proxy.Socks5Proxy - hostKeyGetter *proxyfakes.FakeKeyGetter + hostKeyGetter *fakes.FakeKeyGetter sshServerURL string httpServerHostPort string @@ -41,7 +39,7 @@ var _ = Describe("Socks5Proxy", func() { signer, err := ssh.ParsePrivateKey([]byte(sshPrivateKey)) Expect(err).NotTo(HaveOccurred()) - hostKeyGetter = &proxyfakes.FakeKeyGetter{} + hostKeyGetter = &fakes.FakeKeyGetter{} hostKeyGetter.GetReturns(signer.PublicKey(), nil) proxyError = make(chan error)