From e5e3b5ef78292f13fae6ef51a58be48889cd84c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Wed, 12 Jul 2023 05:23:33 +0200 Subject: [PATCH] fix(all): move away from go.work, seems not to work as it should --- config/tests/go.mod | 20 ++++++++++++++------ config/tests/go.sum | 14 ++------------ registry/consul/go.mod | 13 +++++++++---- registry/consul/go.sum | 11 ----------- registry/mdns/go.mod | 12 ++++++++---- registry/mdns/go.sum | 11 ----------- registry/nats/go.mod | 12 ++++++++---- registry/nats/go.sum | 11 ----------- scripts/test.sh | 10 ---------- server/grpc/go.mod | 16 ++++++++++------ server/grpc/go.sum | 14 -------------- server/http/tests/http_test.go | 8 ++++---- server/tests/go.mod | 15 +++++++++------ server/tests/go.sum | 16 ++-------------- 14 files changed, 66 insertions(+), 117 deletions(-) diff --git a/config/tests/go.mod b/config/tests/go.mod index 25d2eebf..d6f5a6a1 100644 --- a/config/tests/go.mod +++ b/config/tests/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 - github.com/go-orb/plugins/codecs/json v0.0.0-20230711230520-aa8eefbacb19 - github.com/go-orb/plugins/codecs/yaml v0.0.0-20230711024933-9b5a59032ce3 - github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20230711230520-aa8eefbacb19 - github.com/go-orb/plugins/config/source/file v0.0.0-20230711024933-9b5a59032ce3 - github.com/go-orb/plugins/config/source/http v0.0.0-20230711024933-9b5a59032ce3 + github.com/go-orb/plugins/codecs/json v0.0.0 + github.com/go-orb/plugins/codecs/yaml v0.0.0 + github.com/go-orb/plugins/config/source/cli/urfave v0.0.0 + github.com/go-orb/plugins/config/source/file v0.0.0 + github.com/go-orb/plugins/config/source/http v0.0.0 github.com/stretchr/testify v1.8.4 ) @@ -23,6 +23,14 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/urfave/cli/v2 v2.25.7 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace ( + github.com/go-orb/plugins/codecs/json => ../../codecs/json + github.com/go-orb/plugins/codecs/yaml => ../../codecs/yaml + github.com/go-orb/plugins/config/source/cli/urfave => ../source/cli/urfave + github.com/go-orb/plugins/config/source/file => ../source/file + github.com/go-orb/plugins/config/source/http => ../source/http +) diff --git a/config/tests/go.sum b/config/tests/go.sum index a00ef8d7..3229f914 100644 --- a/config/tests/go.sum +++ b/config/tests/go.sum @@ -5,16 +5,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 h1:HCBsqZPFBGLy9m7qOak29YJKFCncyenaXkChMhwt264= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450/go.mod h1:fu/xA3W6+/gMUsZ7MSnklrTs9rHvzFSlaeMpuOBF0bY= -github.com/go-orb/plugins/codecs/json v0.0.0-20230711230520-aa8eefbacb19 h1:W38VKHZox4iFeUOLG93amDeHZzVDxmmAO9bx678L/Xs= -github.com/go-orb/plugins/codecs/json v0.0.0-20230711230520-aa8eefbacb19/go.mod h1:i4FixgqgMtAJbd0UaNGUBHM2xS8RHN3o7GjN7ynIBL4= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20230711024933-9b5a59032ce3 h1:13SBol0V3ffLRvTaDXcsrOMYD+RaA7eWFdmtpMgHG+A= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20230711024933-9b5a59032ce3/go.mod h1:hj1Cg35gs3FDMNeg+T/NG7XL1MZQCwT0bjvYTcVKfII= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20230711230520-aa8eefbacb19 h1:YGMvltYTNgoBEs7S9pSKfPZIJtnnsf0pAc+O9iyQBVI= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20230711230520-aa8eefbacb19/go.mod h1:dsd9cmFGAhz7w6PpWnLUHfXCGK4DqI8eU3nH+TtV2Q0= -github.com/go-orb/plugins/config/source/file v0.0.0-20230711024933-9b5a59032ce3 h1:S8MO4b4W5mz14Cdao3+aX2A2UYnf9xah3I4bgXzUScI= -github.com/go-orb/plugins/config/source/file v0.0.0-20230711024933-9b5a59032ce3/go.mod h1:clJp6iZTG0sQcCpUvHUSCXMXuM9XBOqBlHnpEwsXT/c= -github.com/go-orb/plugins/config/source/http v0.0.0-20230711024933-9b5a59032ce3 h1:A0BQ2kq4uXwnxMslcdfOZMRREQp8RSONE3rG9U9+YIc= -github.com/go-orb/plugins/config/source/http v0.0.0-20230711024933-9b5a59032ce3/go.mod h1:WpUXSEw/ZOlCbMukdfp3D52lWnj4L2Tz/xx1LzHlO2U= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -36,8 +26,8 @@ github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/registry/consul/go.mod b/registry/consul/go.mod index c94b8f75..dc3b5968 100644 --- a/registry/consul/go.mod +++ b/registry/consul/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 - github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18 - github.com/go-orb/plugins/registry/regutil v0.0.0-20230711230520-aa8eefbacb19 - github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18 + github.com/go-orb/plugins/log/text v0.0.0 + github.com/go-orb/plugins/registry/regutil v0.0.0 + github.com/go-orb/plugins/registry/tests v0.0.0 github.com/hashicorp/consul/api v1.22.0 github.com/hashicorp/consul/sdk v0.14.0 github.com/mitchellh/hashstructure v1.1.0 @@ -25,7 +25,6 @@ require ( github.com/hashicorp/go-version v1.2.1 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/serf v0.10.1 // indirect - github.com/kr/pretty v0.3.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/miekg/dns v1.1.55 // indirect @@ -38,3 +37,9 @@ require ( golang.org/x/sys v0.10.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace ( + github.com/go-orb/plugins/log/text => ../../log/text + github.com/go-orb/plugins/registry/regutil => ../regutil + github.com/go-orb/plugins/registry/tests => ../tests +) diff --git a/registry/consul/go.sum b/registry/consul/go.sum index dabe4355..82c0ddce 100644 --- a/registry/consul/go.sum +++ b/registry/consul/go.sum @@ -16,7 +16,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -32,12 +31,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 h1:HCBsqZPFBGLy9m7qOak29YJKFCncyenaXkChMhwt264= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450/go.mod h1:fu/xA3W6+/gMUsZ7MSnklrTs9rHvzFSlaeMpuOBF0bY= -github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18 h1:amUHAcSJkxKTcuiPGUeWxd/tizBzSJCSEjcxHaVmX5A= -github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18/go.mod h1:wuuiJzbdS9q7rkQ79X1sQGCE1UQcEy+Ow7p5Xh4jlu0= -github.com/go-orb/plugins/registry/regutil v0.0.0-20230711230520-aa8eefbacb19 h1:pktQ1kPwRDrsHwrLWzGr6LAovAqcj2CU41g3y54WJYE= -github.com/go-orb/plugins/registry/regutil v0.0.0-20230711230520-aa8eefbacb19/go.mod h1:k2M2KDSQ1y6uf/pykSyxRHshttjnNz0R9EHqzsl6RrE= -github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18 h1:3ym5UuTzgZ8v1DxCVsBx54LHum5MCkcizomQZ3CYU2g= -github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18/go.mod h1:xtqWrghif2xC5nA+jFZU9bsJDNh5sOyWmGn+gu0EvBo= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -96,11 +89,9 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -137,7 +128,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -158,7 +148,6 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= 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 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= diff --git a/registry/mdns/go.mod b/registry/mdns/go.mod index d0744e22..5070dfe6 100644 --- a/registry/mdns/go.mod +++ b/registry/mdns/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 - github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18 - github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18 + github.com/go-orb/plugins/log/text v0.0.0 + github.com/go-orb/plugins/registry/tests v0.0.0 github.com/google/uuid v1.3.0 github.com/miekg/dns v1.1.55 github.com/stretchr/testify v1.8.4 @@ -14,12 +14,16 @@ require ( require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/sys v0.10.0 // indirect golang.org/x/tools v0.11.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace ( + github.com/go-orb/plugins/log/text => ../../log/text + github.com/go-orb/plugins/registry/tests => ../tests +) diff --git a/registry/mdns/go.sum b/registry/mdns/go.sum index 7de8e2f2..ed1f0d85 100644 --- a/registry/mdns/go.sum +++ b/registry/mdns/go.sum @@ -3,25 +3,15 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 h1:HCBsqZPFBGLy9m7qOak29YJKFCncyenaXkChMhwt264= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450/go.mod h1:fu/xA3W6+/gMUsZ7MSnklrTs9rHvzFSlaeMpuOBF0bY= -github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18 h1:amUHAcSJkxKTcuiPGUeWxd/tizBzSJCSEjcxHaVmX5A= -github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18/go.mod h1:wuuiJzbdS9q7rkQ79X1sQGCE1UQcEy+Ow7p5Xh4jlu0= -github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18 h1:3ym5UuTzgZ8v1DxCVsBx54LHum5MCkcizomQZ3CYU2g= -github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18/go.mod h1:xtqWrghif2xC5nA+jFZU9bsJDNh5sOyWmGn+gu0EvBo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -38,6 +28,5 @@ golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/registry/nats/go.mod b/registry/nats/go.mod index 911e2396..6e2803a7 100644 --- a/registry/nats/go.mod +++ b/registry/nats/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 - github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18 - github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18 + github.com/go-orb/plugins/log/text v0.0.0 + github.com/go-orb/plugins/registry/tests v0.0.0 github.com/nats-io/nats-server/v2 v2.9.19 github.com/nats-io/nats.go v1.27.1 golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb @@ -15,7 +15,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/klauspost/compress v1.16.7 // indirect - github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/nats-io/jwt/v2 v2.4.1 // indirect github.com/nats-io/nkeys v0.4.4 // indirect @@ -26,6 +26,10 @@ require ( golang.org/x/sys v0.10.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace ( + github.com/go-orb/plugins/log/text => ../../log/text + github.com/go-orb/plugins/registry/tests => ../tests +) diff --git a/registry/nats/go.sum b/registry/nats/go.sum index 59070076..2984c2cd 100644 --- a/registry/nats/go.sum +++ b/registry/nats/go.sum @@ -3,21 +3,13 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 h1:HCBsqZPFBGLy9m7qOak29YJKFCncyenaXkChMhwt264= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450/go.mod h1:fu/xA3W6+/gMUsZ7MSnklrTs9rHvzFSlaeMpuOBF0bY= -github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18 h1:amUHAcSJkxKTcuiPGUeWxd/tizBzSJCSEjcxHaVmX5A= -github.com/go-orb/plugins/log/text v0.0.0-20230709063950-8342f9783f18/go.mod h1:wuuiJzbdS9q7rkQ79X1sQGCE1UQcEy+Ow7p5Xh4jlu0= -github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18 h1:3ym5UuTzgZ8v1DxCVsBx54LHum5MCkcizomQZ3CYU2g= -github.com/go-orb/plugins/registry/tests v0.0.0-20230709063950-8342f9783f18/go.mod h1:xtqWrghif2xC5nA+jFZU9bsJDNh5sOyWmGn+gu0EvBo= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= @@ -32,10 +24,8 @@ github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA= github.com/nats-io/nkeys v0.4.4/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -55,6 +45,5 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/scripts/test.sh b/scripts/test.sh index ddea25b9..73e1fe9a 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -198,16 +198,6 @@ function create_summary() { fi } -if [[ ! -d ../go-orb ]]; then - git clone https://github.com/go-orb/go-orb ../go-orb - pushd .. >/dev/null - go mod init testci.com/test - go work init . - go work use $(find . -name 'go.mod' -printf "%h\n") || true - go work sync - popd >/dev/null -fi - case $1 in "lint") dirs=($(get_dirs "${2}")) diff --git a/server/grpc/go.mod b/server/grpc/go.mod index 02b18d82..809a8e85 100644 --- a/server/grpc/go.mod +++ b/server/grpc/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 - github.com/go-orb/plugins/codecs/yaml v0.0.0-20230709081439-ab0ce6463c52 - github.com/go-orb/plugins/config/source/file v0.0.0-20230709081439-ab0ce6463c52 - github.com/go-orb/plugins/log/text v0.0.0-20230709081439-ab0ce6463c52 + github.com/go-orb/plugins/codecs/yaml v0.0.0 + github.com/go-orb/plugins/config/source/file v0.0.0 + github.com/go-orb/plugins/log/text v0.0.0 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.8.4 golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb @@ -19,14 +19,18 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sanity-io/litter v1.5.5 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sys v0.10.0 // indirect golang.org/x/text v0.11.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace ( + github.com/go-orb/plugins/codecs/yaml => ../../codecs/yaml + github.com/go-orb/plugins/config/source/file => ../../config/source/file + github.com/go-orb/plugins/log/text => ../../log/text +) diff --git a/server/grpc/go.sum b/server/grpc/go.sum index 14f545a5..b2641cfc 100644 --- a/server/grpc/go.sum +++ b/server/grpc/go.sum @@ -4,12 +4,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 h1:HCBsqZPFBGLy9m7qOak29YJKFCncyenaXkChMhwt264= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450/go.mod h1:fu/xA3W6+/gMUsZ7MSnklrTs9rHvzFSlaeMpuOBF0bY= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20230709081439-ab0ce6463c52 h1:M6d1p4jlkQIQzasDGwfU71G5W/+ePz/+tHgs1RbmKhU= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20230709081439-ab0ce6463c52/go.mod h1:D2Pp40YB9cGub/QxIzv/VEzkVnqQMslXVSzVb5DrRrY= -github.com/go-orb/plugins/config/source/file v0.0.0-20230709081439-ab0ce6463c52 h1:aCG6JJ79sCycVqQwQDwGj6lXzb8WmZbjSbLQpo7SmHg= -github.com/go-orb/plugins/config/source/file v0.0.0-20230709081439-ab0ce6463c52/go.mod h1:jv5z3YGPtTTtXVle0QzMto1IIvpsyQfFAk1kCjVIiLQ= -github.com/go-orb/plugins/log/text v0.0.0-20230709081439-ab0ce6463c52 h1:JWY1q3+tRUY++nH5FgzNIIhQwghEMihJeqTjZvSRPWM= -github.com/go-orb/plugins/log/text v0.0.0-20230709081439-ab0ce6463c52/go.mod h1:cpCiTAme/A6NTeBTIKN+IQD27EAr9+rbkokTCy+xZlQ= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -22,20 +16,13 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo= github.com/sanity-io/litter v1.5.5/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U= github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -60,6 +47,5 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/server/http/tests/http_test.go b/server/http/tests/http_test.go index 4b97ece6..eb3ce396 100644 --- a/server/http/tests/http_test.go +++ b/server/http/tests/http_test.go @@ -127,14 +127,14 @@ func TestServerHTTP3Twice(t *testing.T) { time.Sleep(time.Second) // Second run to check if setup/cleanup works - srv, cleanup, err = setupServer(t, false, + _, cleanup, err = setupServer(t, false, mhttp.WithHTTP3(), ) if err != nil { require.NoError(t, err) } - addr = fmt.Sprintf("https://%s", srv.Address()) + addr = "https://localhost:42069" makeRequests(t, addr, thttp.TypeHTTP3) cleanup() } @@ -154,8 +154,6 @@ func TestServerEntrypointsStarts(t *testing.T) { addr = fmt.Sprintf("https://%s", addr) makeRequests(t, addr, thttp.TypeHTTP2) - - cleanup() } func TestServerGzip(t *testing.T) { @@ -393,6 +391,8 @@ func TestServerIntegration(t *testing.T) { } func TestServerFileConfig(t *testing.T) { + thttp.RefreshClients() + server.Handlers.Register("handler-1", func(_ any) {}) server.Handlers.Register("handler-2", func(_ any) {}) router.Middleware.Register("middleware-1", func(h http.Handler) http.Handler { return h }) diff --git a/server/tests/go.mod b/server/tests/go.mod index 1eb3f4d0..635624fc 100644 --- a/server/tests/go.mod +++ b/server/tests/go.mod @@ -4,20 +4,23 @@ go 1.20 require ( github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 - github.com/go-orb/plugins/codecs/yaml v0.0.0-20230709081439-ab0ce6463c52 - github.com/go-orb/plugins/config/source/file v0.0.0-20230709081439-ab0ce6463c52 + github.com/go-orb/plugins/codecs/yaml v0.0.0 + github.com/go-orb/plugins/config/source/file v0.0.0 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.8.4 - golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb ) require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace ( + github.com/go-orb/plugins/codecs/yaml => ../../codecs/yaml + github.com/go-orb/plugins/config/source/file => ../../config/source/file +) diff --git a/server/tests/go.sum b/server/tests/go.sum index 036e24ed..4d0f2574 100644 --- a/server/tests/go.sum +++ b/server/tests/go.sum @@ -3,10 +3,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450 h1:HCBsqZPFBGLy9m7qOak29YJKFCncyenaXkChMhwt264= github.com/go-orb/go-orb v0.0.0-20230709084536-48ca79fd6450/go.mod h1:fu/xA3W6+/gMUsZ7MSnklrTs9rHvzFSlaeMpuOBF0bY= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20230709081439-ab0ce6463c52 h1:M6d1p4jlkQIQzasDGwfU71G5W/+ePz/+tHgs1RbmKhU= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20230709081439-ab0ce6463c52/go.mod h1:D2Pp40YB9cGub/QxIzv/VEzkVnqQMslXVSzVb5DrRrY= -github.com/go-orb/plugins/config/source/file v0.0.0-20230709081439-ab0ce6463c52 h1:aCG6JJ79sCycVqQwQDwGj6lXzb8WmZbjSbLQpo7SmHg= -github.com/go-orb/plugins/config/source/file v0.0.0-20230709081439-ab0ce6463c52/go.mod h1:jv5z3YGPtTTtXVle0QzMto1IIvpsyQfFAk1kCjVIiLQ= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -14,25 +10,17 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=