fix(registry/mdns,registry/nats): tests

go-orb · Nov 12, 2024 · 6868cf9 · 6868cf9
1 parent a1ba265
commit 6868cf9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -189,7 +189,6 @@ linters:
     - wrapcheck
     - paralleltest
     - ireturn
-    - gomnd
     - err113
     - exhaustruct
     - containedctx
@@ -203,7 +202,6 @@ linters:
     # Not configured yet
     - depguard
 
-    - execinquery
     - copyloopvar # go 1.22
     - intrange # go 1.22
 
@@ -216,6 +214,8 @@ linters:
     # Doesn't work for us
     - contextcheck
 
+    # Atm. we need a replace
+    - gomoddirectives
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
   # But independently from this option we use default exclude patterns,

diff --git a/registry/mdns/go.mod b/registry/mdns/go.mod
@@ -5,9 +5,10 @@ go 1.23
 toolchain go1.23.0
 
 require (
-	github.com/go-orb/go-orb v0.0.0-20241110084057-e256fbfa128d
-	github.com/go-orb/plugins/log/slog v0.0.0-20241110092208-bd726ef6240d
-	github.com/go-orb/plugins/registry/tests v0.0.0-20241110092208-bd726ef6240d
+	github.com/go-orb/go-orb v0.0.0-20241110142713-1fb0b3d85692
+	github.com/go-orb/plugins/codecs/json v0.0.0-20241110155013-2a4529db0000
+	github.com/go-orb/plugins/log/slog v0.0.0-20241110155013-2a4529db0000
+	github.com/go-orb/plugins/registry/tests v0.0.0-20241110155013-2a4529db0000
 	github.com/google/uuid v1.6.0
 	github.com/miekg/dns v1.1.62
 	github.com/stretchr/testify v1.9.0

diff --git a/registry/mdns/go.sum b/registry/mdns/go.sum
@@ -2,14 +2,14 @@ github.com/cornelk/hashmap v1.0.8 h1:nv0AWgw02n+iDcawr5It4CjQIAcdMMKRrs10HOJYlrc
 github.com/cornelk/hashmap v1.0.8/go.mod h1:RfZb7JO3RviW/rT6emczVuC/oxpdz4UsSB2LJSclR1k=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 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-20241110084057-e256fbfa128d h1:z6KbQerINwOTr2Wki1Me0B5jZ7IwLizdjL7Klzn+g0M=
-github.com/go-orb/go-orb v0.0.0-20241110084057-e256fbfa128d/go.mod h1:IqEV2MC/Xasp/x0cHO+RcQUHjOdP5ObL5vht+KD0l6A=
-github.com/go-orb/plugins/codecs/json v0.0.0-20241110080420-c3dff95b18c2 h1:YWDn8flVIMDEEOiw9qSEFt3AhWq5kqlggu0toOUTI30=
-github.com/go-orb/plugins/codecs/json v0.0.0-20241110080420-c3dff95b18c2/go.mod h1:+qBsc0qO2WZYs1LNP6w7AKyeV0wSrrC3fHY0o75OkcE=
-github.com/go-orb/plugins/log/slog v0.0.0-20241110092208-bd726ef6240d h1:Q8GnDSST2tTCbgeR8GpZAGtsauq5AjGmlf/u6ZWd/7s=
-github.com/go-orb/plugins/log/slog v0.0.0-20241110092208-bd726ef6240d/go.mod h1:gsWuZaUSNRGOHte9L7ZcrT+sew9SQJhpX2Mv44MCT2U=
-github.com/go-orb/plugins/registry/tests v0.0.0-20241110092208-bd726ef6240d h1:hKYDTxMvDM4taVSQ+tfz/YAvWZl34Gjd5wd7tDXoUx0=
-github.com/go-orb/plugins/registry/tests v0.0.0-20241110092208-bd726ef6240d/go.mod h1:4lrz22GeZM2IDjjMMvqpt09Daf0SBJR4B2yOp+Q0wCk=
+github.com/go-orb/go-orb v0.0.0-20241110142713-1fb0b3d85692 h1:/vLe790T+8I4QPUWrcyqmOZsVaPOSMscQPQ5tu9BxHw=
+github.com/go-orb/go-orb v0.0.0-20241110142713-1fb0b3d85692/go.mod h1:IqEV2MC/Xasp/x0cHO+RcQUHjOdP5ObL5vht+KD0l6A=
+github.com/go-orb/plugins/codecs/json v0.0.0-20241110155013-2a4529db0000 h1:Qd7iHvZhIRJCyj90mFDMeBd2AO+T9d2hzNlZvW3dUKY=
+github.com/go-orb/plugins/codecs/json v0.0.0-20241110155013-2a4529db0000/go.mod h1:o+bzJZY3ble4Ns8d6S+D/egDXIBusf6nSTwpaB2wQ4E=
+github.com/go-orb/plugins/log/slog v0.0.0-20241110155013-2a4529db0000 h1:a8z0iWIzgHop1bfoV1/YufrI5HNozMtmj/oDLY6fQzA=
+github.com/go-orb/plugins/log/slog v0.0.0-20241110155013-2a4529db0000/go.mod h1:M2W1QZrWeADGhR7bWDqSaIHugVVOdEIYQJiBOEdYr9I=
+github.com/go-orb/plugins/registry/tests v0.0.0-20241110155013-2a4529db0000 h1:xQMcHvSPWs02R9zGyMwwKOQgMbwVQOlVXZxckUil2Ps=
+github.com/go-orb/plugins/registry/tests v0.0.0-20241110155013-2a4529db0000/go.mod h1:RxvP91YNF3ONQq8UDKkqaPL9ZTdJMpwNiliSchGrNxA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=

diff --git a/registry/mdns/mdns_test.go b/registry/mdns/mdns_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/go-orb/go-orb/registry"
 	"github.com/go-orb/go-orb/types"
 
+	_ "github.com/go-orb/plugins/codecs/json"
 	_ "github.com/go-orb/plugins/log/slog"
 	"github.com/go-orb/plugins/registry/tests"
 )

diff --git a/registry/nats/go.mod b/registry/nats/go.mod
@@ -5,9 +5,10 @@ go 1.23
 toolchain go1.23.0
 
 require (
-	github.com/go-orb/go-orb v0.0.0-20241110084057-e256fbfa128d
-	github.com/go-orb/plugins/log/slog v0.0.0-20241110092208-bd726ef6240d
-	github.com/go-orb/plugins/registry/tests v0.0.0-20241110092208-bd726ef6240d
+	github.com/go-orb/go-orb v0.0.0-20241110142713-1fb0b3d85692
+	github.com/go-orb/plugins/codecs/json v0.0.0-20241110155013-2a4529db0000
+	github.com/go-orb/plugins/log/slog v0.0.0-20241110155013-2a4529db0000
+	github.com/go-orb/plugins/registry/tests v0.0.0-20241110155013-2a4529db0000
 	github.com/google/uuid v1.6.0
 	github.com/nats-io/nats.go v1.37.0
 	github.com/stretchr/testify v1.9.0

diff --git a/registry/nats/go.sum b/registry/nats/go.sum
@@ -2,14 +2,14 @@ github.com/cornelk/hashmap v1.0.8 h1:nv0AWgw02n+iDcawr5It4CjQIAcdMMKRrs10HOJYlrc
 github.com/cornelk/hashmap v1.0.8/go.mod h1:RfZb7JO3RviW/rT6emczVuC/oxpdz4UsSB2LJSclR1k=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 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-20241110084057-e256fbfa128d h1:z6KbQerINwOTr2Wki1Me0B5jZ7IwLizdjL7Klzn+g0M=
-github.com/go-orb/go-orb v0.0.0-20241110084057-e256fbfa128d/go.mod h1:IqEV2MC/Xasp/x0cHO+RcQUHjOdP5ObL5vht+KD0l6A=
-github.com/go-orb/plugins/codecs/json v0.0.0-20241110080420-c3dff95b18c2 h1:YWDn8flVIMDEEOiw9qSEFt3AhWq5kqlggu0toOUTI30=
-github.com/go-orb/plugins/codecs/json v0.0.0-20241110080420-c3dff95b18c2/go.mod h1:+qBsc0qO2WZYs1LNP6w7AKyeV0wSrrC3fHY0o75OkcE=
-github.com/go-orb/plugins/log/slog v0.0.0-20241110092208-bd726ef6240d h1:Q8GnDSST2tTCbgeR8GpZAGtsauq5AjGmlf/u6ZWd/7s=
-github.com/go-orb/plugins/log/slog v0.0.0-20241110092208-bd726ef6240d/go.mod h1:gsWuZaUSNRGOHte9L7ZcrT+sew9SQJhpX2Mv44MCT2U=
-github.com/go-orb/plugins/registry/tests v0.0.0-20241110092208-bd726ef6240d h1:hKYDTxMvDM4taVSQ+tfz/YAvWZl34Gjd5wd7tDXoUx0=
-github.com/go-orb/plugins/registry/tests v0.0.0-20241110092208-bd726ef6240d/go.mod h1:4lrz22GeZM2IDjjMMvqpt09Daf0SBJR4B2yOp+Q0wCk=
+github.com/go-orb/go-orb v0.0.0-20241110142713-1fb0b3d85692 h1:/vLe790T+8I4QPUWrcyqmOZsVaPOSMscQPQ5tu9BxHw=
+github.com/go-orb/go-orb v0.0.0-20241110142713-1fb0b3d85692/go.mod h1:IqEV2MC/Xasp/x0cHO+RcQUHjOdP5ObL5vht+KD0l6A=
+github.com/go-orb/plugins/codecs/json v0.0.0-20241110155013-2a4529db0000 h1:Qd7iHvZhIRJCyj90mFDMeBd2AO+T9d2hzNlZvW3dUKY=
+github.com/go-orb/plugins/codecs/json v0.0.0-20241110155013-2a4529db0000/go.mod h1:o+bzJZY3ble4Ns8d6S+D/egDXIBusf6nSTwpaB2wQ4E=
+github.com/go-orb/plugins/log/slog v0.0.0-20241110155013-2a4529db0000 h1:a8z0iWIzgHop1bfoV1/YufrI5HNozMtmj/oDLY6fQzA=
+github.com/go-orb/plugins/log/slog v0.0.0-20241110155013-2a4529db0000/go.mod h1:M2W1QZrWeADGhR7bWDqSaIHugVVOdEIYQJiBOEdYr9I=
+github.com/go-orb/plugins/registry/tests v0.0.0-20241110155013-2a4529db0000 h1:xQMcHvSPWs02R9zGyMwwKOQgMbwVQOlVXZxckUil2Ps=
+github.com/go-orb/plugins/registry/tests v0.0.0-20241110155013-2a4529db0000/go.mod h1:RxvP91YNF3ONQq8UDKkqaPL9ZTdJMpwNiliSchGrNxA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=

diff --git a/registry/nats/nats_test.go b/registry/nats/nats_test.go
@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	_ "github.com/go-orb/plugins/codecs/json"
 	_ "github.com/go-orb/plugins/log/slog"
 	"github.com/go-orb/plugins/registry/tests"
 	"github.com/stretchr/testify/require"