diff --git a/.github/workflows/build-go.yaml b/.github/workflows/build-go.yaml index 349fd108..20c5bb7d 100644 --- a/.github/workflows/build-go.yaml +++ b/.github/workflows/build-go.yaml @@ -19,8 +19,8 @@ jobs: fail-fast: false matrix: go: - - "1.20" - "1.21" + - "1.22" steps: - uses: actions/checkout@v3 @@ -41,5 +41,5 @@ jobs: with: main_branch: master cov_file: unit_coverage.out - cov_threshold: "91" + cov_threshold: "90" cov_mode: coverage diff --git a/authorizer/mtls/authorizer_test.go b/authorizer/mtls/authorizer_test.go index 7fdfcbb6..3c52a029 100644 --- a/authorizer/mtls/authorizer_test.go +++ b/authorizer/mtls/authorizer_test.go @@ -21,6 +21,7 @@ import ( "reflect" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" "go.aporeto.io/elemental" diff --git a/authorizer/simple/authenticator_test.go b/authorizer/simple/authenticator_test.go index 248f37ce..70612112 100644 --- a/authorizer/simple/authenticator_test.go +++ b/authorizer/simple/authenticator_test.go @@ -15,6 +15,7 @@ import ( "fmt" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" ) diff --git a/authorizer/simple/authorizer_test.go b/authorizer/simple/authorizer_test.go index 17c729d5..3fe58a43 100644 --- a/authorizer/simple/authorizer_test.go +++ b/authorizer/simple/authorizer_test.go @@ -15,6 +15,7 @@ import ( "fmt" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" ) diff --git a/authorizer/simple/publishhandler_test.go b/authorizer/simple/publishhandler_test.go index 49281fef..9589608a 100644 --- a/authorizer/simple/publishhandler_test.go +++ b/authorizer/simple/publishhandler_test.go @@ -15,6 +15,7 @@ import ( "fmt" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" ) diff --git a/bahamut_test.go b/bahamut_test.go index 9b2d62d2..32a624a5 100644 --- a/bahamut_test.go +++ b/bahamut_test.go @@ -15,6 +15,7 @@ import ( "net/http" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/context_mock_test.go b/context_mock_test.go index daa4290e..96064914 100644 --- a/context_mock_test.go +++ b/context_mock_test.go @@ -16,6 +16,7 @@ import ( "net/http" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/context_test.go b/context_test.go index 20a67ab9..18d026a2 100644 --- a/context_test.go +++ b/context_test.go @@ -17,6 +17,7 @@ import ( "net/url" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/cors_test.go b/cors_test.go index 68db476e..cec400fa 100644 --- a/cors_test.go +++ b/cors_test.go @@ -4,6 +4,7 @@ import ( "net/http" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/dispatchers_test.go b/dispatchers_test.go index 25076b72..7bc7b39c 100644 --- a/dispatchers_test.go +++ b/dispatchers_test.go @@ -14,10 +14,12 @@ package bahamut import ( "context" "encoding/json" + "errors" "fmt" "net/http" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" @@ -608,7 +610,7 @@ func TestDispatchers_dispatchCreateOperation(t *testing.T) { processorFinder, testmodel.Manager(), func(*elemental.Request) (elemental.Identifiable, error) { - return nil, fmt.Errorf(expectedError) + return nil, fmt.Errorf(expectedError) //nolint:staticcheck }, nil, nil, @@ -1051,7 +1053,7 @@ func TestDispatchers_dispatchUpdateOperation(t *testing.T) { processorFinder, testmodel.Manager(), func(*elemental.Request) (elemental.Identifiable, error) { - return nil, fmt.Errorf(expectedError) + return nil, fmt.Errorf(expectedError) //nolint:staticcheck }, nil, nil, @@ -1628,7 +1630,7 @@ func TestDispatchers_dispatchPatchOperation(t *testing.T) { processorFinder, testmodel.Manager(), func(*elemental.Request) (elemental.Identifiable, error) { - return nil, fmt.Errorf(expectedError) + return nil, fmt.Errorf(expectedError) //nolint:staticcheck }, nil, nil, @@ -1746,7 +1748,7 @@ func TestDispatchers_dispatchPatchOperation(t *testing.T) { var retrieverCalled int retriever := func(req *elemental.Request) (elemental.Identifiable, error) { retrieverCalled++ - return nil, fmt.Errorf("oh noes") + return nil, errors.New("oh noes") } auditer := &mockAuditer{} @@ -1854,7 +1856,7 @@ func TestDispatchers_dispatchPatchOperation(t *testing.T) { processorFinder := func(identity elemental.Identity) (Processor, error) { return &mockProcessor{ - err: fmt.Errorf("this is an error"), + err: errors.New("this is an error"), }, nil } diff --git a/gateway/buffers_test.go b/gateway/buffers_test.go index 0a6331ed..6a4c19a5 100644 --- a/gateway/buffers_test.go +++ b/gateway/buffers_test.go @@ -3,6 +3,7 @@ package gateway import ( "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/gateway/errors_test.go b/gateway/errors_test.go index dac7aca6..7ab7576c 100644 --- a/gateway/errors_test.go +++ b/gateway/errors_test.go @@ -12,6 +12,7 @@ import ( "testing" "github.com/mailgun/multibuf" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "github.com/vulcand/oxy/ratelimit" "github.com/vulcand/oxy/v2/connlimit" diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go index 08f78411..b8ebd3d1 100644 --- a/gateway/gateway_test.go +++ b/gateway/gateway_test.go @@ -14,6 +14,7 @@ import ( "time" "github.com/opentracing/opentracing-go" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" "go.aporeto.io/tg/tglib" diff --git a/gateway/listener_test.go b/gateway/listener_test.go index 64dbdd44..65f1bc85 100644 --- a/gateway/listener_test.go +++ b/gateway/listener_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/gateway/options_test.go b/gateway/options_test.go index 69615943..b3900b7c 100644 --- a/gateway/options_test.go +++ b/gateway/options_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" "golang.org/x/time/rate" diff --git a/gateway/rewriters_test.go b/gateway/rewriters_test.go index 7dc8652e..34de3886 100644 --- a/gateway/rewriters_test.go +++ b/gateway/rewriters_test.go @@ -12,6 +12,7 @@ import ( "strings" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/tg/tglib" ) diff --git a/gateway/upstreamer/push/movingaverage_test.go b/gateway/upstreamer/push/movingaverage_test.go index 7978fdd8..f54d9014 100644 --- a/gateway/upstreamer/push/movingaverage_test.go +++ b/gateway/upstreamer/push/movingaverage_test.go @@ -3,6 +3,7 @@ package push import ( "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/gateway/upstreamer/push/notifier_options_test.go b/gateway/upstreamer/push/notifier_options_test.go index b528dd1f..3ebdf073 100644 --- a/gateway/upstreamer/push/notifier_options_test.go +++ b/gateway/upstreamer/push/notifier_options_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" "golang.org/x/time/rate" diff --git a/gateway/upstreamer/push/notifier_test.go b/gateway/upstreamer/push/notifier_test.go index 93bc4e7f..2d27a543 100644 --- a/gateway/upstreamer/push/notifier_test.go +++ b/gateway/upstreamer/push/notifier_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" "go.aporeto.io/elemental" diff --git a/gateway/upstreamer/push/services_test.go b/gateway/upstreamer/push/services_test.go index c0bb0151..24d3fdd0 100644 --- a/gateway/upstreamer/push/services_test.go +++ b/gateway/upstreamer/push/services_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "golang.org/x/time/rate" ) diff --git a/gateway/upstreamer/push/upstreamer_distribution_test.go b/gateway/upstreamer/push/upstreamer_distribution_test.go index f0f3db40..1e3278c4 100644 --- a/gateway/upstreamer/push/upstreamer_distribution_test.go +++ b/gateway/upstreamer/push/upstreamer_distribution_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "golang.org/x/time/rate" ) diff --git a/gateway/upstreamer/push/upstreamer_options_test.go b/gateway/upstreamer/push/upstreamer_options_test.go index 40e4991a..1ef26355 100644 --- a/gateway/upstreamer/push/upstreamer_options_test.go +++ b/gateway/upstreamer/push/upstreamer_options_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/gateway/upstreamer/push/upstreamer_test.go b/gateway/upstreamer/push/upstreamer_test.go index b84681ae..86c53648 100644 --- a/gateway/upstreamer/push/upstreamer_test.go +++ b/gateway/upstreamer/push/upstreamer_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" "go.aporeto.io/bahamut/gateway" diff --git a/gateway/upstreamer/push/utils_test.go b/gateway/upstreamer/push/utils_test.go index 673b292d..d4fd7978 100644 --- a/gateway/upstreamer/push/utils_test.go +++ b/gateway/upstreamer/push/utils_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" ) diff --git a/gateway/utils_test.go b/gateway/utils_test.go index 2b6a5ddc..1c54aa68 100644 --- a/gateway/utils_test.go +++ b/gateway/utils_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/bahamut" "go.aporeto.io/tg/tglib" diff --git a/go.mod b/go.mod index 39a99ef3..ea2e0fa6 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,11 @@ module go.aporeto.io/bahamut -go 1.20 +go 1.22 + +toolchain go1.22.2 require ( - go.aporeto.io/elemental v1.123.0 + go.aporeto.io/elemental v1.123.1-0.20240822212917-6f8c7be6698c go.aporeto.io/tg v1.50.0 go.aporeto.io/wsc v1.51.0 ) @@ -36,7 +38,6 @@ require ( github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect @@ -63,11 +64,12 @@ require ( github.com/ugorji/go/codec v1.2.9 // indirect github.com/vulcand/predicate v1.2.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.mongodb.org/mongo-driver v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.6.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect google.golang.org/protobuf v1.28.1 // indirect ) diff --git a/go.sum b/go.sum index 2a4a8828..ded3e9ab 100644 --- a/go.sum +++ b/go.sum @@ -461,8 +461,6 @@ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/ github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -533,8 +531,9 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -647,11 +646,9 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de h1:V53FWzU6KAZVi1tPp5UIsMoUWJ2/PNwYIDXnu7QuBCE= @@ -753,7 +750,6 @@ github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -762,6 +758,7 @@ github.com/sagikazarmark/crypt v0.9.0/go.mod h1:RnH7sEhxfdnPm1z+XMgSLjWTEIjyK4z2 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= +github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/shirou/gopsutil/v3 v3.23.1 h1:a9KKO+kGLKEvcPIs4W62v0nu3sciVDOOOPUD0Hz7z/4= github.com/shirou/gopsutil/v3 v3.23.1/go.mod h1:NN6mnm5/0k8jw4cBfCnJtr5L7ErOTg18tMNpgFkn0hA= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -824,8 +821,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.aporeto.io/elemental v1.123.0 h1:yKsB9YNTHrPq/39EMUoxBdbXDsuT55MrPzLMVVSR7G8= -go.aporeto.io/elemental v1.123.0/go.mod h1:TeftndRimmpTcaBhcdGWVoaRbBgNfGIcl791KRrR3Xw= +go.aporeto.io/elemental v1.123.1-0.20240822212917-6f8c7be6698c h1:goT+BIlOoWKa4j4PLmVkqX4mk+YqnDw5SA74oen5YQA= +go.aporeto.io/elemental v1.123.1-0.20240822212917-6f8c7be6698c/go.mod h1:vqhSZ25rw+2HyAwZbqCHO3LRuI3YTMtTxrSIuhvIFuU= go.aporeto.io/tg v1.50.0 h1:WOtzxPJpPkIx3+OBmUuZIclTZgvTrIIEg7uzstWucTk= go.aporeto.io/tg v1.50.0/go.mod h1:LkCXFWQN6LGrp4alU+qzNXoq/nkouQKsOzsjidoKbBc= go.aporeto.io/wsc v1.51.0 h1:xbbsfRGtUWAqTiT9ubK6TKi2+nABNf656XxnEweynRM= @@ -834,6 +831,8 @@ go.etcd.io/etcd/api/v3 v3.5.6/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydc go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= go.etcd.io/etcd/client/v2 v2.305.6/go.mod h1:BHha8XJGe8vCIBfWBpbBLVZ4QjOIlfoouvOwydu63E0= go.etcd.io/etcd/client/v3 v3.5.6/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= +go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4= +go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -871,8 +870,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -969,8 +968,8 @@ golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1102,14 +1101,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1432,7 +1431,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/handlers_test.go b/handlers_test.go index 5e8d9212..07bbf550 100644 --- a/handlers_test.go +++ b/handlers_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/health_server_test.go b/health_server_test.go index 56bfa9b3..c1687538 100644 --- a/health_server_test.go +++ b/health_server_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/job_test.go b/job_test.go index 1b48bf90..2c38762d 100644 --- a/job_test.go +++ b/job_test.go @@ -18,6 +18,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/metrics_prometheus_test.go b/metrics_prometheus_test.go index 0139f29c..09167109 100644 --- a/metrics_prometheus_test.go +++ b/metrics_prometheus_test.go @@ -15,6 +15,7 @@ import ( "testing" "github.com/prometheus/client_golang/prometheus" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/opentracing_test.go b/opentracing_test.go index 78b80e79..74a907da 100644 --- a/opentracing_test.go +++ b/opentracing_test.go @@ -18,6 +18,7 @@ import ( "testing" opentracing "github.com/opentracing/opentracing-go" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/options_test.go b/options_test.go index 55c3a153..bc14e5c7 100644 --- a/options_test.go +++ b/options_test.go @@ -21,6 +21,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/pinger_test.go b/pinger_test.go index c0ae115d..3dd205b0 100644 --- a/pinger_test.go +++ b/pinger_test.go @@ -16,6 +16,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) @@ -32,8 +33,8 @@ func Test_RetrieveHealthStatus(t *testing.T) { Convey("Given the following pingers", t, func() { pingers := map[string]Pinger{ "p1": MockPinger{PingStatus: nil}, - "p2": MockPinger{PingStatus: fmt.Errorf(PingStatusTimeout)}, - "p3": MockPinger{PingStatus: fmt.Errorf("Another status")}, + "p2": MockPinger{PingStatus: fmt.Errorf(PingStatusTimeout)}, //nolint:staticcheck + "p3": MockPinger{PingStatus: fmt.Errorf("Another status")}, //nolint:staticcheck } results := RetrieveHealthStatus(time.Second, pingers) @@ -60,7 +61,7 @@ func Test_stringifyStatus(t *testing.T) { Convey("Given the stringifyStatus method", t, func() { So(stringifyStatus(nil), ShouldEqual, PingStatusOK) - So(stringifyStatus(fmt.Errorf(PingStatusTimeout)), ShouldEqual, PingStatusTimeout) - So(stringifyStatus(fmt.Errorf("Another status")), ShouldEqual, PingStatusError) + So(stringifyStatus(fmt.Errorf(PingStatusTimeout)), ShouldEqual, PingStatusTimeout) //nolint:staticcheck + So(stringifyStatus(fmt.Errorf("Another status")), ShouldEqual, PingStatusError) //nolint:staticcheck }) } diff --git a/processor_helpers_test.go b/processor_helpers_test.go index 907b8a69..1d6afc47 100644 --- a/processor_helpers_test.go +++ b/processor_helpers_test.go @@ -16,6 +16,7 @@ import ( "net/http" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" ) diff --git a/publication_test.go b/publication_test.go index 326b4e65..27cb7b07 100644 --- a/publication_test.go +++ b/publication_test.go @@ -15,6 +15,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/pubsub_local_test.go b/pubsub_local_test.go index 68f2aa6b..512b23cb 100644 --- a/pubsub_local_test.go +++ b/pubsub_local_test.go @@ -16,6 +16,7 @@ import ( "testing" "time" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/pubsub_nats_options_test.go b/pubsub_nats_options_test.go index bf8966a9..b1aeb35c 100644 --- a/pubsub_nats_options_test.go +++ b/pubsub_nats_options_test.go @@ -18,6 +18,7 @@ import ( "time" nats "github.com/nats-io/nats.go" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/pubsub_nats_test.go b/pubsub_nats_test.go index 1f21d3e2..7f2c4f66 100644 --- a/pubsub_nats_test.go +++ b/pubsub_nats_test.go @@ -26,6 +26,8 @@ import ( "github.com/golang/mock/gomock" natsserver "github.com/nats-io/nats-server/v2/test" nats "github.com/nats-io/nats.go" + + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" ) diff --git a/pubsub_test.go b/pubsub_test.go index 3b71ed0b..1514ba04 100644 --- a/pubsub_test.go +++ b/pubsub_test.go @@ -14,6 +14,7 @@ package bahamut import ( "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" ) diff --git a/rest_server_helpers_test.go b/rest_server_helpers_test.go index 298174e7..39512754 100644 --- a/rest_server_helpers_test.go +++ b/rest_server_helpers_test.go @@ -17,6 +17,7 @@ import ( "net/url" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" ) diff --git a/rest_server_test.go b/rest_server_test.go index 2f486313..7fac1f63 100644 --- a/rest_server_test.go +++ b/rest_server_test.go @@ -27,6 +27,8 @@ import ( "github.com/go-zoo/bone" opentracing "github.com/opentracing/opentracing-go" + + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/utils_test.go b/utils_test.go index b2589019..675b025d 100644 --- a/utils_test.go +++ b/utils_test.go @@ -19,6 +19,7 @@ import ( "testing" opentracing "github.com/opentracing/opentracing-go" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" ) diff --git a/websocket_push_session_mock_test.go b/websocket_push_session_mock_test.go index 2e51765c..cae21a19 100644 --- a/websocket_push_session_mock_test.go +++ b/websocket_push_session_mock_test.go @@ -6,6 +6,7 @@ import ( "net/http" "testing" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" ) diff --git a/websocket_push_session_test.go b/websocket_push_session_test.go index ba369f25..d11c2d5c 100644 --- a/websocket_push_session_test.go +++ b/websocket_push_session_test.go @@ -23,6 +23,8 @@ import ( "github.com/gorilla/websocket" "github.com/opentracing/opentracing-go" + + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model" diff --git a/websocket_server_test.go b/websocket_server_test.go index 5f0d8782..00054cd8 100644 --- a/websocket_server_test.go +++ b/websocket_server_test.go @@ -24,6 +24,7 @@ import ( "time" "github.com/go-zoo/bone" + // nolint:revive // Allow dot imports for readability in tests . "github.com/smartystreets/goconvey/convey" "go.aporeto.io/elemental" testmodel "go.aporeto.io/elemental/test/model"