From 4f099d427c51f343d3ca7eaf0bd64b2326d63cc3 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Fri, 7 Apr 2023 17:47:35 +0800 Subject: [PATCH 01/15] upgrade go version to 1.18 --- go.mod | 16 +- go.sum | 598 +----------------- vendor/github.com/google/gopacket/go.mod | 9 - vendor/github.com/google/gopacket/go.sum | 19 - .../smartystreets/assertions/LICENSE.md | 4 +- .../smartystreets/assertions/README.md | 2 + .../smartystreets/assertions/collections.go | 36 +- .../smartystreets/assertions/doc.go | 18 +- .../smartystreets/assertions/equal_method.go | 6 +- .../smartystreets/assertions/equality.go | 50 +- .../smartystreets/assertions/filter.go | 6 +- .../smartystreets/assertions/go.mod | 3 - .../internal/go-diff/diffmatchpatch/patch.go | 2 +- .../internal/go-render/render/render.go | 4 +- .../internal/oglematchers/any_of.go | 4 +- .../internal/oglematchers/contains.go | 4 +- .../internal/oglematchers/deep_equals.go | 6 +- .../internal/oglematchers/equals.go | 26 +- .../internal/oglematchers/greater_or_equal.go | 2 +- .../internal/oglematchers/greater_than.go | 2 +- .../internal/oglematchers/less_or_equal.go | 2 +- .../internal/oglematchers/less_than.go | 4 +- .../internal/oglematchers/matcher.go | 2 +- .../assertions/internal/oglematchers/not.go | 2 +- .../oglematchers/transform_description.go | 2 +- .../smartystreets/assertions/messages.go | 7 +- .../smartystreets/assertions/panic.go | 12 +- .../smartystreets/assertions/quantity.go | 24 +- .../smartystreets/assertions/serializer.go | 14 +- .../smartystreets/assertions/strings.go | 22 +- .../smartystreets/assertions/time.go | 24 +- .../smartystreets/assertions/type.go | 16 +- .../x/sys/windows/syscall_windows.go | 20 +- .../golang.org/x/sys/windows/types_windows.go | 89 ++- .../x/sys/windows/zsyscall_windows.go | 27 + vendor/modules.txt | 24 +- 36 files changed, 314 insertions(+), 794 deletions(-) delete mode 100644 vendor/github.com/google/gopacket/go.mod delete mode 100644 vendor/github.com/google/gopacket/go.sum delete mode 100644 vendor/github.com/smartystreets/assertions/go.mod diff --git a/go.mod b/go.mod index 647ba50..3c08171 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,19 @@ module github.com/flier/gohs -go 1.15 +go 1.18 require ( github.com/google/gopacket v1.1.19 + github.com/smartystreets/goconvey v1.7.2 +) + +require ( github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/smartystreets/assertions v1.13.0 // indirect - github.com/smartystreets/goconvey v1.7.2 - golang.org/x/net v0.4.0 // indirect - golang.org/x/sys v0.3.0 // indirect + github.com/smartystreets/assertions v1.13.1 // indirect + golang.org/x/mod v0.10.0 // indirect + golang.org/x/net v0.9.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/tools v0.8.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect ) diff --git a/go.sum b/go.sum index 680ef87..ce8f003 100644 --- a/go.sum +++ b/go.sum @@ -1,610 +1,36 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -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= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= -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= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20220221023154-0b2280d3ff96 h1:QJq7UBOuoynsywLk+aC75rC2Cbi2+lQRDaLaizhA+fA= -github.com/gopherjs/gopherjs v0.0.0-20220221023154-0b2280d3ff96/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -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/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -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/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= -github.com/smartystreets/assertions v1.2.1 h1:bKNHfEv7tSIjZ8JbKaFjzFINljxG4lzZvmHUnElzOIg= -github.com/smartystreets/assertions v1.2.1/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8= -github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs= -github.com/smartystreets/assertions v1.13.0/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU= +github.com/smartystreets/assertions v1.13.1/go.mod h1:cXr/IwVfSo/RbCSPhoAPv73p3hlSdrBH/b3SdnW/LMY= github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -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= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 h1:EN5+DfgmRMvRUrMGERW2gQl3Vc+Z7ZMnI/xdEpPSf0c= -golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -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= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw= -golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= +golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= diff --git a/vendor/github.com/google/gopacket/go.mod b/vendor/github.com/google/gopacket/go.mod deleted file mode 100644 index b3dfd6f..0000000 --- a/vendor/github.com/google/gopacket/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/google/gopacket - -go 1.12 - -require ( - golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/net v0.0.0-20190620200207-3b0461eec859 - golang.org/x/sys v0.0.0-20190412213103-97732733099d -) diff --git a/vendor/github.com/google/gopacket/go.sum b/vendor/github.com/google/gopacket/go.sum deleted file mode 100644 index 4904fca..0000000 --- a/vendor/github.com/google/gopacket/go.sum +++ /dev/null @@ -1,19 +0,0 @@ -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67 h1:1Fzlr8kkDLQwqMP8GxrhptBLqZG/EDpiATneiZHY998= -golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/smartystreets/assertions/LICENSE.md b/vendor/github.com/smartystreets/assertions/LICENSE.md index 8ea6f94..e99a66d 100644 --- a/vendor/github.com/smartystreets/assertions/LICENSE.md +++ b/vendor/github.com/smartystreets/assertions/LICENSE.md @@ -1,4 +1,6 @@ -Copyright (c) 2016 SmartyStreets, LLC +MIT License + +Copyright (c) 2023 Smarty Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/github.com/smartystreets/assertions/README.md b/vendor/github.com/smartystreets/assertions/README.md index 10c8d20..b7d34d1 100644 --- a/vendor/github.com/smartystreets/assertions/README.md +++ b/vendor/github.com/smartystreets/assertions/README.md @@ -1,3 +1,5 @@ +#### SMARTY DISCLAIMER: Subject to the terms of the associated license agreement, this software is freely available for your use. This software is FREE, AS IN PUPPIES, and is a gift. Enjoy your new responsibility. This means that while we may consider enhancement requests, we may or may not choose to entertain requests at our sole and absolute discretion. + [![Build Status](https://travis-ci.org/smartystreets/assertions.svg?branch=master)](https://travis-ci.org/smartystreets/assertions) [![Code Coverage](https://codecov.io/gh/smartystreets/assertions/branch/master/graph/badge.svg)](https://codecov.io/gh/smartystreets/assertions) [![Go Report Card](https://goreportcard.com/badge/github.com/smartystreets/assertions)](https://goreportcard.com/report/github.com/smartystreets/assertions) diff --git a/vendor/github.com/smartystreets/assertions/collections.go b/vendor/github.com/smartystreets/assertions/collections.go index b534d4b..b7648c7 100644 --- a/vendor/github.com/smartystreets/assertions/collections.go +++ b/vendor/github.com/smartystreets/assertions/collections.go @@ -9,7 +9,7 @@ import ( // ShouldContain receives exactly two parameters. The first is a slice and the // second is a proposed member. Membership is determined using ShouldEqual. -func ShouldContain(actual interface{}, expected ...interface{}) string { +func ShouldContain(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -26,8 +26,8 @@ func ShouldContain(actual interface{}, expected ...interface{}) string { } // ShouldNotContain receives exactly two parameters. The first is a slice and the -// second is a proposed member. Membership is determinied using ShouldEqual. -func ShouldNotContain(actual interface{}, expected ...interface{}) string { +// second is a proposed member. Membership is determined using ShouldEqual. +func ShouldNotContain(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -44,7 +44,7 @@ func ShouldNotContain(actual interface{}, expected ...interface{}) string { // ShouldContainKey receives exactly two parameters. The first is a map and the // second is a proposed key. Keys are compared with a simple '=='. -func ShouldContainKey(actual interface{}, expected ...interface{}) string { +func ShouldContainKey(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -63,7 +63,7 @@ func ShouldContainKey(actual interface{}, expected ...interface{}) string { // ShouldNotContainKey receives exactly two parameters. The first is a map and the // second is a proposed absent key. Keys are compared with a simple '=='. -func ShouldNotContainKey(actual interface{}, expected ...interface{}) string { +func ShouldNotContainKey(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -80,14 +80,14 @@ func ShouldNotContainKey(actual interface{}, expected ...interface{}) string { return "" } -func mapKeys(m interface{}) ([]reflect.Value, bool) { +func mapKeys(m any) ([]reflect.Value, bool) { value := reflect.ValueOf(m) if value.Kind() != reflect.Map { return nil, false } return value.MapKeys(), true } -func keyFound(keys []reflect.Value, expectedKey interface{}) bool { +func keyFound(keys []reflect.Value, expectedKey any) bool { found := false for _, key := range keys { if key.Interface() == expectedKey { @@ -98,10 +98,10 @@ func keyFound(keys []reflect.Value, expectedKey interface{}) bool { } // ShouldBeIn receives at least 2 parameters. The first is a proposed member of the collection -// that is passed in either as the second parameter, or of the collection that is comprised +// that is passed in either as the second parameter, or of the collection that consists // of all the remaining parameters. This assertion ensures that the proposed member is in // the collection (using ShouldEqual). -func ShouldBeIn(actual interface{}, expected ...interface{}) string { +func ShouldBeIn(actual any, expected ...any) string { if fail := atLeast(1, expected); fail != success { return fail } @@ -111,7 +111,7 @@ func ShouldBeIn(actual interface{}, expected ...interface{}) string { } return shouldBeIn(actual, expected) } -func shouldBeIn(actual interface{}, expected interface{}) string { +func shouldBeIn(actual any, expected any) string { if matchError := oglematchers.Contains(actual).Matches(expected); matchError != nil { return fmt.Sprintf(shouldHaveBeenIn, actual, reflect.TypeOf(expected)) } @@ -119,10 +119,10 @@ func shouldBeIn(actual interface{}, expected interface{}) string { } // ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of the collection -// that is passed in either as the second parameter, or of the collection that is comprised +// that is passed in either as the second parameter, or of the collection that consists // of all the remaining parameters. This assertion ensures that the proposed member is NOT in // the collection (using ShouldEqual). -func ShouldNotBeIn(actual interface{}, expected ...interface{}) string { +func ShouldNotBeIn(actual any, expected ...any) string { if fail := atLeast(1, expected); fail != success { return fail } @@ -132,17 +132,17 @@ func ShouldNotBeIn(actual interface{}, expected ...interface{}) string { } return shouldNotBeIn(actual, expected) } -func shouldNotBeIn(actual interface{}, expected interface{}) string { +func shouldNotBeIn(actual any, expected any) string { if matchError := oglematchers.Contains(actual).Matches(expected); matchError == nil { return fmt.Sprintf(shouldNotHaveBeenIn, actual, reflect.TypeOf(expected)) } return success } -// ShouldBeEmpty receives a single parameter (actual) and determines whether or not +// ShouldBeEmpty receives a single parameter (actual) and determines whether // calling len(actual) would return `0`. It obeys the rules specified by the len // function for determining length: http://golang.org/pkg/builtin/#len -func ShouldBeEmpty(actual interface{}, expected ...interface{}) string { +func ShouldBeEmpty(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -180,10 +180,10 @@ func ShouldBeEmpty(actual interface{}, expected ...interface{}) string { return fmt.Sprintf(shouldHaveBeenEmpty, actual) } -// ShouldNotBeEmpty receives a single parameter (actual) and determines whether or not +// ShouldNotBeEmpty receives a single parameter (actual) and determines whether // calling len(actual) would return a value greater than zero. It obeys the rules // specified by the `len` function for determining length: http://golang.org/pkg/builtin/#len -func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string { +func ShouldNotBeEmpty(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -198,7 +198,7 @@ func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string { // the length of, the second being the expected length. It obeys the rules // specified by the len function for determining length: // http://golang.org/pkg/builtin/#len -func ShouldHaveLength(actual interface{}, expected ...interface{}) string { +func ShouldHaveLength(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/doc.go b/vendor/github.com/smartystreets/assertions/doc.go index e706db3..1629eef 100644 --- a/vendor/github.com/smartystreets/assertions/doc.go +++ b/vendor/github.com/smartystreets/assertions/doc.go @@ -18,7 +18,7 @@ import ( "runtime" ) -// By default we use a no-op serializer. The actual Serializer provides a JSON +// By default, we use a no-op serializer. The actual Serializer provides a JSON // representation of failure results on selected assertions so the goconvey // web UI can display a convenient diff. var serializer Serializer = new(noopSerializer) @@ -38,7 +38,7 @@ func GoConveyMode(yes bool) { } type testingT interface { - Error(args ...interface{}) + Error(args ...any) } type Assertion struct { @@ -58,7 +58,7 @@ func (this *Assertion) Failed() bool { } // So calls the standalone So function and additionally, calls t.Error in failure scenarios. -func (this *Assertion) So(actual interface{}, assert SoFunc, expected ...interface{}) bool { +func (this *Assertion) So(actual any, assert SoFunc, expected ...any) bool { ok, result := So(actual, assert, expected...) if !ok { this.failed = true @@ -80,13 +80,13 @@ func (this *Assertion) So(actual interface{}, assert SoFunc, expected ...interfa // // Example: // -// if ok, message := So(x, ShouldBeGreaterThan, y); !ok { -// log.Println(message) -// } +// if ok, message := So(x, ShouldBeGreaterThan, y); !ok { +// log.Println(message) +// } // // For an alternative implementation of So (that provides more flexible return options) // see the `So` function in the package at github.com/smartystreets/assertions/assert. -func So(actual interface{}, assert SoFunc, expected ...interface{}) (bool, string) { +func So(actual any, assert SoFunc, expected ...any) (bool, string) { if result := so(actual, assert, expected...); len(result) == 0 { return true, result } else { @@ -96,7 +96,7 @@ func So(actual interface{}, assert SoFunc, expected ...interface{}) (bool, strin // so is like So, except that it only returns the string message, which is blank if the // assertion passed. Used to facilitate testing. -func so(actual interface{}, assert SoFunc, expected ...interface{}) string { +func so(actual any, assert SoFunc, expected ...any) string { return assert(actual, expected...) } @@ -104,6 +104,6 @@ func so(actual interface{}, assert SoFunc, expected ...interface{}) string { // function can handle. Any future or custom assertions should conform to this // method signature. The return value should be an empty string if the SoFunc // passes and a well-formed failure message if not. -type SoFunc func(actual interface{}, expected ...interface{}) string +type SoFunc func(actual any, expected ...any) string //////////////////////////////////////////////////////////////////////////// diff --git a/vendor/github.com/smartystreets/assertions/equal_method.go b/vendor/github.com/smartystreets/assertions/equal_method.go index c4fc38f..fb39733 100644 --- a/vendor/github.com/smartystreets/assertions/equal_method.go +++ b/vendor/github.com/smartystreets/assertions/equal_method.go @@ -3,8 +3,8 @@ package assertions import "reflect" type equalityMethodSpecification struct { - a interface{} - b interface{} + a any + b any aType reflect.Type bType reflect.Type @@ -12,7 +12,7 @@ type equalityMethodSpecification struct { equalMethod reflect.Value } -func newEqualityMethodSpecification(a, b interface{}) *equalityMethodSpecification { +func newEqualityMethodSpecification(a, b any) *equalityMethodSpecification { return &equalityMethodSpecification{ a: a, b: b, diff --git a/vendor/github.com/smartystreets/assertions/equality.go b/vendor/github.com/smartystreets/assertions/equality.go index 37a49f4..8497dee 100644 --- a/vendor/github.com/smartystreets/assertions/equality.go +++ b/vendor/github.com/smartystreets/assertions/equality.go @@ -17,13 +17,13 @@ import ( // 1. If the expected and actual values implement an Equal method in the form // `func (this T) Equal(that T) bool` then call the method. If true, they are equal. // 2. The expected and actual values are judged equal or not by oglematchers.Equals. -func ShouldEqual(actual interface{}, expected ...interface{}) string { +func ShouldEqual(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } return shouldEqual(actual, expected[0]) } -func shouldEqual(actual, expected interface{}) (message string) { +func shouldEqual(actual, expected any) (message string) { defer func() { if r := recover(); r != nil { message = serializer.serialize(expected, actual, composeEqualityMismatchMessage(expected, actual)) @@ -38,7 +38,7 @@ func shouldEqual(actual, expected interface{}) (message string) { return serializer.serialize(expected, actual, composeEqualityMismatchMessage(expected, actual)) } -func composeEqualityMismatchMessage(expected, actual interface{}) string { +func composeEqualityMismatchMessage(expected, actual any) string { var ( renderedExpected = fmt.Sprintf("%v", expected) renderedActual = fmt.Sprintf("%v", actual) @@ -55,7 +55,7 @@ func composeEqualityMismatchMessage(expected, actual interface{}) string { // ShouldNotEqual receives exactly two parameters and does an inequality check. // See ShouldEqual for details on how equality is determined. -func ShouldNotEqual(actual interface{}, expected ...interface{}) string { +func ShouldNotEqual(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if ShouldEqual(actual, expected[0]) == success { @@ -67,7 +67,7 @@ func ShouldNotEqual(actual interface{}, expected ...interface{}) string { // ShouldAlmostEqual makes sure that two parameters are close enough to being equal. // The acceptable delta may be specified with a third argument, // or a very small default delta will be used. -func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string { +func ShouldAlmostEqual(actual any, expected ...any) string { actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...) if err != "" { @@ -82,7 +82,7 @@ func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string { } // ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual -func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string { +func ShouldNotAlmostEqual(actual any, expected ...any) string { actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...) if err != "" { @@ -96,7 +96,7 @@ func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string { } } -func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64, float64, float64, string) { +func cleanAlmostEqualInput(actual any, expected ...any) (float64, float64, float64, string) { deltaFloat := 0.0000000001 if len(expected) == 0 { @@ -127,7 +127,7 @@ func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64 } // returns the float value of any real number, or error if it is not a numerical type -func getFloat(num interface{}) (float64, error) { +func getFloat(num any) (float64, error) { numValue := reflect.ValueOf(num) numKind := numValue.Kind() @@ -152,7 +152,7 @@ func getFloat(num interface{}) (float64, error) { } // ShouldEqualJSON receives exactly two parameters and does an equality check by marshalling to JSON -func ShouldEqualJSON(actual interface{}, expected ...interface{}) string { +func ShouldEqualJSON(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } @@ -170,7 +170,7 @@ func ShouldEqualJSON(actual interface{}, expected ...interface{}) string { return ShouldEqual(actualString, expectedString) } func remarshal(value string) (string, error) { - var structured interface{} + var structured any err := json.Unmarshal([]byte(value), &structured) if err != nil { return "", err @@ -180,13 +180,17 @@ func remarshal(value string) (string, error) { } // ShouldResemble receives exactly two parameters and does a deep equal check (see reflect.DeepEqual) -func ShouldResemble(actual interface{}, expected ...interface{}) string { +func ShouldResemble(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } if matchError := oglematchers.DeepEquals(expected[0]).Matches(actual); matchError != nil { renderedExpected, renderedActual := render.Render(expected[0]), render.Render(actual) + if renderedActual == renderedExpected { + message := fmt.Sprintf(shouldHaveResembledButTypeDiff, renderedExpected, renderedActual) + return serializer.serializeDetailed(expected[0], actual, message) + } message := fmt.Sprintf(shouldHaveResembled, renderedExpected, renderedActual) + composePrettyDiff(renderedExpected, renderedActual) return serializer.serializeDetailed(expected[0], actual, message) @@ -196,7 +200,7 @@ func ShouldResemble(actual interface{}, expected ...interface{}) string { } // ShouldNotResemble receives exactly two parameters and does an inverse deep equal check (see reflect.DeepEqual) -func ShouldNotResemble(actual interface{}, expected ...interface{}) string { +func ShouldNotResemble(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } else if ShouldResemble(actual, expected[0]) == success { @@ -206,14 +210,14 @@ func ShouldNotResemble(actual interface{}, expected ...interface{}) string { } // ShouldPointTo receives exactly two parameters and checks to see that they point to the same address. -func ShouldPointTo(actual interface{}, expected ...interface{}) string { +func ShouldPointTo(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } return shouldPointTo(actual, expected[0]) } -func shouldPointTo(actual, expected interface{}) string { +func shouldPointTo(actual, expected any) string { actualValue := reflect.ValueOf(actual) expectedValue := reflect.ValueOf(expected) @@ -236,7 +240,7 @@ func shouldPointTo(actual, expected interface{}) string { } // ShouldNotPointTo receives exactly two parameters and checks to see that they point to different addresess. -func ShouldNotPointTo(actual interface{}, expected ...interface{}) string { +func ShouldNotPointTo(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } @@ -250,7 +254,7 @@ func ShouldNotPointTo(actual interface{}, expected ...interface{}) string { } // ShouldBeNil receives a single parameter and ensures that it is nil. -func ShouldBeNil(actual interface{}, expected ...interface{}) string { +func ShouldBeNil(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if actual == nil { @@ -260,7 +264,7 @@ func ShouldBeNil(actual interface{}, expected ...interface{}) string { } return fmt.Sprintf(shouldHaveBeenNil, actual) } -func interfaceHasNilValue(actual interface{}) bool { +func interfaceHasNilValue(actual any) bool { value := reflect.ValueOf(actual) kind := value.Kind() nilable := kind == reflect.Slice || @@ -275,7 +279,7 @@ func interfaceHasNilValue(actual interface{}) bool { } // ShouldNotBeNil receives a single parameter and ensures that it is not nil. -func ShouldNotBeNil(actual interface{}, expected ...interface{}) string { +func ShouldNotBeNil(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if ShouldBeNil(actual) == success { @@ -285,7 +289,7 @@ func ShouldNotBeNil(actual interface{}, expected ...interface{}) string { } // ShouldBeTrue receives a single parameter and ensures that it is true. -func ShouldBeTrue(actual interface{}, expected ...interface{}) string { +func ShouldBeTrue(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if actual != true { @@ -295,7 +299,7 @@ func ShouldBeTrue(actual interface{}, expected ...interface{}) string { } // ShouldBeFalse receives a single parameter and ensures that it is false. -func ShouldBeFalse(actual interface{}, expected ...interface{}) string { +func ShouldBeFalse(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if actual != false { @@ -306,7 +310,7 @@ func ShouldBeFalse(actual interface{}, expected ...interface{}) string { // ShouldBeZeroValue receives a single parameter and ensures that it is // the Go equivalent of the default value, or "zero" value. -func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string { +func ShouldBeZeroValue(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -317,9 +321,9 @@ func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string { return success } -// ShouldBeZeroValue receives a single parameter and ensures that it is NOT +// ShouldNotBeZeroValue receives a single parameter and ensures that it is NOT // the Go equivalent of the default value, or "zero" value. -func ShouldNotBeZeroValue(actual interface{}, expected ...interface{}) string { +func ShouldNotBeZeroValue(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/filter.go b/vendor/github.com/smartystreets/assertions/filter.go index cbf7566..f2f27b5 100644 --- a/vendor/github.com/smartystreets/assertions/filter.go +++ b/vendor/github.com/smartystreets/assertions/filter.go @@ -9,21 +9,21 @@ const ( needFewerValues = "This assertion allows %d or fewer comparison values (you provided %d)." ) -func need(needed int, expected []interface{}) string { +func need(needed int, expected []any) string { if len(expected) != needed { return fmt.Sprintf(needExactValues, needed, len(expected)) } return success } -func atLeast(minimum int, expected []interface{}) string { +func atLeast(minimum int, expected []any) string { if len(expected) < minimum { return needNonEmptyCollection } return success } -func atMost(max int, expected []interface{}) string { +func atMost(max int, expected []any) string { if len(expected) > max { return fmt.Sprintf(needFewerValues, max, len(expected)) } diff --git a/vendor/github.com/smartystreets/assertions/go.mod b/vendor/github.com/smartystreets/assertions/go.mod deleted file mode 100644 index 7570e40..0000000 --- a/vendor/github.com/smartystreets/assertions/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/smartystreets/assertions - -go 1.17 diff --git a/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go b/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go index 0dbe3bd..80b8abf 100644 --- a/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go +++ b/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go @@ -112,7 +112,7 @@ func (dmp *DiffMatchPatch) PatchAddContext(patch Patch, text string) Patch { } // PatchMake computes a list of patches. -func (dmp *DiffMatchPatch) PatchMake(opt ...interface{}) []Patch { +func (dmp *DiffMatchPatch) PatchMake(opt ...any) []Patch { if len(opt) == 1 { diffs, _ := opt[0].([]Diff) text1 := dmp.DiffText1(diffs) diff --git a/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go b/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go index 313611e..357b744 100644 --- a/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go +++ b/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go @@ -48,7 +48,7 @@ var typeOfFloat = reflect.TypeOf(10.1) // Render converts a structure to a string representation. Unline the "%#v" // format string, this resolves pointer types' contents in structs, maps, and // slices/arrays and prints their field values. -func Render(v interface{}) string { +func Render(v any) string { buf := bytes.Buffer{} s := (*traverseState)(nil) s.render(&buf, 0, reflect.ValueOf(v), false) @@ -296,7 +296,7 @@ func writeType(buf *bytes.Buffer, ptrs int, t reflect.Type) { if n := t.Name(); n != "" { buf.WriteString(t.String()) } else { - buf.WriteString("interface{}") + buf.WriteString("any") } case reflect.Array: diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go index 2918b51..fa4fd4b 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go @@ -38,7 +38,7 @@ import ( // // This is akin to a logical OR operation for matchers, with non-matchers x // being treated as Equals(x). -func AnyOf(vals ...interface{}) Matcher { +func AnyOf(vals ...any) Matcher { // Get ahold of a type variable for the Matcher interface. var dummy *Matcher matcherType := reflect.TypeOf(dummy).Elem() @@ -71,7 +71,7 @@ func (m *anyOfMatcher) Description() string { return fmt.Sprintf("or(%s)", strings.Join(wrappedDescs, ", ")) } -func (m *anyOfMatcher) Matches(c interface{}) (err error) { +func (m *anyOfMatcher) Matches(c any) (err error) { err = errors.New("") // Try each matcher in turn. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go index 87f107d..cdc4e80 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go @@ -23,7 +23,7 @@ import ( // Return a matcher that matches arrays slices with at least one element that // matches the supplied argument. If the argument x is not itself a Matcher, // this is equivalent to Contains(Equals(x)). -func Contains(x interface{}) Matcher { +func Contains(x any) Matcher { var result containsMatcher var ok bool @@ -42,7 +42,7 @@ func (m *containsMatcher) Description() string { return fmt.Sprintf("contains: %s", m.elementMatcher.Description()) } -func (m *containsMatcher) Matches(candidate interface{}) error { +func (m *containsMatcher) Matches(candidate any) error { // The candidate must be a slice or an array. v := reflect.ValueOf(candidate) if v.Kind() != reflect.Slice && v.Kind() != reflect.Array { diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go index 1d91bae..8d8d264 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go @@ -27,12 +27,12 @@ var byteSliceType reflect.Type = reflect.TypeOf([]byte{}) // DeepEquals returns a matcher that matches based on 'deep equality', as // defined by the reflect package. This matcher requires that values have // identical types to x. -func DeepEquals(x interface{}) Matcher { +func DeepEquals(x any) Matcher { return &deepEqualsMatcher{x} } type deepEqualsMatcher struct { - x interface{} + x any } func (m *deepEqualsMatcher) Description() string { @@ -49,7 +49,7 @@ func (m *deepEqualsMatcher) Description() string { return fmt.Sprintf("deep equals: %s", xDesc) } -func (m *deepEqualsMatcher) Matches(c interface{}) error { +func (m *deepEqualsMatcher) Matches(c any) error { // Make sure the types match. ct := reflect.TypeOf(c) xt := reflect.TypeOf(m.x) diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go index a510707..6c50976 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go @@ -28,23 +28,23 @@ import ( // matcher does not support), but for convenience the following rules also // apply: // -// * Type checking is done based on underlying types rather than actual +// - Type checking is done based on underlying types rather than actual // types, so that e.g. two aliases for string can be compared: // -// type stringAlias1 string -// type stringAlias2 string +// type stringAlias1 string +// type stringAlias2 string // -// a := "taco" -// b := stringAlias1("taco") -// c := stringAlias2("taco") +// a := "taco" +// b := stringAlias1("taco") +// c := stringAlias2("taco") // -// ExpectTrue(a == b) // Legal, passes -// ExpectTrue(b == c) // Illegal, doesn't compile +// ExpectTrue(a == b) // Legal, passes +// ExpectTrue(b == c) // Illegal, doesn't compile // -// ExpectThat(a, Equals(b)) // Passes -// ExpectThat(b, Equals(c)) // Passes +// ExpectThat(a, Equals(b)) // Passes +// ExpectThat(b, Equals(c)) // Passes // -// * Values of numeric type are treated as if they were abstract numbers, and +// - Values of numeric type are treated as if they were abstract numbers, and // compared accordingly. Therefore Equals(17) will match int(17), // int16(17), uint(17), float32(17), complex64(17), and so on. // @@ -55,7 +55,7 @@ import ( // exceptions above. Two arrays compared with this matcher must have identical // types, and their element type must itself be comparable according to Go's == // operator. -func Equals(x interface{}) Matcher { +func Equals(x any) Matcher { v := reflect.ValueOf(x) // This matcher doesn't support structs. @@ -473,7 +473,7 @@ func checkForNil(c reflect.Value) (err error) { // Public implementation //////////////////////////////////////////////////////////////////////// -func (m *equalsMatcher) Matches(candidate interface{}) error { +func (m *equalsMatcher) Matches(candidate any) error { e := m.expectedValue c := reflect.ValueOf(candidate) ek := e.Kind() diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go index 4b9d103..dbd8bc7 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go @@ -27,7 +27,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // GreaterOrEqual will panic. -func GreaterOrEqual(x interface{}) Matcher { +func GreaterOrEqual(x any) Matcher { desc := fmt.Sprintf("greater than or equal to %v", x) // Special case: make it clear that strings are strings. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go index 3eef321..6865559 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go @@ -27,7 +27,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // GreaterThan will panic. -func GreaterThan(x interface{}) Matcher { +func GreaterThan(x any) Matcher { desc := fmt.Sprintf("greater than %v", x) // Special case: make it clear that strings are strings. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go index 8402cde..30b249b 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go @@ -27,7 +27,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // LessOrEqual will panic. -func LessOrEqual(x interface{}) Matcher { +func LessOrEqual(x any) Matcher { desc := fmt.Sprintf("less than or equal to %v", x) // Special case: make it clear that strings are strings. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go index 8258e45..aa97eef 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go @@ -28,7 +28,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // LessThan will panic. -func LessThan(x interface{}) Matcher { +func LessThan(x any) Matcher { v := reflect.ValueOf(x) kind := v.Kind() @@ -104,7 +104,7 @@ func getFloat(v reflect.Value) float64 { panic(fmt.Sprintf("getFloat: %v", v)) } -func (m *lessThanMatcher) Matches(c interface{}) (err error) { +func (m *lessThanMatcher) Matches(c any) (err error) { v1 := reflect.ValueOf(c) v2 := m.limit diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go index 78159a0..2a59e4d 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go @@ -54,7 +54,7 @@ type Matcher interface { // // If you are implementing a new matcher, see also the documentation on // FatalError. - Matches(candidate interface{}) error + Matches(candidate any) error // Description returns a string describing the property that values matching // this matcher have, as a verb phrase where the subject is the value. For diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go index 623789f..6238d5c 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go @@ -31,7 +31,7 @@ type notMatcher struct { wrapped Matcher } -func (m *notMatcher) Matches(c interface{}) (err error) { +func (m *notMatcher) Matches(c any) (err error) { err = m.wrapped.Matches(c) // Did the wrapped matcher say yes? diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go index 8ea2807..f057768 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go @@ -31,6 +31,6 @@ func (m *transformDescriptionMatcher) Description() string { return m.desc } -func (m *transformDescriptionMatcher) Matches(c interface{}) error { +func (m *transformDescriptionMatcher) Matches(c any) error { return m.wrappedMatcher.Matches(c) } diff --git a/vendor/github.com/smartystreets/assertions/messages.go b/vendor/github.com/smartystreets/assertions/messages.go index cd2ec90..7a32999 100644 --- a/vendor/github.com/smartystreets/assertions/messages.go +++ b/vendor/github.com/smartystreets/assertions/messages.go @@ -9,8 +9,9 @@ const ( shouldHaveBeenAlmostEqual = "Expected '%v' to almost equal '%v' (but it didn't)!" shouldHaveNotBeenAlmostEqual = "Expected '%v' to NOT almost equal '%v' (but it did)!" - shouldHaveResembled = "Expected: '%s'\nActual: '%s'\n(Should resemble)!" - shouldNotHaveResembled = "Expected '%#v'\nto NOT resemble '%#v'\n(but it did)!" + shouldHaveResembled = "Expected: '%s'\nActual: '%s'\n(Should resemble)!" + shouldHaveResembledButTypeDiff = "Expected: '%s'\nActual: '%s'\n(Should resemble, but there is a type difference within the two)!" + shouldNotHaveResembled = "Expected '%#v'\nto NOT resemble '%#v'\n(but it did)!" shouldBePointers = "Both arguments should be pointers " shouldHaveBeenNonNilPointer = shouldBePointers + "(the %s was %s)!" @@ -104,5 +105,5 @@ const ( // format params: incorrect-index, previous-index, previous-time, incorrect-index, incorrect-time shouldHaveBeenChronological = "The 'Time' at index [%d] should have happened after the previous one (but it didn't!):\n [%d]: %s\n [%d]: %s (see, it happened before!)" - shouldNotHaveBeenchronological = "The provided times should NOT be chronological, but they were." + shouldNotHaveBeenChronological = "The provided times should NOT be chronological, but they were." ) diff --git a/vendor/github.com/smartystreets/assertions/panic.go b/vendor/github.com/smartystreets/assertions/panic.go index ccb1574..cbfcc26 100644 --- a/vendor/github.com/smartystreets/assertions/panic.go +++ b/vendor/github.com/smartystreets/assertions/panic.go @@ -6,7 +6,7 @@ import ( ) // ShouldPanic receives a void, niladic function and expects to recover a panic. -func ShouldPanic(actual interface{}, expected ...interface{}) (message string) { +func ShouldPanic(actual any, expected ...any) (message string) { if fail := need(0, expected); fail != success { return fail } @@ -32,7 +32,7 @@ func ShouldPanic(actual interface{}, expected ...interface{}) (message string) { } // ShouldNotPanic receives a void, niladic function and expects to execute the function without any panic. -func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string) { +func ShouldNotPanic(actual any, expected ...any) (message string) { if fail := need(0, expected); fail != success { return fail } @@ -58,8 +58,8 @@ func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string } // ShouldPanicWith receives a void, niladic function and expects to recover a panic with the second argument as the content. -// If the expected value is an error and the recovered value is an error, errors.Is is used to compare them. -func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string) { +// If the expected value is an error and the recovered value is an error, errors.Is will be used to compare them. +func ShouldPanicWith(actual any, expected ...any) (message string) { if fail := need(1, expected); fail != success { return fail } @@ -93,8 +93,8 @@ func ShouldPanicWith(actual interface{}, expected ...interface{}) (message strin } // ShouldNotPanicWith receives a void, niladic function and expects to recover a panic whose content differs from the second argument. -// If the expected value is an error and the recovered value is an error, errors.Is is used to compare them. -func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string) { +// If the expected value is an error and the recovered value is an error, errors.Is will be used to compare them. +func ShouldNotPanicWith(actual any, expected ...any) (message string) { if fail := need(1, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/quantity.go b/vendor/github.com/smartystreets/assertions/quantity.go index f28b0a0..6c3e725 100644 --- a/vendor/github.com/smartystreets/assertions/quantity.go +++ b/vendor/github.com/smartystreets/assertions/quantity.go @@ -7,7 +7,7 @@ import ( ) // ShouldBeGreaterThan receives exactly two parameters and ensures that the first is greater than the second. -func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string { +func ShouldBeGreaterThan(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -19,7 +19,7 @@ func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string { } // ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that the first is greater than or equal to the second. -func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string { +func ShouldBeGreaterThanOrEqualTo(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if matchError := oglematchers.GreaterOrEqual(expected[0]).Matches(actual); matchError != nil { @@ -29,7 +29,7 @@ func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) s } // ShouldBeLessThan receives exactly two parameters and ensures that the first is less than the second. -func ShouldBeLessThan(actual interface{}, expected ...interface{}) string { +func ShouldBeLessThan(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if matchError := oglematchers.LessThan(expected[0]).Matches(actual); matchError != nil { @@ -38,8 +38,8 @@ func ShouldBeLessThan(actual interface{}, expected ...interface{}) string { return success } -// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than or equal to the second. -func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string { +// ShouldBeLessThanOrEqualTo receives exactly two parameters and ensures that the first is less than or equal to the second. +func ShouldBeLessThanOrEqualTo(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if matchError := oglematchers.LessOrEqual(expected[0]).Matches(actual); matchError != nil { @@ -50,7 +50,7 @@ func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) stri // ShouldBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is between both bounds (but not equal to either of them). -func ShouldBeBetween(actual interface{}, expected ...interface{}) string { +func ShouldBeBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -66,7 +66,7 @@ func ShouldBeBetween(actual interface{}, expected ...interface{}) string { // ShouldNotBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is NOT between both bounds. -func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string { +func ShouldNotBeBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -79,7 +79,7 @@ func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string { } return success } -func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, fail string) { +func deriveBounds(values []any) (lower any, upper any, fail string) { lower = values[0] upper = values[1] @@ -90,7 +90,7 @@ func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, f } return lower, upper, success } -func isBetween(value, lower, upper interface{}) bool { +func isBetween(value, lower, upper any) bool { if ShouldBeGreaterThan(value, lower) != success { return false } else if ShouldBeLessThan(value, upper) != success { @@ -101,7 +101,7 @@ func isBetween(value, lower, upper interface{}) bool { // ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is between both bounds or equal to one of them. -func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string { +func ShouldBeBetweenOrEqual(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -117,7 +117,7 @@ func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string // ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is nopt between the bounds nor equal to either of them. -func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string { +func ShouldNotBeBetweenOrEqual(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -131,7 +131,7 @@ func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) stri return success } -func isBetweenOrEqual(value, lower, upper interface{}) bool { +func isBetweenOrEqual(value, lower, upper any) bool { if ShouldBeGreaterThanOrEqualTo(value, lower) != success { return false } else if ShouldBeLessThanOrEqualTo(value, upper) != success { diff --git a/vendor/github.com/smartystreets/assertions/serializer.go b/vendor/github.com/smartystreets/assertions/serializer.go index f1e3570..3fdf5dd 100644 --- a/vendor/github.com/smartystreets/assertions/serializer.go +++ b/vendor/github.com/smartystreets/assertions/serializer.go @@ -9,13 +9,13 @@ import ( ) type Serializer interface { - serialize(expected, actual interface{}, message string) string - serializeDetailed(expected, actual interface{}, message string) string + serialize(expected, actual any, message string) string + serializeDetailed(expected, actual any, message string) string } type failureSerializer struct{} -func (self *failureSerializer) serializeDetailed(expected, actual interface{}, message string) string { +func (self *failureSerializer) serializeDetailed(expected, actual any, message string) string { if index := strings.Index(message, " Diff:"); index > 0 { message = message[:index] } @@ -28,7 +28,7 @@ func (self *failureSerializer) serializeDetailed(expected, actual interface{}, m return string(serialized) } -func (self *failureSerializer) serialize(expected, actual interface{}, message string) string { +func (self *failureSerializer) serialize(expected, actual any, message string) string { if index := strings.Index(message, " Diff:"); index > 0 { message = message[:index] } @@ -47,7 +47,7 @@ func newSerializer() *failureSerializer { /////////////////////////////////////////////////////////////////////////////// -// This struct is also declared in github.com/smartystreets/goconvey/convey/reporting. +// FailureView is also declared in github.com/smartystreets/goconvey/convey/reporting. // The json struct tags should be equal in both declarations. type FailureView struct { Message string `json:"Message"` @@ -62,9 +62,9 @@ type FailureView struct { // structure provided by the failureSerializer. type noopSerializer struct{} -func (self *noopSerializer) serialize(expected, actual interface{}, message string) string { +func (self *noopSerializer) serialize(expected, actual any, message string) string { return message } -func (self *noopSerializer) serializeDetailed(expected, actual interface{}, message string) string { +func (self *noopSerializer) serializeDetailed(expected, actual any, message string) string { return message } diff --git a/vendor/github.com/smartystreets/assertions/strings.go b/vendor/github.com/smartystreets/assertions/strings.go index 9e25759..6f5ce39 100644 --- a/vendor/github.com/smartystreets/assertions/strings.go +++ b/vendor/github.com/smartystreets/assertions/strings.go @@ -7,7 +7,7 @@ import ( ) // ShouldStartWith receives exactly 2 string parameters and ensures that the first starts with the second. -func ShouldStartWith(actual interface{}, expected ...interface{}) string { +func ShouldStartWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -33,7 +33,7 @@ func shouldStartWith(value, prefix string) string { } // ShouldNotStartWith receives exactly 2 string parameters and ensures that the first does not start with the second. -func ShouldNotStartWith(actual interface{}, expected ...interface{}) string { +func ShouldNotStartWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -61,7 +61,7 @@ func shouldNotStartWith(value, prefix string) string { } // ShouldEndWith receives exactly 2 string parameters and ensures that the first ends with the second. -func ShouldEndWith(actual interface{}, expected ...interface{}) string { +func ShouldEndWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -86,8 +86,8 @@ func shouldEndWith(value, suffix string) string { return success } -// ShouldEndWith receives exactly 2 string parameters and ensures that the first does not end with the second. -func ShouldNotEndWith(actual interface{}, expected ...interface{}) string { +// ShouldNotEndWith receives exactly 2 string parameters and ensures that the first does not end with the second. +func ShouldNotEndWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -115,7 +115,7 @@ func shouldNotEndWith(value, suffix string) string { } // ShouldContainSubstring receives exactly 2 string parameters and ensures that the first contains the second as a substring. -func ShouldContainSubstring(actual interface{}, expected ...interface{}) string { +func ShouldContainSubstring(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -134,7 +134,7 @@ func ShouldContainSubstring(actual interface{}, expected ...interface{}) string } // ShouldNotContainSubstring receives exactly 2 string parameters and ensures that the first does NOT contain the second as a substring. -func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string { +func ShouldNotContainSubstring(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -153,7 +153,7 @@ func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) stri } // ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal to "". -func ShouldBeBlank(actual interface{}, expected ...interface{}) string { +func ShouldBeBlank(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -168,7 +168,7 @@ func ShouldBeBlank(actual interface{}, expected ...interface{}) string { } // ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is not equal to "". -func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string { +func ShouldNotBeBlank(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -184,7 +184,7 @@ func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string { // ShouldEqualWithout receives exactly 3 string parameters and ensures that the first is equal to the second // after removing all instances of the third from the first using strings.Replace(first, third, "", -1). -func ShouldEqualWithout(actual interface{}, expected ...interface{}) string { +func ShouldEqualWithout(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -210,7 +210,7 @@ func ShouldEqualWithout(actual interface{}, expected ...interface{}) string { // ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the first is equal to the second // after removing all leading and trailing whitespace using strings.TrimSpace(first). -func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string { +func ShouldEqualTrimSpace(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/time.go b/vendor/github.com/smartystreets/assertions/time.go index 918ee28..874c297 100644 --- a/vendor/github.com/smartystreets/assertions/time.go +++ b/vendor/github.com/smartystreets/assertions/time.go @@ -6,7 +6,7 @@ import ( ) // ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the first happens before the second. -func ShouldHappenBefore(actual interface{}, expected ...interface{}) string { +func ShouldHappenBefore(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -25,7 +25,7 @@ func ShouldHappenBefore(actual interface{}, expected ...interface{}) string { } // ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that the first happens on or before the second. -func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string { +func ShouldHappenOnOrBefore(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -43,7 +43,7 @@ func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string } // ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the first happens after the second. -func ShouldHappenAfter(actual interface{}, expected ...interface{}) string { +func ShouldHappenAfter(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -60,7 +60,7 @@ func ShouldHappenAfter(actual interface{}, expected ...interface{}) string { } // ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that the first happens on or after the second. -func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string { +func ShouldHappenOnOrAfter(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -77,7 +77,7 @@ func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string { } // ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the first happens between (not on) the second and third. -func ShouldHappenBetween(actual interface{}, expected ...interface{}) string { +func ShouldHappenBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -99,7 +99,7 @@ func ShouldHappenBetween(actual interface{}, expected ...interface{}) string { } // ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first happens between or on the second and third. -func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string { +func ShouldHappenOnOrBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -118,7 +118,7 @@ func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string // ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first // does NOT happen between or on the second or third. -func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string { +func ShouldNotHappenOnOrBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -141,7 +141,7 @@ func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) str // ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments) // and asserts that the first time.Time happens within or on the duration specified relative to // the other time.Time. -func ShouldHappenWithin(actual interface{}, expected ...interface{}) string { +func ShouldHappenWithin(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -161,7 +161,7 @@ func ShouldHappenWithin(actual interface{}, expected ...interface{}) string { // ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments) // and asserts that the first time.Time does NOT happen within or on the duration specified relative to // the other time.Time. -func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string { +func ShouldNotHappenWithin(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -180,7 +180,7 @@ func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string { // ShouldBeChronological receives a []time.Time slice and asserts that they are // in chronological order starting with the first time.Time as the earliest. -func ShouldBeChronological(actual interface{}, expected ...interface{}) string { +func ShouldBeChronological(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -203,7 +203,7 @@ func ShouldBeChronological(actual interface{}, expected ...interface{}) string { // ShouldNotBeChronological receives a []time.Time slice and asserts that they are // NOT in chronological order. -func ShouldNotBeChronological(actual interface{}, expected ...interface{}) string { +func ShouldNotBeChronological(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -214,5 +214,5 @@ func ShouldNotBeChronological(actual interface{}, expected ...interface{}) strin if result != "" { return "" } - return shouldNotHaveBeenchronological + return shouldNotHaveBeenChronological } diff --git a/vendor/github.com/smartystreets/assertions/type.go b/vendor/github.com/smartystreets/assertions/type.go index 1984fe8..271544a 100644 --- a/vendor/github.com/smartystreets/assertions/type.go +++ b/vendor/github.com/smartystreets/assertions/type.go @@ -7,7 +7,7 @@ import ( ) // ShouldHaveSameTypeAs receives exactly two parameters and compares their underlying types for equality. -func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string { +func ShouldHaveSameTypeAs(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -23,7 +23,7 @@ func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string { } // ShouldNotHaveSameTypeAs receives exactly two parameters and compares their underlying types for inequality. -func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string { +func ShouldNotHaveSameTypeAs(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -39,7 +39,7 @@ func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string // ShouldImplement receives exactly two parameters and ensures // that the first implements the interface type of the second. -func ShouldImplement(actual interface{}, expectedList ...interface{}) string { +func ShouldImplement(actual any, expectedList ...any) string { if fail := need(1, expectedList); fail != success { return fail } @@ -75,7 +75,7 @@ func ShouldImplement(actual interface{}, expectedList ...interface{}) string { // ShouldNotImplement receives exactly two parameters and ensures // that the first does NOT implement the interface type of the second. -func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string { +func ShouldNotImplement(actual any, expectedList ...any) string { if fail := need(1, expectedList); fail != success { return fail } @@ -112,7 +112,7 @@ func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string // ShouldBeError asserts that the first argument implements the error interface. // It also compares the first argument against the second argument if provided // (which must be an error message string or another error value). -func ShouldBeError(actual interface{}, expected ...interface{}) string { +func ShouldBeError(actual any, expected ...any) string { if fail := atMost(1, expected); fail != success { return fail } @@ -134,7 +134,7 @@ func ShouldBeError(actual interface{}, expected ...interface{}) string { // ShouldWrap asserts that the first argument (which must be an error value) // 'wraps' the second/final argument (which must also be an error value). // It relies on errors.Is to make the determination (https://golang.org/pkg/errors/#Is). -func ShouldWrap(actual interface{}, expected ...interface{}) string { +func ShouldWrap(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -150,5 +150,5 @@ func ShouldWrap(actual interface{}, expected ...interface{}) string { return success } -func isString(value interface{}) bool { _, ok := value.(string); return ok } -func isError(value interface{}) bool { _, ok := value.(error); return ok } +func isString(value any) bool { _, ok := value.(string); return ok } +func isError(value any) bool { _, ok := value.(error); return ok } diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index a49853e..3723b2c 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -10,7 +10,6 @@ import ( errorspkg "errors" "fmt" "runtime" - "strings" "sync" "syscall" "time" @@ -87,22 +86,13 @@ func StringToUTF16(s string) []uint16 { // s, with a terminating NUL added. If s contains a NUL byte at any // location, it returns (nil, syscall.EINVAL). func UTF16FromString(s string) ([]uint16, error) { - if strings.IndexByte(s, 0) != -1 { - return nil, syscall.EINVAL - } - return utf16.Encode([]rune(s + "\x00")), nil + return syscall.UTF16FromString(s) } // UTF16ToString returns the UTF-8 encoding of the UTF-16 sequence s, // with a terminating NUL and any bytes after the NUL removed. func UTF16ToString(s []uint16) string { - for i, v := range s { - if v == 0 { - s = s[:i] - break - } - } - return string(utf16.Decode(s)) + return syscall.UTF16ToString(s) } // StringToUTF16Ptr is deprecated. Use UTF16PtrFromString instead. @@ -834,6 +824,9 @@ const socket_error = uintptr(^uint32(0)) //sys WSAStartup(verreq uint32, data *WSAData) (sockerr error) = ws2_32.WSAStartup //sys WSACleanup() (err error) [failretval==socket_error] = ws2_32.WSACleanup //sys WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) [failretval==socket_error] = ws2_32.WSAIoctl +//sys WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceBeginW +//sys WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceNextW +//sys WSALookupServiceEnd(handle Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceEnd //sys socket(af int32, typ int32, protocol int32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.socket //sys sendto(s Handle, buf []byte, flags int32, to unsafe.Pointer, tolen int32) (err error) [failretval==socket_error] = ws2_32.sendto //sys recvfrom(s Handle, buf []byte, flags int32, from *RawSockaddrAny, fromlen *int32) (n int32, err error) [failretval==-1] = ws2_32.recvfrom @@ -1029,8 +1022,7 @@ func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) { for n < len(pp.Path) && pp.Path[n] != 0 { n++ } - bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] - sa.Name = string(bytes) + sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n)) return sa, nil case AF_INET: diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index 0c4add9..0dbb208 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -1243,6 +1243,51 @@ const ( DnsSectionAdditional = 0x0003 ) +const ( + // flags of WSALookupService + LUP_DEEP = 0x0001 + LUP_CONTAINERS = 0x0002 + LUP_NOCONTAINERS = 0x0004 + LUP_NEAREST = 0x0008 + LUP_RETURN_NAME = 0x0010 + LUP_RETURN_TYPE = 0x0020 + LUP_RETURN_VERSION = 0x0040 + LUP_RETURN_COMMENT = 0x0080 + LUP_RETURN_ADDR = 0x0100 + LUP_RETURN_BLOB = 0x0200 + LUP_RETURN_ALIASES = 0x0400 + LUP_RETURN_QUERY_STRING = 0x0800 + LUP_RETURN_ALL = 0x0FF0 + LUP_RES_SERVICE = 0x8000 + + LUP_FLUSHCACHE = 0x1000 + LUP_FLUSHPREVIOUS = 0x2000 + + LUP_NON_AUTHORITATIVE = 0x4000 + LUP_SECURE = 0x8000 + LUP_RETURN_PREFERRED_NAMES = 0x10000 + LUP_DNS_ONLY = 0x20000 + + LUP_ADDRCONFIG = 0x100000 + LUP_DUAL_ADDR = 0x200000 + LUP_FILESERVER = 0x400000 + LUP_DISABLE_IDN_ENCODING = 0x00800000 + LUP_API_ANSI = 0x01000000 + + LUP_RESOLUTION_HANDLE = 0x80000000 +) + +const ( + // values of WSAQUERYSET's namespace + NS_ALL = 0 + NS_DNS = 12 + NS_NLA = 15 + NS_BTH = 16 + NS_EMAIL = 37 + NS_PNRPNAME = 38 + NS_PNRPCLOUD = 39 +) + type DNSSRVData struct { Target *uint16 Priority uint16 @@ -2184,10 +2229,10 @@ const ( JobObjectExtendedLimitInformation = 9 JobObjectGroupInformation = 11 JobObjectGroupInformationEx = 14 - JobObjectLimitViolationInformation2 = 35 + JobObjectLimitViolationInformation2 = 34 JobObjectNetRateControlInformation = 32 JobObjectNotificationLimitInformation = 12 - JobObjectNotificationLimitInformation2 = 34 + JobObjectNotificationLimitInformation2 = 33 JobObjectSecurityLimitInformation = 5 ) @@ -3258,3 +3303,43 @@ const ( DWMWA_TEXT_COLOR = 36 DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37 ) + +type WSAQUERYSET struct { + Size uint32 + ServiceInstanceName *uint16 + ServiceClassId *GUID + Version *WSAVersion + Comment *uint16 + NameSpace uint32 + NSProviderId *GUID + Context *uint16 + NumberOfProtocols uint32 + AfpProtocols *AFProtocols + QueryString *uint16 + NumberOfCsAddrs uint32 + SaBuffer *CSAddrInfo + OutputFlags uint32 + Blob *BLOB +} + +type WSAVersion struct { + Version uint32 + EnumerationOfComparison int32 +} + +type AFProtocols struct { + AddressFamily int32 + Protocol int32 +} + +type CSAddrInfo struct { + LocalAddr SocketAddress + RemoteAddr SocketAddress + SocketType int32 + Protocol int32 +} + +type BLOB struct { + Size uint32 + BlobData *byte +} diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go index ac60052..6d2a268 100644 --- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go +++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go @@ -474,6 +474,9 @@ var ( procWSAEnumProtocolsW = modws2_32.NewProc("WSAEnumProtocolsW") procWSAGetOverlappedResult = modws2_32.NewProc("WSAGetOverlappedResult") procWSAIoctl = modws2_32.NewProc("WSAIoctl") + procWSALookupServiceBeginW = modws2_32.NewProc("WSALookupServiceBeginW") + procWSALookupServiceEnd = modws2_32.NewProc("WSALookupServiceEnd") + procWSALookupServiceNextW = modws2_32.NewProc("WSALookupServiceNextW") procWSARecv = modws2_32.NewProc("WSARecv") procWSARecvFrom = modws2_32.NewProc("WSARecvFrom") procWSASend = modws2_32.NewProc("WSASend") @@ -4067,6 +4070,30 @@ func WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbo return } +func WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) { + r1, _, e1 := syscall.Syscall(procWSALookupServiceBeginW.Addr(), 3, uintptr(unsafe.Pointer(querySet)), uintptr(flags), uintptr(unsafe.Pointer(handle))) + if r1 == socket_error { + err = errnoErr(e1) + } + return +} + +func WSALookupServiceEnd(handle Handle) (err error) { + r1, _, e1 := syscall.Syscall(procWSALookupServiceEnd.Addr(), 1, uintptr(handle), 0, 0) + if r1 == socket_error { + err = errnoErr(e1) + } + return +} + +func WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) { + r1, _, e1 := syscall.Syscall6(procWSALookupServiceNextW.Addr(), 4, uintptr(handle), uintptr(flags), uintptr(unsafe.Pointer(size)), uintptr(unsafe.Pointer(querySet)), 0, 0) + if r1 == socket_error { + err = errnoErr(e1) + } + return +} + func WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) { r1, _, e1 := syscall.Syscall9(procWSARecv.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0) if r1 == socket_error { diff --git a/vendor/modules.txt b/vendor/modules.txt index e0952f7..e5684b0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,28 +1,34 @@ # github.com/google/gopacket v1.1.19 -## explicit +## explicit; go 1.12 github.com/google/gopacket github.com/google/gopacket/layers github.com/google/gopacket/pcap # github.com/gopherjs/gopherjs v1.17.2 -## explicit +## explicit; go 1.17 github.com/gopherjs/gopherjs/js # github.com/jtolds/gls v4.20.0+incompatible ## explicit github.com/jtolds/gls -# github.com/smartystreets/assertions v1.13.0 -## explicit +# github.com/smartystreets/assertions v1.13.1 +## explicit; go 1.18 github.com/smartystreets/assertions github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch github.com/smartystreets/assertions/internal/go-render/render github.com/smartystreets/assertions/internal/oglematchers # github.com/smartystreets/goconvey v1.7.2 -## explicit +## explicit; go 1.16 github.com/smartystreets/goconvey/convey github.com/smartystreets/goconvey/convey/gotest github.com/smartystreets/goconvey/convey/reporting -# golang.org/x/net v0.4.0 -## explicit -# golang.org/x/sys v0.3.0 -## explicit +# golang.org/x/mod v0.10.0 +## explicit; go 1.17 +# golang.org/x/net v0.9.0 +## explicit; go 1.17 +# golang.org/x/sys v0.7.0 +## explicit; go 1.17 golang.org/x/sys/internal/unsafeheader golang.org/x/sys/windows +# golang.org/x/tools v0.8.0 +## explicit; go 1.18 +# golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 +## explicit; go 1.17 From 23ae37993f9cd5907bb785aeaaeb22dfb25ef61f Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Fri, 7 Apr 2023 17:54:08 +0800 Subject: [PATCH 02/15] upgrade golang version --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f0b74e..9226417 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, macos-12, macos-11] - go: [stable, 1.18.x, 1.17.x, 1.16.x, 1.15.x] + go: [stable, 1.20.x, 1.19.x, 1.18.x] name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan }} runs-on: ${{ matrix.os }} steps: @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@v3 - name: Install Golang ${{ matrix.go }} - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{ matrix.go }} cache: true @@ -60,7 +60,7 @@ jobs: include: - os: macos-latest go: stable - hyperscan: 5.4.0 + hyperscan: 5.4.1 pcre: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true @@ -78,7 +78,7 @@ jobs: chimera: true - os: ubuntu-20.04 go: stable - hyperscan: 5.4.0 + hyperscan: 5.4.1 pcre: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true From 32481aad3276f2c9ca2ce92a0cf9ab9cd6287763 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Fri, 7 Apr 2023 18:42:56 +0800 Subject: [PATCH 03/15] add workflow to build docker image --- .github/workflows/docker.yml | 37 ++++++++++++++++++++ Dockerfile | 65 +++++++++++++++++++++--------------- 2 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..09919c6 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,37 @@ +name: docker + +on: + push: + branches: + - master + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" + +env: + LATEST_TAG: flier/gohs:latest + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build and push + uses: docker/build-push-action@v4 + with: + load: true + tags: ${{ env.LATEST_TAG }} + + - name: Test + run: | + docker run --rm ${{ env.LATEST_TAG }} diff --git a/Dockerfile b/Dockerfile index f5c3b2a..ded4a81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,40 @@ -ARG UBUNTU_VERSION=20.04 +ARG UBUNTU_VERSION=22.04 FROM ubuntu:${UBUNTU_VERSION} -ARG GO_VERSION=1.17.1 -ARG HYPERSCAN_VERSION=5.4.0 +ARG GO_VERSION=1.20.3 +ARG HYPERSCAN_VERSION=5.4.1 ARG PCRE_VERSION=8.45 # Install dependencies ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - cmake \ - libboost-dev \ - libbz2-dev \ - libpcap-dev \ - ninja-build \ - pkg-config \ - python2.7 \ - ragel \ - wget \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* +RUN < Date: Fri, 7 Apr 2023 18:47:34 +0800 Subject: [PATCH 04/15] fix hint warning --- hyperscan/stream.go | 4 ++-- internal/hs/runtime.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hyperscan/stream.go b/hyperscan/stream.go index 40326de..b25e111 100644 --- a/hyperscan/stream.go +++ b/hyperscan/stream.go @@ -163,8 +163,8 @@ func (ss *streamScanner) Open(flags ScanFlag, sc *Scratch, handler MatchHandler, return &stream{s, flags, sc.s, handler, context, ownedScratch}, nil } -func (ss *streamScanner) Scan(reader io.Reader, scratch *Scratch, handler MatchHandler, context interface{}) error { - stream, err := ss.Open(0, nil, handler, context) +func (ss *streamScanner) Scan(reader io.Reader, sc *Scratch, handler MatchHandler, context interface{}) error { + stream, err := ss.Open(0, sc, handler, context) if err != nil { return err } diff --git a/internal/hs/runtime.go b/internal/hs/runtime.go index a5267f3..a33a08c 100644 --- a/internal/hs/runtime.go +++ b/internal/hs/runtime.go @@ -140,7 +140,7 @@ type MatchRecorder struct { func (h *MatchRecorder) Matched() bool { return len(h.Events) > 0 } -func (h *MatchRecorder) Handle(id uint, from, to uint64, flags uint, context interface{}) error { +func (h *MatchRecorder) Handle(id uint, from, to uint64, flags uint, _ interface{}) error { if len(h.Events) > 0 { tail := &h.Events[len(h.Events)-1] From 43ab5a72647fdf107b2e1d9f5787b9d92521ab0a Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Fri, 7 Apr 2023 18:51:50 +0800 Subject: [PATCH 05/15] mkdir before tar --- Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ded4a81..14cc45a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,10 +43,16 @@ ENV PATH=/usr/local/go/bin:${PATH} ENV HYPERSCAN_DIR=/hyperscan ADD https://github.com/intel/hyperscan/archive/refs/tags/v${HYPERSCAN_VERSION}.tar.gz /hyperscan-v${HYPERSCAN_VERSION}.tar.gz -RUN tar xf /hyperscan-v${HYPERSCAN_VERSION}.tar.gz -C ${HYPERSCAN_DIR} --strip-components=1 +RUN < Date: Fri, 7 Apr 2023 19:03:59 +0800 Subject: [PATCH 06/15] remove tar.gz after extract it --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14cc45a..50807aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,12 +46,14 @@ ADD https://github.com/intel/hyperscan/archive/refs/tags/v${HYPERSCAN_VERSION}.t RUN < Date: Fri, 7 Apr 2023 19:16:43 +0800 Subject: [PATCH 07/15] remove ubuntu-18.04 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9226417..7241fb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: test: strategy: matrix: - os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, macos-12, macos-11] + os: [ubuntu-22.04, ubuntu-20.04, macos-12, macos-11] go: [stable, 1.20.x, 1.19.x, 1.18.x] name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan }} runs-on: ${{ matrix.os }} @@ -146,7 +146,7 @@ jobs: golangci: name: lint - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Install Linux dependencies run: | From 8747a28e8c04ef094c51e02bf7ec8095395b8436 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Fri, 7 Apr 2023 19:23:43 +0800 Subject: [PATCH 08/15] remove unused modules --- go.mod | 3 --- go.sum | 6 ------ vendor/modules.txt | 6 ------ 3 files changed, 15 deletions(-) diff --git a/go.mod b/go.mod index 3c08171..3c1ff84 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,6 @@ require ( github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect github.com/smartystreets/assertions v1.13.1 // indirect - golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect - golang.org/x/tools v0.8.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect ) diff --git a/go.sum b/go.sum index ce8f003..769bd42 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -29,8 +27,4 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= -golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= diff --git a/vendor/modules.txt b/vendor/modules.txt index e5684b0..f130ac5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -20,15 +20,9 @@ github.com/smartystreets/assertions/internal/oglematchers github.com/smartystreets/goconvey/convey github.com/smartystreets/goconvey/convey/gotest github.com/smartystreets/goconvey/convey/reporting -# golang.org/x/mod v0.10.0 -## explicit; go 1.17 # golang.org/x/net v0.9.0 ## explicit; go 1.17 # golang.org/x/sys v0.7.0 ## explicit; go 1.17 golang.org/x/sys/internal/unsafeheader golang.org/x/sys/windows -# golang.org/x/tools v0.8.0 -## explicit; go 1.18 -# golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 -## explicit; go 1.17 From 5a94aaa5363ba6da58664610a470377bfabc81c5 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Tue, 18 Apr 2023 16:00:11 +0800 Subject: [PATCH 09/15] remove ubuntu 18.04 --- .github/workflows/ci.yml | 50 +++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7241fb7..11407c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-22.04, ubuntu-20.04, macos-12, macos-11] go: [stable, 1.20.x, 1.19.x, 1.18.x] - name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan }} + name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan runs-on: ${{ matrix.os }} steps: - name: Install Linux dependencies for testing libraries @@ -43,13 +43,11 @@ jobs: cache: true - name: Test Hyperscan v4 API - if: matrix.os == 'ubuntu-18.04' run: | go test -v -tags hyperscan_v4 ./internal/hs/... ./hyperscan/... go test -race -v -tags hyperscan_v4 ./internal/hs/... ./hyperscan/... - name: Test Hyperscan v5 API - if: matrix.os != 'ubuntu-18.04' run: | go test -v ./internal/hs/... ./hyperscan/... go test -race -v ./internal/hs/... ./hyperscan/... @@ -60,47 +58,47 @@ jobs: include: - os: macos-latest go: stable - hyperscan: 5.4.1 - pcre: 8.45 + hyperscan_version: 5.4.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true - os: macos-latest go: stable - hyperscan: 5.2.1 - pcre: 8.45 + hyperscan_version: 5.2.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - os: macos-latest go: stable - hyperscan: 5.1.1 - pcre: 8.45 + hyperscan_version: 5.1.1 + pcre_version: 8.45 build_flags: -tags chimera chimera: true - - os: ubuntu-20.04 + - os: ubuntu-22.04 go: stable - hyperscan: 5.4.1 - pcre: 8.45 + hyperscan_version: 5.4.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true coverage: true - - os: ubuntu-20.04 + - os: ubuntu-22.04 go: stable - hyperscan: 5.2.1 - pcre: 8.45 + hyperscan_version: 5.2.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - - os: ubuntu-20.04 + - os: ubuntu-22.04 go: stable - hyperscan: 5.1.1 - pcre: 8.45 + hyperscan_version: 5.1.1 + pcre_version: 8.45 build_flags: -tags chimera chimera: true - - os: ubuntu-18.04 + - os: ubuntu-22.04 go: stable - hyperscan: 4.7.0 - pcre: 8.41 + hyperscan_version: 4.7.0 + pcre_version: 8.41 build_flags: -tags hyperscan_v4 - name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan }} + name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan_version }} runs-on: ${{ matrix.os }} env: PKG_CONFIG_PATH: ${{ github.workspace }}/dist/lib/pkgconfig @@ -109,15 +107,15 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Hyperscan ${{ matrix.hyperscan }} with PCRE ${{ matrix.pcre }} + - name: Install Hyperscan ${{ matrix.hyperscan }} with PCRE ${{ matrix.pcre_version }} uses: flier/install-hyperscan@main with: - hyperscan_version: ${{ matrix.hyperscan }} - pcre_version: ${{ matrix.pcre }} + hyperscan_version: ${{ matrix.hyperscan_version }} + pcre_version: ${{ matrix.pcre_version }} build_static_lib: on src_dir: ${{ runner.temp }}/hyperscan/ install_prefix: ${{ github.workspace }}/dist/ - cache_key: ${{ runner.os }}-build-hyperscan-${{ matrix.hyperscan }}-pcre-${{ matrix.pcre }} + cache_key: ${{ runner.os }}-build-hyperscan-${{ matrix.hyperscan_version }}-pcre-${{ matrix.pcre_version }} - name: Install Golang ${{ matrix.go }} uses: actions/setup-go@v3 From 9e1a26e8300a1d9c4c111f5bbde885133e01fd02 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Tue, 18 Apr 2023 16:01:31 +0800 Subject: [PATCH 10/15] upgrade goconvey --- go.mod | 2 +- go.sum | 8 +- .../smartystreets/goconvey/LICENSE.md | 4 +- .../goconvey/convey/assertions.go | 124 +++++++++--------- .../smartystreets/goconvey/convey/context.go | 24 ++-- .../goconvey/convey/discovery.go | 16 +-- .../smartystreets/goconvey/convey/doc.go | 38 +++--- .../goconvey/convey/reporting/printer.go | 6 +- .../goconvey/convey/reporting/reports.go | 4 +- .../goconvey/convey/update_assertions.sh | 31 +++++ vendor/modules.txt | 4 +- 11 files changed, 146 insertions(+), 115 deletions(-) create mode 100644 vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh diff --git a/go.mod b/go.mod index 3c1ff84..0936a04 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/google/gopacket v1.1.19 - github.com/smartystreets/goconvey v1.7.2 + github.com/smartystreets/goconvey v1.8.0 ) require ( diff --git a/go.sum b/go.sum index 769bd42..b9fb0b7 100644 --- a/go.sum +++ b/go.sum @@ -1,20 +1,17 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU= github.com/smartystreets/assertions v1.13.1/go.mod h1:cXr/IwVfSo/RbCSPhoAPv73p3hlSdrBH/b3SdnW/LMY= -github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= -github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= +github.com/smartystreets/goconvey v1.8.0 h1:Oi49ha/2MURE0WexF052Z0m+BNSGirfjg5RL+JXWq3w= +github.com/smartystreets/goconvey v1.8.0/go.mod h1:EdX8jtrTIj26jmjCOVNMVSIYAtgexqXKHOXW2Dx9JLg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= @@ -25,6 +22,5 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/smartystreets/goconvey/LICENSE.md b/vendor/github.com/smartystreets/goconvey/LICENSE.md index 3f87a40..99ce426 100644 --- a/vendor/github.com/smartystreets/goconvey/LICENSE.md +++ b/vendor/github.com/smartystreets/goconvey/LICENSE.md @@ -1,4 +1,6 @@ -Copyright (c) 2016 SmartyStreets, LLC +MIT License + +Copyright (c) 2022 Smarty Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/github.com/smartystreets/goconvey/convey/assertions.go b/vendor/github.com/smartystreets/goconvey/convey/assertions.go index 9fad7c2..bff8eac 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/assertions.go +++ b/vendor/github.com/smartystreets/goconvey/convey/assertions.go @@ -1,73 +1,75 @@ package convey +// DO NOT EDIT: generated by update_assertions.sh + +//go:generate ./update_assertions.sh + import "github.com/smartystreets/assertions" +// These assertions are forwarded from github.com/smartystreets/assertions +// in order to make convey self-contained. var ( - ShouldEqual = assertions.ShouldEqual - ShouldNotEqual = assertions.ShouldNotEqual - ShouldAlmostEqual = assertions.ShouldAlmostEqual - ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual - ShouldEqualJSON = assertions.ShouldEqualJSON - ShouldResemble = assertions.ShouldResemble - ShouldNotResemble = assertions.ShouldNotResemble - ShouldPointTo = assertions.ShouldPointTo - ShouldNotPointTo = assertions.ShouldNotPointTo - ShouldBeNil = assertions.ShouldBeNil - ShouldNotBeNil = assertions.ShouldNotBeNil - ShouldBeTrue = assertions.ShouldBeTrue - ShouldBeFalse = assertions.ShouldBeFalse - ShouldBeZeroValue = assertions.ShouldBeZeroValue - ShouldNotBeZeroValue = assertions.ShouldNotBeZeroValue - + ShouldAlmostEqual = assertions.ShouldAlmostEqual + ShouldBeBetween = assertions.ShouldBeBetween + ShouldBeBetweenOrEqual = assertions.ShouldBeBetweenOrEqual + ShouldBeBlank = assertions.ShouldBeBlank + ShouldBeChronological = assertions.ShouldBeChronological + ShouldBeEmpty = assertions.ShouldBeEmpty + ShouldBeError = assertions.ShouldBeError + ShouldBeFalse = assertions.ShouldBeFalse ShouldBeGreaterThan = assertions.ShouldBeGreaterThan ShouldBeGreaterThanOrEqualTo = assertions.ShouldBeGreaterThanOrEqualTo + ShouldBeIn = assertions.ShouldBeIn ShouldBeLessThan = assertions.ShouldBeLessThan ShouldBeLessThanOrEqualTo = assertions.ShouldBeLessThanOrEqualTo - ShouldBeBetween = assertions.ShouldBeBetween + ShouldBeNil = assertions.ShouldBeNil + ShouldBeTrue = assertions.ShouldBeTrue + ShouldBeZeroValue = assertions.ShouldBeZeroValue + ShouldContain = assertions.ShouldContain + ShouldContainKey = assertions.ShouldContainKey + ShouldContainSubstring = assertions.ShouldContainSubstring + ShouldEndWith = assertions.ShouldEndWith + ShouldEqual = assertions.ShouldEqual + ShouldEqualJSON = assertions.ShouldEqualJSON + ShouldEqualTrimSpace = assertions.ShouldEqualTrimSpace + ShouldEqualWithout = assertions.ShouldEqualWithout + ShouldHappenAfter = assertions.ShouldHappenAfter + ShouldHappenBefore = assertions.ShouldHappenBefore + ShouldHappenBetween = assertions.ShouldHappenBetween + ShouldHappenOnOrAfter = assertions.ShouldHappenOnOrAfter + ShouldHappenOnOrBefore = assertions.ShouldHappenOnOrBefore + ShouldHappenOnOrBetween = assertions.ShouldHappenOnOrBetween + ShouldHappenWithin = assertions.ShouldHappenWithin + ShouldHaveLength = assertions.ShouldHaveLength + ShouldHaveSameTypeAs = assertions.ShouldHaveSameTypeAs + ShouldImplement = assertions.ShouldImplement + ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual ShouldNotBeBetween = assertions.ShouldNotBeBetween - ShouldBeBetweenOrEqual = assertions.ShouldBeBetweenOrEqual ShouldNotBeBetweenOrEqual = assertions.ShouldNotBeBetweenOrEqual - - ShouldContain = assertions.ShouldContain - ShouldNotContain = assertions.ShouldNotContain - ShouldContainKey = assertions.ShouldContainKey - ShouldNotContainKey = assertions.ShouldNotContainKey - ShouldBeIn = assertions.ShouldBeIn - ShouldNotBeIn = assertions.ShouldNotBeIn - ShouldBeEmpty = assertions.ShouldBeEmpty - ShouldNotBeEmpty = assertions.ShouldNotBeEmpty - ShouldHaveLength = assertions.ShouldHaveLength - - ShouldStartWith = assertions.ShouldStartWith - ShouldNotStartWith = assertions.ShouldNotStartWith - ShouldEndWith = assertions.ShouldEndWith - ShouldNotEndWith = assertions.ShouldNotEndWith - ShouldBeBlank = assertions.ShouldBeBlank - ShouldNotBeBlank = assertions.ShouldNotBeBlank - ShouldContainSubstring = assertions.ShouldContainSubstring - ShouldNotContainSubstring = assertions.ShouldNotContainSubstring - - ShouldPanic = assertions.ShouldPanic - ShouldNotPanic = assertions.ShouldNotPanic - ShouldPanicWith = assertions.ShouldPanicWith - ShouldNotPanicWith = assertions.ShouldNotPanicWith - - ShouldHaveSameTypeAs = assertions.ShouldHaveSameTypeAs - ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs - ShouldImplement = assertions.ShouldImplement - ShouldNotImplement = assertions.ShouldNotImplement - - ShouldHappenBefore = assertions.ShouldHappenBefore - ShouldHappenOnOrBefore = assertions.ShouldHappenOnOrBefore - ShouldHappenAfter = assertions.ShouldHappenAfter - ShouldHappenOnOrAfter = assertions.ShouldHappenOnOrAfter - ShouldHappenBetween = assertions.ShouldHappenBetween - ShouldHappenOnOrBetween = assertions.ShouldHappenOnOrBetween - ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween - ShouldHappenWithin = assertions.ShouldHappenWithin - ShouldNotHappenWithin = assertions.ShouldNotHappenWithin - ShouldBeChronological = assertions.ShouldBeChronological - - ShouldBeError = assertions.ShouldBeError - ShouldWrap = assertions.ShouldWrap + ShouldNotBeBlank = assertions.ShouldNotBeBlank + ShouldNotBeChronological = assertions.ShouldNotBeChronological + ShouldNotBeEmpty = assertions.ShouldNotBeEmpty + ShouldNotBeIn = assertions.ShouldNotBeIn + ShouldNotBeNil = assertions.ShouldNotBeNil + ShouldNotBeZeroValue = assertions.ShouldNotBeZeroValue + ShouldNotContain = assertions.ShouldNotContain + ShouldNotContainKey = assertions.ShouldNotContainKey + ShouldNotContainSubstring = assertions.ShouldNotContainSubstring + ShouldNotEndWith = assertions.ShouldNotEndWith + ShouldNotEqual = assertions.ShouldNotEqual + ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween + ShouldNotHappenWithin = assertions.ShouldNotHappenWithin + ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs + ShouldNotImplement = assertions.ShouldNotImplement + ShouldNotPanic = assertions.ShouldNotPanic + ShouldNotPanicWith = assertions.ShouldNotPanicWith + ShouldNotPointTo = assertions.ShouldNotPointTo + ShouldNotResemble = assertions.ShouldNotResemble + ShouldNotStartWith = assertions.ShouldNotStartWith + ShouldPanic = assertions.ShouldPanic + ShouldPanicWith = assertions.ShouldPanicWith + ShouldPointTo = assertions.ShouldPointTo + ShouldResemble = assertions.ShouldResemble + ShouldStartWith = assertions.ShouldStartWith + ShouldWrap = assertions.ShouldWrap ) diff --git a/vendor/github.com/smartystreets/goconvey/convey/context.go b/vendor/github.com/smartystreets/goconvey/convey/context.go index 4b0d28d..626cc4c 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/context.go +++ b/vendor/github.com/smartystreets/goconvey/convey/context.go @@ -9,14 +9,14 @@ import ( type conveyErr struct { fmt string - params []interface{} + params []any } func (e *conveyErr) Error() string { return fmt.Sprintf(e.fmt, e.params...) } -func conveyPanic(fmt string, params ...interface{}) { +func conveyPanic(fmt string, params ...any) { panic(&conveyErr{fmt, params}) } @@ -85,7 +85,7 @@ type context struct { // rootConvey is the main entry point to a test suite. This is called when // there's no context in the stack already, and items must contain a `t` object, // or this panics. -func rootConvey(items ...interface{}) { +func rootConvey(items ...any) { entry := discover(items) if entry.Test == nil { @@ -117,15 +117,15 @@ func rootConvey(items ...interface{}) { //////////////////////////////////// Methods //////////////////////////////////// -func (ctx *context) SkipConvey(items ...interface{}) { +func (ctx *context) SkipConvey(items ...any) { ctx.Convey(items, skipConvey) } -func (ctx *context) FocusConvey(items ...interface{}) { +func (ctx *context) FocusConvey(items ...any) { ctx.Convey(items, focusConvey) } -func (ctx *context) Convey(items ...interface{}) { +func (ctx *context) Convey(items ...any) { entry := discover(items) // we're a branch, or leaf (on the wind) @@ -168,11 +168,11 @@ func (ctx *context) Convey(items ...interface{}) { } } -func (ctx *context) SkipSo(stuff ...interface{}) { +func (ctx *context) SkipSo(stuff ...any) { ctx.assertionReport(reporting.NewSkipReport()) } -func (ctx *context) So(actual interface{}, assert Assertion, expected ...interface{}) { +func (ctx *context) So(actual any, assert Assertion, expected ...any) { if result := assert(actual, expected...); result == assertionSuccess { ctx.assertionReport(reporting.NewSuccessReport()) } else { @@ -180,7 +180,7 @@ func (ctx *context) So(actual interface{}, assert Assertion, expected ...interfa } } -func (ctx *context) SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{}) { +func (ctx *context) SoMsg(msg string, actual any, assert Assertion, expected ...any) { if result := assert(actual, expected...); result == assertionSuccess { ctx.assertionReport(reporting.NewSuccessReport()) return @@ -196,17 +196,17 @@ func (ctx *context) Reset(action func()) { ctx.resets = append(ctx.resets, action) } -func (ctx *context) Print(items ...interface{}) (int, error) { +func (ctx *context) Print(items ...any) (int, error) { fmt.Fprint(ctx.reporter, items...) return fmt.Print(items...) } -func (ctx *context) Println(items ...interface{}) (int, error) { +func (ctx *context) Println(items ...any) (int, error) { fmt.Fprintln(ctx.reporter, items...) return fmt.Println(items...) } -func (ctx *context) Printf(format string, items ...interface{}) (int, error) { +func (ctx *context) Printf(format string, items ...any) (int, error) { fmt.Fprintf(ctx.reporter, format, items...) return fmt.Printf(format, items...) } diff --git a/vendor/github.com/smartystreets/goconvey/convey/discovery.go b/vendor/github.com/smartystreets/goconvey/convey/discovery.go index 5e6d1f6..4694d10 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/discovery.go +++ b/vendor/github.com/smartystreets/goconvey/convey/discovery.go @@ -34,7 +34,7 @@ func newSuite(situation string, failureMode FailureMode, stackMode StackMode, f return ret } -func discover(items []interface{}) *suite { +func discover(items []any) *suite { name, items := parseName(items) test, items := parseGoTest(items) failure, items := parseFailureMode(items) @@ -48,38 +48,38 @@ func discover(items []interface{}) *suite { return newSuite(name, failure, stack, action, test, specifier) } -func item(items []interface{}) interface{} { +func item(items []any) any { if len(items) == 0 { conveyPanic(parseError) } return items[0] } -func parseName(items []interface{}) (string, []interface{}) { +func parseName(items []any) (string, []any) { if name, parsed := item(items).(string); parsed { return name, items[1:] } conveyPanic(parseError) panic("never get here") } -func parseGoTest(items []interface{}) (t, []interface{}) { +func parseGoTest(items []any) (t, []any) { if test, parsed := item(items).(t); parsed { return test, items[1:] } return nil, items } -func parseFailureMode(items []interface{}) (FailureMode, []interface{}) { +func parseFailureMode(items []any) (FailureMode, []any) { if mode, parsed := item(items).(FailureMode); parsed { return mode, items[1:] } return FailureInherits, items } -func parseStackMode(items []interface{}) (StackMode, []interface{}) { +func parseStackMode(items []any) (StackMode, []any) { if mode, parsed := item(items).(StackMode); parsed { return mode, items[1:] } return StackInherits, items } -func parseAction(items []interface{}) (func(C), []interface{}) { +func parseAction(items []any) (func(C), []any) { switch x := item(items).(type) { case nil: return nil, items[1:] @@ -91,7 +91,7 @@ func parseAction(items []interface{}) (func(C), []interface{}) { conveyPanic(parseError) panic("never get here") } -func parseSpecifier(items []interface{}) (actionSpecifier, []interface{}) { +func parseSpecifier(items []any) (actionSpecifier, []any) { if len(items) == 0 { return noSpecifier, items } diff --git a/vendor/github.com/smartystreets/goconvey/convey/doc.go b/vendor/github.com/smartystreets/goconvey/convey/doc.go index b852235..2a9d55d 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/doc.go +++ b/vendor/github.com/smartystreets/goconvey/convey/doc.go @@ -19,19 +19,19 @@ import "github.com/smartystreets/goconvey/convey/reporting" // All methods in this context behave identically to the global functions of the // same name in this package. type C interface { - Convey(items ...interface{}) - SkipConvey(items ...interface{}) - FocusConvey(items ...interface{}) + Convey(items ...any) + SkipConvey(items ...any) + FocusConvey(items ...any) - So(actual interface{}, assert Assertion, expected ...interface{}) - SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{}) - SkipSo(stuff ...interface{}) + So(actual any, assert Assertion, expected ...any) + SoMsg(msg string, actual any, assert Assertion, expected ...any) + SkipSo(stuff ...any) Reset(action func()) - Println(items ...interface{}) (int, error) - Print(items ...interface{}) (int, error) - Printf(format string, items ...interface{}) (int, error) + Println(items ...any) (int, error) + Print(items ...any) (int, error) + Printf(format string, items ...any) (int, error) } // Convey is the method intended for use when declaring the scopes of @@ -71,7 +71,7 @@ type C interface { // Convey(description string, mode FailureMode, action func()) // // See the examples package for, well, examples. -func Convey(items ...interface{}) { +func Convey(items ...any) { if ctx := getCurrentContext(); ctx == nil { rootConvey(items...) } else { @@ -82,7 +82,7 @@ func Convey(items ...interface{}) { // SkipConvey is analogous to Convey except that the scope is not executed // (which means that child scopes defined within this scope are not run either). // The reporter will be notified that this step was skipped. -func SkipConvey(items ...interface{}) { +func SkipConvey(items ...any) { Convey(append(items, skipConvey)...) } @@ -93,7 +93,7 @@ func SkipConvey(items ...interface{}) { // repeatedly as you can disable all but one of that function // without swaths of `SkipConvey` calls, just a targeted chain of calls // to FocusConvey. -func FocusConvey(items ...interface{}) { +func FocusConvey(items ...any) { Convey(append(items, focusConvey)...) } @@ -109,7 +109,7 @@ func Reset(action func()) { // method can handle. Any future or custom assertions should conform to this // method signature. The return value should be an empty string if the assertion // passes and a well-formed failure message if not. -type Assertion func(actual interface{}, expected ...interface{}) string +type Assertion func(actual any, expected ...any) string const assertionSuccess = "" @@ -122,18 +122,18 @@ const assertionSuccess = "" // documentation on specific assertion methods. A failing assertion will // cause t.Fail() to be invoked--you should never call this method (or other // failure-inducing methods) in your test code. Leave that to GoConvey. -func So(actual interface{}, assert Assertion, expected ...interface{}) { +func So(actual any, assert Assertion, expected ...any) { mustGetCurrentContext().So(actual, assert, expected...) } // SoMsg is an extension of So that allows you to specify a message to report on error. -func SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{}) { +func SoMsg(msg string, actual any, assert Assertion, expected ...any) { mustGetCurrentContext().SoMsg(msg, actual, assert, expected...) } // SkipSo is analogous to So except that the assertion that would have been passed // to So is not executed and the reporter is notified that the assertion was skipped. -func SkipSo(stuff ...interface{}) { +func SkipSo(stuff ...any) { mustGetCurrentContext().SkipSo() } @@ -222,19 +222,19 @@ func SetDefaultStackMode(mode StackMode) { // Print is analogous to fmt.Print (and it even calls fmt.Print). It ensures that // output is aligned with the corresponding scopes in the web UI. -func Print(items ...interface{}) (written int, err error) { +func Print(items ...any) (written int, err error) { return mustGetCurrentContext().Print(items...) } // Print is analogous to fmt.Println (and it even calls fmt.Println). It ensures that // output is aligned with the corresponding scopes in the web UI. -func Println(items ...interface{}) (written int, err error) { +func Println(items ...any) (written int, err error) { return mustGetCurrentContext().Println(items...) } // Print is analogous to fmt.Printf (and it even calls fmt.Printf). It ensures that // output is aligned with the corresponding scopes in the web UI. -func Printf(format string, items ...interface{}) (written int, err error) { +func Printf(format string, items ...any) (written int, err error) { return mustGetCurrentContext().Printf(format, items...) } diff --git a/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go b/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go index 3dac0d4..e4bd8ba 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go +++ b/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go @@ -11,12 +11,12 @@ type Printer struct { prefix string } -func (self *Printer) Println(message string, values ...interface{}) { +func (self *Printer) Println(message string, values ...any) { formatted := self.format(message, values...) + newline self.out.Write([]byte(formatted)) } -func (self *Printer) Print(message string, values ...interface{}) { +func (self *Printer) Print(message string, values ...any) { formatted := self.format(message, values...) self.out.Write([]byte(formatted)) } @@ -25,7 +25,7 @@ func (self *Printer) Insert(text string) { self.out.Write([]byte(text)) } -func (self *Printer) format(message string, values ...interface{}) string { +func (self *Printer) format(message string, values ...any) string { var formatted string if len(values) == 0 { formatted = self.prefix + message diff --git a/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go b/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go index f30789f..7a65019 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go +++ b/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go @@ -92,7 +92,7 @@ type AssertionResult struct { Expected string Actual string Failure string - Error interface{} + Error any StackTrace string Skipped bool } @@ -117,7 +117,7 @@ func parseFailure(failure string, report *AssertionResult) { report.Failure = failure } } -func NewErrorReport(err interface{}) *AssertionResult { +func NewErrorReport(err any) *AssertionResult { report := new(AssertionResult) report.File, report.Line = caller() report.StackTrace = fullStackTrace() diff --git a/vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh b/vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh new file mode 100644 index 0000000..df28062 --- /dev/null +++ b/vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +cd "$(dirname $(realpath $0))" + +ASSERTIONS=($( + go tool nm "$(go list -export -f '{{.Export}}' github.com/smartystreets/assertions)" |\ + awk '/ T github\.com\/smartystreets\/assertions\.Should/{split($3, a, "."); print a[3]}' |\ + sort | uniq)) + +( + echo "package convey" + echo + echo "// DO NOT EDIT: generated by update_assertions.sh" + echo + echo "//go:generate ./update_assertions.sh" + echo + echo "import \"github.com/smartystreets/assertions\"" + echo + echo "// These assertions are forwarded from github.com/smartystreets/assertions" + echo "// in order to make convey self-contained." + echo "var (" + + for assertion in "${ASSERTIONS[@]}" + do + echo " $assertion = assertions.$assertion" + done + + echo ")" +) > ./assertions.go + +go fmt ./assertions.go diff --git a/vendor/modules.txt b/vendor/modules.txt index f130ac5..ab39653 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -15,8 +15,8 @@ github.com/smartystreets/assertions github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch github.com/smartystreets/assertions/internal/go-render/render github.com/smartystreets/assertions/internal/oglematchers -# github.com/smartystreets/goconvey v1.7.2 -## explicit; go 1.16 +# github.com/smartystreets/goconvey v1.8.0 +## explicit; go 1.18 github.com/smartystreets/goconvey/convey github.com/smartystreets/goconvey/convey/gotest github.com/smartystreets/goconvey/convey/reporting From d1daedd6835905801282e7accf1c7eef27b0f934 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Tue, 18 Apr 2023 16:22:17 +0800 Subject: [PATCH 11/15] use ubuntu-20 for old hyperscan version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11407c7..32f91c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,19 +81,19 @@ jobs: build_flags: -tags hyperscan_v54,chimera chimera: true coverage: true - - os: ubuntu-22.04 + - os: ubuntu-20.04 go: stable hyperscan_version: 5.2.1 pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - - os: ubuntu-22.04 + - os: ubuntu-20.04 go: stable hyperscan_version: 5.1.1 pcre_version: 8.45 build_flags: -tags chimera chimera: true - - os: ubuntu-22.04 + - os: ubuntu-20.04 go: stable hyperscan_version: 4.7.0 pcre_version: 8.41 From d44fc0bc7f43b7948b4963de35eef87f838cb1ad Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Tue, 18 Apr 2023 16:42:07 +0800 Subject: [PATCH 12/15] run test in docker-compose --- .github/workflows/ci.yml | 15 ++-------- .github/workflows/docker.yml | 12 ++++++++ Dockerfile | 54 ++++++++++++++++++++++-------------- docker-compose.yml | 2 +- 4 files changed, 48 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32f91c5..659a26b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,13 +62,13 @@ jobs: pcre_version: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true - - os: macos-latest + - os: macos-12 go: stable hyperscan_version: 5.2.1 pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - - os: macos-latest + - os: macos-11 go: stable hyperscan_version: 5.1.1 pcre_version: 8.45 @@ -87,17 +87,6 @@ jobs: pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - - os: ubuntu-20.04 - go: stable - hyperscan_version: 5.1.1 - pcre_version: 8.45 - build_flags: -tags chimera - chimera: true - - os: ubuntu-20.04 - go: stable - hyperscan_version: 4.7.0 - pcre_version: 8.41 - build_flags: -tags hyperscan_v4 name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan_version }} runs-on: ${{ matrix.os }} env: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 09919c6..a0589d5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -35,3 +35,15 @@ jobs: - name: Test run: | docker run --rm ${{ env.LATEST_TAG }} + + docker-test: + runs-on: ubuntu-latest + strategy: + matrix: + version: [hyperscan-5.4, hyperscan-5.2, hyperscan-4.7] + steps: + - uses: actions/checkout@v3 + - uses: isbang/compose-action@v1.4.1 + with: + compose-file: "./docker-compose.yml" + services: ${{ matrix.version }} diff --git a/Dockerfile b/Dockerfile index 50807aa..52a593b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,10 @@ ARG PCRE_VERSION=8.45 # Install dependencies ENV DEBIAN_FRONTEND noninteractive + +# hadolint ignore=DL3008 RUN < Date: Tue, 18 Apr 2023 17:01:00 +0800 Subject: [PATCH 13/15] use syntax for dockerfile --- .github/workflows/docker.yml | 2 +- Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a0589d5..f30982a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,5 +45,5 @@ jobs: - uses: actions/checkout@v3 - uses: isbang/compose-action@v1.4.1 with: - compose-file: "./docker-compose.yml" + compose-file: docker-compose.yml services: ${{ matrix.version }} diff --git a/Dockerfile b/Dockerfile index 52a593b..833ba93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + ARG UBUNTU_VERSION=22.04 FROM ubuntu:${UBUNTU_VERSION} From 3b0a1d1af3eb2147306f1f84aa5161eb457e291f Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Tue, 18 Apr 2023 17:17:22 +0800 Subject: [PATCH 14/15] run test with docker --- .github/workflows/docker.yml | 42 ++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f30982a..cf3d2ee 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,12 +10,30 @@ on: paths-ignore: - "**.md" -env: - LATEST_TAG: flier/gohs:latest - jobs: docker: runs-on: ubuntu-latest + strategy: + matrix: + include: + - ubuntu_version: 22.04 + hyperscan_version: 5.4.1 + pcre_version: 8.45 + build_flags: -tags hyperscan_v54,chimera + - ubuntu_version: 20.04 + hyperscan_version: 5.2.1 + pcre_version: 8.45 + build_flags: -tags hyperscan_v52,chimera + - ubuntu_version: 20.04 + hyperscan_version: 5.1.1 + pcre_version: 8.45 + build_flags: -tags chimera + - ubuntu_version: 18.04 + hyperscan_version: 4.7.0 + pcre_version: 8.42 + build_flags: -tags hyperscan_v4 + env: + LATEST_TAG: flier/gohs:${{ matrix.hyperscan_version }} steps: - name: Checkout uses: actions/checkout@v3 @@ -30,20 +48,12 @@ jobs: uses: docker/build-push-action@v4 with: load: true + build-args: | + UBUNTU_VERSION=${{ matrix.ubuntu_version }} + HYPERSCAN_VERSION=${{ matrix.hyperscan_version }} + PCRE_VERSION=${{ matrix.pcre_version }} tags: ${{ env.LATEST_TAG }} - name: Test run: | - docker run --rm ${{ env.LATEST_TAG }} - - docker-test: - runs-on: ubuntu-latest - strategy: - matrix: - version: [hyperscan-5.4, hyperscan-5.2, hyperscan-4.7] - steps: - - uses: actions/checkout@v3 - - uses: isbang/compose-action@v1.4.1 - with: - compose-file: docker-compose.yml - services: ${{ matrix.version }} + docker run --rm ${{ env.LATEST_TAG }} test ${{ matrix.build_flags }} -v ./... From b7904636ce9bca232cfc1156536d899077a31a33 Mon Sep 17 00:00:00 2001 From: Flier Lu Date: Tue, 18 Apr 2023 17:31:33 +0800 Subject: [PATCH 15/15] use multi stage to build hyperscan --- .github/workflows/docker.yml | 6 ++++ Dockerfile | 60 ++++++++++++++++++++++++------------ 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cf3d2ee..d500dfc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -19,19 +19,24 @@ jobs: - ubuntu_version: 22.04 hyperscan_version: 5.4.1 pcre_version: 8.45 + go_version: 1.20.3 build_flags: -tags hyperscan_v54,chimera - ubuntu_version: 20.04 hyperscan_version: 5.2.1 pcre_version: 8.45 + go_version: 1.19.8 build_flags: -tags hyperscan_v52,chimera - ubuntu_version: 20.04 hyperscan_version: 5.1.1 pcre_version: 8.45 build_flags: -tags chimera + go_version: 1.18.10 - ubuntu_version: 18.04 hyperscan_version: 4.7.0 pcre_version: 8.42 + go_version: 1.18.10 build_flags: -tags hyperscan_v4 + name: tests @ ubuntu ${{ matrix.ubuntu_version }} for hyperscan ${{ matrix.hyperscan_version }} w/ ${{ matrix.build_flags }} env: LATEST_TAG: flier/gohs:${{ matrix.hyperscan_version }} steps: @@ -52,6 +57,7 @@ jobs: UBUNTU_VERSION=${{ matrix.ubuntu_version }} HYPERSCAN_VERSION=${{ matrix.hyperscan_version }} PCRE_VERSION=${{ matrix.pcre_version }} + GO_VERSION=${{ matrix.go_version }} tags: ${{ env.LATEST_TAG }} - name: Test diff --git a/Dockerfile b/Dockerfile index 833ba93..0a89ac7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,7 @@ ARG UBUNTU_VERSION=22.04 -FROM ubuntu:${UBUNTU_VERSION} - -ARG GO_VERSION=1.20.3 -ARG HYPERSCAN_VERSION=5.4.1 -ARG PCRE_VERSION=8.45 +FROM ubuntu:${UBUNTU_VERSION} as build # Install dependencies @@ -31,20 +27,10 @@ RUN <