fix: fixes after merge

codecs/jsonpb/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/go-orb/go-orb v0.0.1
-	github.com/go-orb/plugins/codecs/proto v0.0.0-00010101000000-000000000000
+	github.com/go-orb/plugins/codecs/proto v0.0.0
 	github.com/google/go-cmp v0.5.9
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
 	google.golang.org/protobuf v1.31.0

config/tests/go.mod

@@ -4,9 +4,9 @@ go 1.18
 
 require (
 	github.com/go-orb/go-orb v0.0.1 
-	github.com/go-orb/plugins/config/source/cli/urfave v0.0.1
-	github.com/go-orb/plugins/config/source/file v0.0.1
-	github.com/go-orb/plugins/config/source/http v0.0.1
+	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.0
 )
 

go.work

@@ -10,14 +10,14 @@ use (
 	./config/source/cli/urfave
 	./config/source/file
 	./config/source/http
+	./config/tests
 	./log/json
 	./log/text
 	./registry/consul
 	./registry/mdns
 	./registry/nats
-	./server/grpc
 	./registry/regutil
 	./registry/tests
 	./server/grpc
 	./server/http
-)
+)

registry/consul/config.go

@@ -7,36 +7,20 @@ import (
 
 	consul "github.com/hashicorp/consul/api"
 
-<<<<<<< Updated upstream
-	"go-micro.dev/v5/config"
-	"go-micro.dev/v5/config/source/cli"
-	"go-micro.dev/v5/registry"
-	"go-micro.dev/v5/types"
-)
-
-// metaSchemeKey is the key to use to store the scheme in metadata.
-const metaSchemeKey = "_md_scheme_"
-
-=======
 	"github.com/go-orb/go-orb/config"
 	"github.com/go-orb/go-orb/config/source/cli"
 	"github.com/go-orb/go-orb/registry"
 	"github.com/go-orb/go-orb/types"
 )
 
->>>>>>> Stashed changes
 // Name provides the name of this registry.
 const Name = "consul"
 
 // Defaults.
 //
 //nolint:gochecknoglobals
 var (
-<<<<<<< Updated upstream
 	DefaultAddresses  = []string{"localhost:8500"}
-=======
-	DefaultAddresses  = []string{"localhost:8300"}
->>>>>>> Stashed changes
 	DefaultAllowStale = true
 )
 
@@ -98,11 +82,7 @@ func (c *Config) ApplyOptions(opts ...registry.Option) {
 	}
 }
 
-<<<<<<< Updated upstream
 // WithAddress sets the Consul server addresses.
-=======
-// WithAddress sets the NATS server addresses.
->>>>>>> Stashed changes
 func WithAddress(n ...string) registry.Option {
 	return func(c registry.ConfigType) {
 		cfg, ok := c.(*Config)
@@ -114,11 +94,7 @@ func WithAddress(n ...string) registry.Option {
 	}
 }
 
-<<<<<<< Updated upstream
 // WithSecure defines if we want a secure connection to Consul.
-=======
-// WithSecure defines if we want a secure connection to nats.
->>>>>>> Stashed changes
 func WithSecure(n bool) registry.Option {
 	return func(c registry.ConfigType) {
 		cfg, ok := c.(*Config)

registry/consul/consul.go

@@ -16,10 +16,10 @@ import (
 	consul "github.com/hashicorp/consul/api"
 	hash "github.com/mitchellh/hashstructure"
 <<<<<<< Updated upstream
-	"go-micro.dev/v5/log"
-	"go-micro.dev/v5/registry"
-	"go-micro.dev/v5/types"
-	mnet "go-micro.dev/v5/util/net"
+	"github.com/go-orb/go-orb/log"
+	"github.com/go-orb/go-orb/registry"
+	"github.com/go-orb/go-orb/types"
+	mnet "github.com/go-orb/go-orb/util/net"
 =======
 	"github.com/go-orb/go-orb/log"
 	"github.com/go-orb/go-orb/registry"

registry/consul/consul_test.go

@@ -7,12 +7,12 @@ import (
 	"testing"
 
 	"github.com/hashicorp/consul/sdk/testutil"
-	"go-micro.dev/v5/log"
-	"go-micro.dev/v5/registry"
-	"go-micro.dev/v5/types"
+	"github.com/go-orb/go-orb/log"
+	"github.com/go-orb/go-orb/registry"
+	"github.com/go-orb/go-orb/types"
 
-	_ "github.com/go-micro/plugins/log/text"
-	"github.com/go-micro/plugins/registry/tests"
+	_ "github.com/go-orb/plugins/log/text"
+	"github.com/go-orb/plugins/registry/tests"
 )
 
 func TestMain(m *testing.M) {

registry/consul/encoding.go

@@ -8,7 +8,7 @@ import (
 	"io"
 
 <<<<<<< Updated upstream
-	"go-micro.dev/v5/registry"
+	"github.com/go-orb/go-orb/registry"
 =======
 	"github.com/go-orb/go-orb/registry"
 >>>>>>> Stashed changes

registry/consul/encoding_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 <<<<<<< Updated upstream
-	"go-micro.dev/v5/registry"
+	"github.com/go-orb/go-orb/registry"
 =======
 	"github.com/go-orb/go-orb/registry"
 >>>>>>> Stashed changes

registry/consul/go.mod

@@ -1,19 +1,12 @@
-<<<<<<< Updated upstream
-module github.com/go-micro/plugins/registry/consul
-=======
 module github.com/go-orb/plugins/registry/consul
->>>>>>> Stashed changes
 
 go 1.19
 
 require (
 	github.com/hashicorp/consul/api v1.9.0
 	github.com/mitchellh/hashstructure v1.1.0
-<<<<<<< Updated upstream
-	go-micro.dev/v5 v5.0.0-00010101000000-000000000000
-=======
+	github.com/go-orb/go-orb v0.0.1
 	github.com/go-orb/go-orb v0.0.1 
->>>>>>> Stashed changes
 )
 
 require (

registry/consul/watcher.go

@@ -6,10 +6,10 @@ import (
 	"sync"
 
 <<<<<<< Updated upstream
-	"github.com/go-micro/plugins/registry/regutil"
+	"github.com/go-orb/plugins/registry/regutil"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/api/watch"
-	"go-micro.dev/v5/registry"
+	"github.com/go-orb/go-orb/registry"
 =======
 	"github.com/go-orb/go-orb/registry"
 	"github.com/go-orb/plugins/registry/regutil"

registry/consul/watcher_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/consul/api"
 <<<<<<< Updated upstream
-	"go-micro.dev/v5/registry"
+	"github.com/go-orb/go-orb/registry"
 =======
 	"github.com/go-orb/go-orb/registry"
 >>>>>>> Stashed changes

registry/mdns/go.mod

@@ -3,7 +3,7 @@ module github.com/go-orb/plugins/registry/mdns
 go 1.20
 
 require (
-	github.com/go-orb/plugins/log/text v0.0.0-00010101000000-000000000000
+	github.com/go-orb/plugins/log/text v0.0.0
 	github.com/google/uuid v1.3.0
 	github.com/miekg/dns v1.1.50
 	github.com/stretchr/testify v1.8.3

registry/mdns/mdns_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/go-orb/go-orb/types"
 
 	_ "github.com/go-orb/plugins/log/text"
+	"github.com/go-orb/plugins/registry/tests"
 )
 
 var (

registry/nats/go.mod

@@ -3,28 +3,19 @@ module github.com/go-orb/plugins/registry/nats
 go 1.20
 
 require (
-<<<<<<< Updated upstream
-	github.com/nats-io/nats.go v1.19.0
-	go-micro.dev/v5 v5.0.0-00010101000000-000000000000
-=======
 	github.com/go-orb/go-orb v0.0.1
-	github.com/go-orb/plugins/log/text v0.0.0-00010101000000-000000000000
-	github.com/nats-io/nats-server/v2 v2.9.7
 	github.com/nats-io/nats.go v1.27.1
-	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
->>>>>>> Stashed changes
 )
 
 require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
-	github.com/minio/highwayhash v1.0.2 // indirect
-	github.com/nats-io/jwt/v2 v2.3.0 // indirect
+	github.com/nats-io/nats-server/v2 v2.9.7 // indirect
 	github.com/nats-io/nkeys v0.4.4 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	golang.org/x/crypto v0.11.0 // indirect
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
 	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )
 

registry/nats/go.sum

@@ -8,35 +8,24 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
 github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
-github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=
-github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k=
 github.com/nats-io/nats-server/v2 v2.9.7 h1:VBlfq7xvv/72v0mzGZ2rgsDzUoVyX2Xhssl9XpKDue0=
 github.com/nats-io/nats-server/v2 v2.9.7/go.mod h1:AB6hAnGZDlYfqb7CTAm66ZKMZy9DpfierY1/PbpvI2g=
 github.com/nats-io/nats.go v1.27.1 h1:OuYnal9aKVSnOzLQIzf7554OXMCG7KbaTkCSBHRcSoo=
 github.com/nats-io/nats.go v1.27.1/go.mod h1:XpbWUlOElGwTYbMR7imivs7jJj9GtK7ypv321Wp6pjc=
-github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 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/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=

registry/regutil/go.mod

@@ -1,7 +1,3 @@
 module github.com/go-orb/plugins/registry/regutil
 
 go 1.20
-
-require github.com/go-orb/go-orb v0.0.1
-
-require golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect

registry/regutil/go.sum

@@ -1,8 +0,0 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/go-orb/go-orb v0.0.1 h1:eUwQ1QvXOgGbq1jMBTpGoYcZuhmbwW8o8TWACiX5gRA=
-github.com/go-orb/go-orb v0.0.1/go.mod h1:4SGQcv8YgWKezsbEwhkENiRkiqKjueSxsRJyaCP37vY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

registry/regutil/util.go

@@ -3,7 +3,7 @@ package regutil
 
 import (
 <<<<<<< Updated upstream
-	"go-micro.dev/v5/registry"
+	"github.com/go-orb/go-orb/registry"
 =======
 	"github.com/go-orb/go-orb/registry"
 >>>>>>> Stashed changes

registry/regutil/util_test.go

@@ -4,11 +4,7 @@ import (
 	"os"
 	"testing"
 
-<<<<<<< Updated upstream
-	"go-micro.dev/v5/registry"
-=======
 	"github.com/go-orb/go-orb/registry"
->>>>>>> Stashed changes
 )
 
 func TestRemove(t *testing.T) {

registry/tests/go.mod

@@ -1,8 +1,17 @@
-module github.com/go-micro/plugins/registry/tests
+module github.com/go-orb/plugins/registry/tests
 
-go 1.19
+go 1.20
 
 require (
-	go-micro.dev/v5 v5.0.0-00010101000000-000000000000
-	github.com/stretchr/testify v1.8.0
+	github.com/go-orb/go-orb v0.0.1
+	github.com/stretchr/testify v1.8.3
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

registry/tests/go.sum

@@ -0,0 +1,20 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-orb/go-orb v0.0.1 h1:eUwQ1QvXOgGbq1jMBTpGoYcZuhmbwW8o8TWACiX5gRA=
+github.com/go-orb/go-orb v0.0.1/go.mod h1:4SGQcv8YgWKezsbEwhkENiRkiqKjueSxsRJyaCP37vY=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+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.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/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=
+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=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

registry/tests/tests.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"go-micro.dev/v5/log"
-	"go-micro.dev/v5/registry"
+	"github.com/go-orb/go-orb/log"
+	"github.com/go-orb/go-orb/registry"
 	"golang.org/x/exp/slog"
 )
 

scripts/test.sh

@@ -139,7 +139,7 @@ function run_linter() {
 	if [[ $failed == "true" ]]; then
 		add_summary "## Autofix Linting Issues"
 		add_summary "The linter can sometimes autofix some of the issues, if it is supported."
-		add_summary "\`\`\`bash\ncd <your plugin>\ngolangci-lint run -c <go-micro/plugins dir>/.golangci.yaml --fix\n\`\`\`"
+		add_summary "\`\`\`bash\ncd <your plugin>\ngolangci-lint run -c <go-orb/plugins dir>/.golangci.yaml --fix\n\`\`\`"
 		print_red "Linter failed"
 		exit 1
 	else

server/grpc/config.go

@@ -11,9 +11,9 @@ import (
 	"google.golang.org/grpc"
 
 <<<<<<< HEAD
-	"go-micro.dev/v5/server"
-	"go-micro.dev/v5/util/matcher"
-	mtls "go-micro.dev/v5/util/tls"
+	"github.com/go-orb/go-orb/server"
+	"github.com/go-orb/go-orb/util/matcher"
+	mtls "github.com/go-orb/go-orb/util/tls"
 =======
 	"github.com/go-orb/go-orb/server"
 	"github.com/go-orb/go-orb/util/matcher"