diff --git a/go.mod b/go.mod index 32564b00a..8e13170bd 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.22 toolchain go1.22.0 require ( - code.cloudfoundry.org/credhub-cli v0.0.0-20240826130714-db1bf1b6b6ac + code.cloudfoundry.org/credhub-cli v0.0.0-20240902130721-726266af5f6a code.cloudfoundry.org/lager/v3 v3.3.0 github.com/blang/semver/v4 v4.0.0 github.com/cloudfoundry-community/go-uaa v0.3.3 github.com/cloudfoundry/bosh-cli/v7 v7.7.0 - github.com/cloudfoundry/bosh-utils v0.0.485 + github.com/cloudfoundry/bosh-utils v0.0.486 github.com/craigfurman/herottp v0.0.0-20190418132442-c546d62f2a8d github.com/gorilla/mux v1.8.1 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 @@ -29,8 +29,8 @@ require ( code.cloudfoundry.org/tlsconfig v0.1.0 // indirect github.com/bmatcuk/doublestar v1.3.4 // indirect github.com/charlievieth/fs v0.0.3 // indirect - github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect - github.com/cloudfoundry/socks5-proxy v0.2.121 // indirect + github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee // indirect + github.com/cloudfoundry/socks5-proxy v0.2.122 // indirect github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/go-chi/chi/v5 v5.1.0 // indirect @@ -40,7 +40,7 @@ require ( github.com/go-playground/validator/v10 v10.22.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect + github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect diff --git a/go.sum b/go.sum index 9baedaee6..820f717c9 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ code.cloudfoundry.org/clock v1.2.0 h1:1swXS7yPmQmhAdkTb1nJ2c0geOdf4LvibUleNCo2HjA= code.cloudfoundry.org/clock v1.2.0/go.mod h1:foDbmVp5RIuIGlota90ot4FkJtx5m4+oKoWiVuu2FDg= -code.cloudfoundry.org/credhub-cli v0.0.0-20240826130714-db1bf1b6b6ac h1:u3P40rKvThhdwCazatnnubD2yFaQFcCa3AtNRxE15Xk= -code.cloudfoundry.org/credhub-cli v0.0.0-20240826130714-db1bf1b6b6ac/go.mod h1:M9QsV53oELwmv2DfJ7XnxVKvA2fDBVcsdN6ZnA39GP8= +code.cloudfoundry.org/credhub-cli v0.0.0-20240902130721-726266af5f6a h1:JhPRP9WMq2aaSD573uPpgWTERoPVHwIDUE3/tCJDsIY= +code.cloudfoundry.org/credhub-cli v0.0.0-20240902130721-726266af5f6a/go.mod h1:zFetpGhBJoTRcHXrTxUCp7IKHKWXLZ2+YG43RYkyyXA= code.cloudfoundry.org/lager/v3 v3.3.0 h1:adWGo2aBLpHVfUG+3D2FQ4B6Mf2Bcz47KITbn8V4b0k= code.cloudfoundry.org/lager/v3 v3.3.0/go.mod h1:k/AYgZTVrwQaneNfQ2EwnZxUb9iUFE7i6AJ3KVOtAdE= code.cloudfoundry.org/tlsconfig v0.1.0 h1:/SGZk3K7t79cuhSVs/qZXayEnLV1kodmvU3EBcc4E4w= @@ -18,12 +18,12 @@ github.com/cloudfoundry-community/go-uaa v0.3.3 h1:VvThn655xL/drEC0wA32dPOGO81GA github.com/cloudfoundry-community/go-uaa v0.3.3/go.mod h1:6I8rkeZMpzdyG/SrAWlrnLs8WwO7j87BXT8njRkctTk= github.com/cloudfoundry/bosh-cli/v7 v7.7.0 h1:bfjkBok78lKHirZrt3G5cmFQ3z+fSKgRjDaKIa8p+Vc= github.com/cloudfoundry/bosh-cli/v7 v7.7.0/go.mod h1:lVSYcMWF/k0081hhGVuoZ23ICs+hhewvb4fheQt9Xsg= -github.com/cloudfoundry/bosh-utils v0.0.485 h1:27unCVMmYlWb2xzKWtpkkpsaM3LEU3p39OFSq7Su0LM= -github.com/cloudfoundry/bosh-utils v0.0.485/go.mod h1:BtS3XVKTb6N37ecru72WtX1I2IF5XaaFV1k0zzI/n10= -github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e h1:FQdRViaoDphGRfgrotl2QGsX1gbloe57dbGBS5CG6KY= -github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e/go.mod h1:PXmcacyJB/pJjSxEl15IU6rEIKXrhZQRzsr0UTkgNNs= -github.com/cloudfoundry/socks5-proxy v0.2.121 h1:TiWZlwHCDUrPt+diReZp4kwXocwufKWE/JybLOsWsxo= -github.com/cloudfoundry/socks5-proxy v0.2.121/go.mod h1:mNi+PGrviQiW+h5JOfZ7G4/ppmIdD2V1I+k3PzV14ow= +github.com/cloudfoundry/bosh-utils v0.0.486 h1:ubCyx+BYtba5/QJM6NLNdhsEq9+l8WCjPDp4Q3Us6cs= +github.com/cloudfoundry/bosh-utils v0.0.486/go.mod h1:G/4pEwWIXnwnK+RM472+A+YWbfmrwH4xzx7qkdRKsQ8= +github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee h1:88ruSYvCUKX2YcF2CMYVTmPGITvNdRbzaBRk2c/iMds= +github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee/go.mod h1:72EEm1oq5oXqGfu9XGtaRPWEcAFYd/P10cMNln0QhA8= +github.com/cloudfoundry/socks5-proxy v0.2.122 h1:Gh6rP/P2gcx6lZZ2dNVComumven0RbST3NRTC8PNd9M= +github.com/cloudfoundry/socks5-proxy v0.2.122/go.mod h1:HU6mWPd37l6Yw+H98Kffb+5KP6o2l749kw054psBsUM= github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 h1:J+ghqo7ZubTzelkjo9hntpTtP/9lUCWH9icEmAW+B+Q= github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4/go.mod h1:socxpf5+mELPbosI149vWpNlHK6mbfWFxSWOoSndXR8= github.com/craigfurman/herottp v0.0.0-20190418132442-c546d62f2a8d h1:Qun4nleHcXeLhMnBphrwAbEBpVYWQ4e7FgATqZzdYW4= @@ -51,8 +51,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25 h1:sEDPKUw6iPjczdu33njxFjO6tYa9bfc0z/QyB/zSsBw= +github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/vendor/github.com/cloudfoundry/go-socks5/.gitignore b/vendor/github.com/cloudfoundry/go-socks5/.gitignore index 00268614f..79aa76b8d 100644 --- a/vendor/github.com/cloudfoundry/go-socks5/.gitignore +++ b/vendor/github.com/cloudfoundry/go-socks5/.gitignore @@ -20,3 +20,6 @@ _cgo_export.* _testmain.go *.exe +.idea +go.sum +vendor diff --git a/vendor/github.com/cloudfoundry/go-socks5/socks5.go b/vendor/github.com/cloudfoundry/go-socks5/socks5.go index b8816a304..23b5f863c 100644 --- a/vendor/github.com/cloudfoundry/go-socks5/socks5.go +++ b/vendor/github.com/cloudfoundry/go-socks5/socks5.go @@ -105,6 +105,15 @@ func (s *Server) ListenAndServe(network, addr string) error { return s.Serve(l) } +// Listen only starts listening, useful if you want to block and wait for listening before serving +func (s *Server) Listen(network, addr string) (net.Listener, error) { + l, err := net.Listen(network, addr) + if err != nil { + return nil, err + } + return l, nil +} + // Serve is used to serve connections from a listener func (s *Server) Serve(l net.Listener) error { for { diff --git a/vendor/github.com/google/pprof/profile/encode.go b/vendor/github.com/google/pprof/profile/encode.go index 860bb304c..8ce9d3cf3 100644 --- a/vendor/github.com/google/pprof/profile/encode.go +++ b/vendor/github.com/google/pprof/profile/encode.go @@ -122,6 +122,7 @@ func (p *Profile) preEncode() { } p.defaultSampleTypeX = addString(strings, p.DefaultSampleType) + p.docURLX = addString(strings, p.DocURL) p.stringTable = make([]string, len(strings)) for s, i := range strings { @@ -156,6 +157,7 @@ func (p *Profile) encode(b *buffer) { encodeInt64Opt(b, 12, p.Period) encodeInt64s(b, 13, p.commentX) encodeInt64(b, 14, p.defaultSampleTypeX) + encodeInt64Opt(b, 15, p.docURLX) } var profileDecoder = []decoder{ @@ -237,6 +239,8 @@ var profileDecoder = []decoder{ func(b *buffer, m message) error { return decodeInt64s(b, &m.(*Profile).commentX) }, // int64 defaultSampleType = 14 func(b *buffer, m message) error { return decodeInt64(b, &m.(*Profile).defaultSampleTypeX) }, + // string doc_link = 15; + func(b *buffer, m message) error { return decodeInt64(b, &m.(*Profile).docURLX) }, } // postDecode takes the unexported fields populated by decode (with @@ -384,6 +388,7 @@ func (p *Profile) postDecode() error { p.commentX = nil p.DefaultSampleType, err = getString(p.stringTable, &p.defaultSampleTypeX, err) + p.DocURL, err = getString(p.stringTable, &p.docURLX, err) p.stringTable = nil return err } diff --git a/vendor/github.com/google/pprof/profile/merge.go b/vendor/github.com/google/pprof/profile/merge.go index eee0132e7..ba4d74640 100644 --- a/vendor/github.com/google/pprof/profile/merge.go +++ b/vendor/github.com/google/pprof/profile/merge.go @@ -476,6 +476,7 @@ func combineHeaders(srcs []*Profile) (*Profile, error) { var timeNanos, durationNanos, period int64 var comments []string seenComments := map[string]bool{} + var docURL string var defaultSampleType string for _, s := range srcs { if timeNanos == 0 || s.TimeNanos < timeNanos { @@ -494,6 +495,9 @@ func combineHeaders(srcs []*Profile) (*Profile, error) { if defaultSampleType == "" { defaultSampleType = s.DefaultSampleType } + if docURL == "" { + docURL = s.DocURL + } } p := &Profile{ @@ -509,6 +513,7 @@ func combineHeaders(srcs []*Profile) (*Profile, error) { Comments: comments, DefaultSampleType: defaultSampleType, + DocURL: docURL, } copy(p.SampleType, srcs[0].SampleType) return p, nil diff --git a/vendor/github.com/google/pprof/profile/profile.go b/vendor/github.com/google/pprof/profile/profile.go index 5551eb0bf..0983656c2 100644 --- a/vendor/github.com/google/pprof/profile/profile.go +++ b/vendor/github.com/google/pprof/profile/profile.go @@ -39,6 +39,7 @@ type Profile struct { Location []*Location Function []*Function Comments []string + DocURL string DropFrames string KeepFrames string @@ -53,6 +54,7 @@ type Profile struct { encodeMu sync.Mutex commentX []int64 + docURLX int64 dropFramesX int64 keepFramesX int64 stringTable []string @@ -555,6 +557,9 @@ func (p *Profile) String() string { for _, c := range p.Comments { ss = append(ss, "Comment: "+c) } + if url := p.DocURL; url != "" { + ss = append(ss, fmt.Sprintf("Doc: %s", url)) + } if pt := p.PeriodType; pt != nil { ss = append(ss, fmt.Sprintf("PeriodType: %s %s", pt.Type, pt.Unit)) } diff --git a/vendor/modules.txt b/vendor/modules.txt index d4503fb6a..0222d4957 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,5 +1,5 @@ -# code.cloudfoundry.org/credhub-cli v0.0.0-20240826130714-db1bf1b6b6ac -## explicit; go 1.21.6 +# code.cloudfoundry.org/credhub-cli v0.0.0-20240902130721-726266af5f6a +## explicit; go 1.22 code.cloudfoundry.org/credhub-cli/credhub code.cloudfoundry.org/credhub-cli/credhub/auth code.cloudfoundry.org/credhub-cli/credhub/auth/uaa @@ -34,7 +34,7 @@ github.com/cloudfoundry/bosh-cli/v7/common/util github.com/cloudfoundry/bosh-cli/v7/director github.com/cloudfoundry/bosh-cli/v7/io github.com/cloudfoundry/bosh-cli/v7/uaa -# github.com/cloudfoundry/bosh-utils v0.0.485 +# github.com/cloudfoundry/bosh-utils v0.0.486 ## explicit; go 1.21.0 github.com/cloudfoundry/bosh-utils/crypto github.com/cloudfoundry/bosh-utils/errors @@ -44,10 +44,10 @@ github.com/cloudfoundry/bosh-utils/property github.com/cloudfoundry/bosh-utils/retrystrategy github.com/cloudfoundry/bosh-utils/system github.com/cloudfoundry/bosh-utils/uuid -# github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e -## explicit +# github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee +## explicit; go 1.21.0 github.com/cloudfoundry/go-socks5 -# github.com/cloudfoundry/socks5-proxy v0.2.121 +# github.com/cloudfoundry/socks5-proxy v0.2.122 ## explicit; go 1.21.0 github.com/cloudfoundry/socks5-proxy # github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 @@ -89,7 +89,7 @@ github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value -# github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 +# github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25 ## explicit; go 1.22 github.com/google/pprof/profile # github.com/google/uuid v1.6.0