diff --git a/go.mod b/go.mod index 6e23e75b..75766c36 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/nats-io/nats.go v1.36.0 github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/gomega v1.33.1 + github.com/onsi/gomega v1.34.0 github.com/pivotal-cf/brokerapi/v7 v7.5.0 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 diff --git a/go.sum b/go.sum index 16612470..ac412daf 100644 --- a/go.sum +++ b/go.sum @@ -128,8 +128,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os= +github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo= github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= diff --git a/vendor/github.com/onsi/gomega/CHANGELOG.md b/vendor/github.com/onsi/gomega/CHANGELOG.md index 62af14ad..9572e5fa 100644 --- a/vendor/github.com/onsi/gomega/CHANGELOG.md +++ b/vendor/github.com/onsi/gomega/CHANGELOG.md @@ -1,3 +1,20 @@ +## 1.34.0 + +### Features +- Add RoundTripper method to ghttp.Server [c549e0d] + +### Fixes +- fix incorrect handling of nil slices in HaveExactElements (fixes #771) [878940c] +- issue_765 - fixed bug in Hopcroft-Karp algorithm [ebadb67] + +### Maintenance +- bump ginkgo [8af2ece] +- Fix typo in docs [123a071] +- Bump github.com/onsi/ginkgo/v2 from 2.17.2 to 2.17.3 (#756) [0e69083] +- Bump google.golang.org/protobuf from 1.33.0 to 1.34.1 (#755) [2675796] +- Bump golang.org/x/net from 0.24.0 to 0.25.0 (#754) [4160c0f] +- Bump github-pages from 230 to 231 in /docs (#748) [892c303] + ## 1.33.1 ### Fixes diff --git a/vendor/github.com/onsi/gomega/ghttp/test_server.go b/vendor/github.com/onsi/gomega/ghttp/test_server.go index 383573bd..dfde0a42 100644 --- a/vendor/github.com/onsi/gomega/ghttp/test_server.go +++ b/vendor/github.com/onsi/gomega/ghttp/test_server.go @@ -186,26 +186,26 @@ type Server struct { calls int } -//Start() starts an unstarted ghttp server. It is a catastrophic error to call Start more than once (thanks, httptest). +// Start() starts an unstarted ghttp server. It is a catastrophic error to call Start more than once (thanks, httptest). func (s *Server) Start() { s.HTTPTestServer.Start() } -//URL() returns a url that will hit the server +// URL() returns a url that will hit the server func (s *Server) URL() string { s.rwMutex.RLock() defer s.rwMutex.RUnlock() return s.HTTPTestServer.URL } -//Addr() returns the address on which the server is listening. +// Addr() returns the address on which the server is listening. func (s *Server) Addr() string { s.rwMutex.RLock() defer s.rwMutex.RUnlock() return s.HTTPTestServer.Listener.Addr().String() } -//Close() should be called at the end of each test. It spins down and cleans up the test server. +// Close() should be called at the end of each test. It spins down and cleans up the test server. func (s *Server) Close() { s.rwMutex.Lock() server := s.HTTPTestServer @@ -217,14 +217,14 @@ func (s *Server) Close() { } } -//ServeHTTP() makes Server an http.Handler -//When the server receives a request it handles the request in the following order: +// ServeHTTP() makes Server an http.Handler +// When the server receives a request it handles the request in the following order: // -//1. If the request matches a handler registered with RouteToHandler, that handler is called. -//2. Otherwise, if there are handlers registered via AppendHandlers, those handlers are called in order. -//3. If all registered handlers have been called then: -// a) If AllowUnhandledRequests is set to true, the request will be handled with response code of UnhandledRequestStatusCode -// b) If AllowUnhandledRequests is false, the request will not be handled and the current test will be marked as failed. +// 1. If the request matches a handler registered with RouteToHandler, that handler is called. +// 2. Otherwise, if there are handlers registered via AppendHandlers, those handlers are called in order. +// 3. If all registered handlers have been called then: +// a) If AllowUnhandledRequests is set to true, the request will be handled with response code of UnhandledRequestStatusCode +// b) If AllowUnhandledRequests is false, the request will not be handled and the current test will be marked as failed. func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) { s.rwMutex.Lock() defer func() { @@ -280,7 +280,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) { } } -//ReceivedRequests is an array containing all requests received by the server (both handled and unhandled requests) +// ReceivedRequests is an array containing all requests received by the server (both handled and unhandled requests) func (s *Server) ReceivedRequests() []*http.Request { s.rwMutex.RLock() defer s.rwMutex.RUnlock() @@ -288,10 +288,10 @@ func (s *Server) ReceivedRequests() []*http.Request { return s.receivedRequests } -//RouteToHandler can be used to register handlers that will always handle requests that match -//the passed in method and path. +// RouteToHandler can be used to register handlers that will always handle requests that match +// the passed in method and path. // -//The path may be either a string object or a *regexp.Regexp. +// The path may be either a string object or a *regexp.Regexp. func (s *Server) RouteToHandler(method string, path interface{}, handler http.HandlerFunc) { s.rwMutex.Lock() defer s.rwMutex.Unlock() @@ -337,7 +337,7 @@ func (s *Server) handlerForRoute(method string, path string) (http.HandlerFunc, return nil, false } -//AppendHandlers will appends http.HandlerFuncs to the server's list of registered handlers. The first incoming request is handled by the first handler, the second by the second, etc... +// AppendHandlers will appends http.HandlerFuncs to the server's list of registered handlers. The first incoming request is handled by the first handler, the second by the second, etc... func (s *Server) AppendHandlers(handlers ...http.HandlerFunc) { s.rwMutex.Lock() defer s.rwMutex.Unlock() @@ -345,9 +345,9 @@ func (s *Server) AppendHandlers(handlers ...http.HandlerFunc) { s.requestHandlers = append(s.requestHandlers, handlers...) } -//SetHandler overrides the registered handler at the passed in index with the passed in handler -//This is useful, for example, when a server has been set up in a shared context, but must be tweaked -//for a particular test. +// SetHandler overrides the registered handler at the passed in index with the passed in handler +// This is useful, for example, when a server has been set up in a shared context, but must be tweaked +// for a particular test. func (s *Server) SetHandler(index int, handler http.HandlerFunc) { s.rwMutex.Lock() defer s.rwMutex.Unlock() @@ -355,7 +355,7 @@ func (s *Server) SetHandler(index int, handler http.HandlerFunc) { s.requestHandlers[index] = handler } -//GetHandler returns the handler registered at the passed in index. +// GetHandler returns the handler registered at the passed in index. func (s *Server) GetHandler(index int) http.HandlerFunc { s.rwMutex.RLock() defer s.rwMutex.RUnlock() @@ -374,12 +374,12 @@ func (s *Server) Reset() { s.routedHandlers = nil } -//WrapHandler combines the passed in handler with the handler registered at the passed in index. -//This is useful, for example, when a server has been set up in a shared context but must be tweaked -//for a particular test. +// WrapHandler combines the passed in handler with the handler registered at the passed in index. +// This is useful, for example, when a server has been set up in a shared context but must be tweaked +// for a particular test. // -//If the currently registered handler is A, and the new passed in handler is B then -//WrapHandler will generate a new handler that first calls A, then calls B, and assign it to index +// If the currently registered handler is A, and the new passed in handler is B then +// WrapHandler will generate a new handler that first calls A, then calls B, and assign it to index func (s *Server) WrapHandler(index int, handler http.HandlerFunc) { existingHandler := s.GetHandler(index) s.SetHandler(index, CombineHandlers(existingHandler, handler)) @@ -392,7 +392,7 @@ func (s *Server) CloseClientConnections() { s.HTTPTestServer.CloseClientConnections() } -//SetAllowUnhandledRequests enables the server to accept unhandled requests. +// SetAllowUnhandledRequests enables the server to accept unhandled requests. func (s *Server) SetAllowUnhandledRequests(allowUnhandledRequests bool) { s.rwMutex.Lock() defer s.rwMutex.Unlock() @@ -400,7 +400,7 @@ func (s *Server) SetAllowUnhandledRequests(allowUnhandledRequests bool) { s.AllowUnhandledRequests = allowUnhandledRequests } -//GetAllowUnhandledRequests returns true if the server accepts unhandled requests. +// GetAllowUnhandledRequests returns true if the server accepts unhandled requests. func (s *Server) GetAllowUnhandledRequests() bool { s.rwMutex.RLock() defer s.rwMutex.RUnlock() @@ -408,7 +408,7 @@ func (s *Server) GetAllowUnhandledRequests() bool { return s.AllowUnhandledRequests } -//SetUnhandledRequestStatusCode status code to be returned when the server receives unhandled requests +// SetUnhandledRequestStatusCode status code to be returned when the server receives unhandled requests func (s *Server) SetUnhandledRequestStatusCode(statusCode int) { s.rwMutex.Lock() defer s.rwMutex.Unlock() @@ -416,10 +416,31 @@ func (s *Server) SetUnhandledRequestStatusCode(statusCode int) { s.UnhandledRequestStatusCode = statusCode } -//GetUnhandledRequestStatusCode returns the current status code being returned for unhandled requests +// GetUnhandledRequestStatusCode returns the current status code being returned for unhandled requests func (s *Server) GetUnhandledRequestStatusCode() int { s.rwMutex.RLock() defer s.rwMutex.RUnlock() return s.UnhandledRequestStatusCode } + +// RoundTripper returns a RoundTripper which updates requests to point to the server. +// This is useful when you want to use the server as a RoundTripper in an http.Client. +// If rt is nil, http.DefaultTransport is used. +func (s *Server) RoundTripper(rt http.RoundTripper) http.RoundTripper { + if rt == nil { + rt = http.DefaultTransport + } + return RoundTripperFunc(func(r *http.Request) (*http.Response, error) { + r.URL.Scheme = "http" + r.URL.Host = s.Addr() + return rt.RoundTrip(r) + }) +} + +// Helper type for creating a RoundTripper from a function +type RoundTripperFunc func(*http.Request) (*http.Response, error) + +func (fn RoundTripperFunc) RoundTrip(r *http.Request) (*http.Response, error) { + return fn(r) +} diff --git a/vendor/github.com/onsi/gomega/gomega_dsl.go b/vendor/github.com/onsi/gomega/gomega_dsl.go index 9697d513..650ae867 100644 --- a/vendor/github.com/onsi/gomega/gomega_dsl.go +++ b/vendor/github.com/onsi/gomega/gomega_dsl.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/types" ) -const GOMEGA_VERSION = "1.33.1" +const GOMEGA_VERSION = "1.34.0" const nilGomegaPanic = `You are trying to make an assertion, but haven't registered Gomega's fail handler. If you're using Ginkgo then you probably forgot to put your assertion in an It(). diff --git a/vendor/github.com/onsi/gomega/matchers/have_exact_elements.go b/vendor/github.com/onsi/gomega/matchers/have_exact_elements.go index dca5b944..5a236d7d 100644 --- a/vendor/github.com/onsi/gomega/matchers/have_exact_elements.go +++ b/vendor/github.com/onsi/gomega/matchers/have_exact_elements.go @@ -30,15 +30,18 @@ func (matcher *HaveExactElementsMatcher) Match(actual interface{}) (success bool lenMatchers := len(matchers) lenValues := len(values) + success = true for i := 0; i < lenMatchers || i < lenValues; i++ { if i >= lenMatchers { matcher.extraIndex = i + success = false continue } if i >= lenValues { matcher.missingIndex = i + success = false return } @@ -49,15 +52,17 @@ func (matcher *HaveExactElementsMatcher) Match(actual interface{}) (success bool index: i, failure: err.Error(), }) + success = false } else if !match { matcher.mismatchFailures = append(matcher.mismatchFailures, mismatchFailure{ index: i, failure: elemMatcher.FailureMessage(values[i]), }) + success = false } } - return matcher.missingIndex+matcher.extraIndex+len(matcher.mismatchFailures) == 0, nil + return success, nil } func (matcher *HaveExactElementsMatcher) FailureMessage(actual interface{}) (message string) { diff --git a/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go index 1c54edd8..44aa61d4 100644 --- a/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go +++ b/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go @@ -1,6 +1,8 @@ package bipartitegraph import ( + "slices" + . "github.com/onsi/gomega/matchers/support/goraph/edge" . "github.com/onsi/gomega/matchers/support/goraph/node" "github.com/onsi/gomega/matchers/support/goraph/util" @@ -157,6 +159,11 @@ func (bg *BipartiteGraph) createSLAPGuideLayers(matching EdgeSet) (guideLayers [ if len(currentLayer) == 0 { return []NodeOrderedSet{} } + if done { // if last layer - into last layer must be only 'free' nodes + currentLayer = slices.DeleteFunc(currentLayer, func(in Node) bool { + return !matching.Free(in) + }) + } guideLayers = append(guideLayers, currentLayer) } diff --git a/vendor/modules.txt b/vendor/modules.txt index d5403602..913ae5e5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -133,7 +133,7 @@ github.com/onsi/ginkgo/v2/internal/parallel_support github.com/onsi/ginkgo/v2/internal/testingtproxy github.com/onsi/ginkgo/v2/reporters github.com/onsi/ginkgo/v2/types -# github.com/onsi/gomega v1.33.1 +# github.com/onsi/gomega v1.34.0 ## explicit; go 1.20 github.com/onsi/gomega github.com/onsi/gomega/format