diff --git a/README.md b/README.md index 188cba63..a4383839 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ are pluggable and allows Go Micro to be runtime agnostic. You can plugin any und To make use of Go Micro ```golang -import "github.com/asim/go-micro/v3" +import "go-micro.dev/v4" // create a new service service := micro.NewService( diff --git a/api/api.go b/api/api.go index 5ce9b89a..cb2f377e 100644 --- a/api/api.go +++ b/api/api.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) type Api interface { diff --git a/api/handler/api/api.go b/api/handler/api/api.go index 38567f82..c69ea587 100644 --- a/api/handler/api/api.go +++ b/api/handler/api/api.go @@ -4,13 +4,13 @@ package api import ( "net/http" - goapi "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/api/handler" - api "github.com/asim/go-micro/v3/api/proto" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/util/ctx" + goapi "go-micro.dev/v4/api" + "go-micro.dev/v4/api/handler" + api "go-micro.dev/v4/api/proto" + "go-micro.dev/v4/client" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/util/ctx" ) type apiHandler struct { diff --git a/api/handler/api/util.go b/api/handler/api/util.go index af18dccc..586b7609 100644 --- a/api/handler/api/util.go +++ b/api/handler/api/util.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - api "github.com/asim/go-micro/v3/api/proto" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + api "go-micro.dev/v4/api/proto" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" "github.com/oxtoacart/bpool" ) diff --git a/api/handler/event/event.go b/api/handler/event/event.go index d7403735..5846fdb3 100644 --- a/api/handler/event/event.go +++ b/api/handler/event/event.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/api/handler" - proto "github.com/asim/go-micro/v3/api/proto" - "github.com/asim/go-micro/v3/util/ctx" + "go-micro.dev/v4/api/handler" + proto "go-micro.dev/v4/api/proto" + "go-micro.dev/v4/util/ctx" "github.com/google/uuid" "github.com/oxtoacart/bpool" ) diff --git a/api/handler/http/http.go b/api/handler/http/http.go index 3e721b4f..029bff2d 100644 --- a/api/handler/http/http.go +++ b/api/handler/http/http.go @@ -8,9 +8,9 @@ import ( "net/http/httputil" "net/url" - "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/api/handler" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/api" + "go-micro.dev/v4/api/handler" + "go-micro.dev/v4/selector" ) const ( diff --git a/api/handler/http/http_test.go b/api/handler/http/http_test.go index 4a88957f..8c44983e 100644 --- a/api/handler/http/http_test.go +++ b/api/handler/http/http_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "testing" - "github.com/asim/go-micro/v3/api/handler" - "github.com/asim/go-micro/v3/api/resolver" - "github.com/asim/go-micro/v3/api/resolver/vpath" - "github.com/asim/go-micro/v3/api/router" - regRouter "github.com/asim/go-micro/v3/api/router/registry" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/api/handler" + "go-micro.dev/v4/api/resolver" + "go-micro.dev/v4/api/resolver/vpath" + "go-micro.dev/v4/api/router" + regRouter "go-micro.dev/v4/api/router/registry" + "go-micro.dev/v4/registry" ) func testHttp(t *testing.T, path, service, ns string) { diff --git a/api/handler/options.go b/api/handler/options.go index 4ccd6bbc..ca4038b1 100644 --- a/api/handler/options.go +++ b/api/handler/options.go @@ -1,8 +1,8 @@ package handler import ( - "github.com/asim/go-micro/v3/api/router" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/api/router" + "go-micro.dev/v4/client" ) var ( diff --git a/api/handler/rpc/rpc.go b/api/handler/rpc/rpc.go index d25d6374..a24c5a67 100644 --- a/api/handler/rpc/rpc.go +++ b/api/handler/rpc/rpc.go @@ -9,20 +9,20 @@ import ( "strconv" "strings" - "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/api/handler" - "github.com/asim/go-micro/v3/api/internal/proto" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/jsonrpc" - "github.com/asim/go-micro/v3/codec/protorpc" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/util/ctx" - "github.com/asim/go-micro/v3/util/qson" + "go-micro.dev/v4/api" + "go-micro.dev/v4/api/handler" + "go-micro.dev/v4/api/internal/proto" + "go-micro.dev/v4/client" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/jsonrpc" + "go-micro.dev/v4/codec/protorpc" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/util/ctx" + "go-micro.dev/v4/util/qson" jsonpatch "github.com/evanphx/json-patch/v5" "github.com/oxtoacart/bpool" ) diff --git a/api/handler/rpc/rpc_test.go b/api/handler/rpc/rpc_test.go index e94d2865..e49345b2 100644 --- a/api/handler/rpc/rpc_test.go +++ b/api/handler/rpc/rpc_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - go_api "github.com/asim/go-micro/v3/api/proto" + go_api "go-micro.dev/v4/api/proto" "github.com/golang/protobuf/proto" ) diff --git a/api/handler/rpc/stream.go b/api/handler/rpc/stream.go index 157f36ab..36c1a9eb 100644 --- a/api/handler/rpc/stream.go +++ b/api/handler/rpc/stream.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/client" - raw "github.com/asim/go-micro/v3/codec/bytes" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/api" + "go-micro.dev/v4/client" + raw "go-micro.dev/v4/codec/bytes" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/selector" "github.com/gobwas/httphead" "github.com/gobwas/ws" "github.com/gobwas/ws/wsutil" diff --git a/api/handler/web/web.go b/api/handler/web/web.go index eb03a0dc..85c831b9 100644 --- a/api/handler/web/web.go +++ b/api/handler/web/web.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/api/handler" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/api" + "go-micro.dev/v4/api/handler" + "go-micro.dev/v4/selector" ) const ( diff --git a/api/resolver/grpc/grpc.go b/api/resolver/grpc/grpc.go index 80fdcb58..5d1d9d94 100644 --- a/api/resolver/grpc/grpc.go +++ b/api/resolver/grpc/grpc.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/asim/go-micro/v3/api/resolver" + "go-micro.dev/v4/api/resolver" ) type Resolver struct{} diff --git a/api/resolver/host/host.go b/api/resolver/host/host.go index c2ebd96f..81091813 100644 --- a/api/resolver/host/host.go +++ b/api/resolver/host/host.go @@ -4,7 +4,7 @@ package host import ( "net/http" - "github.com/asim/go-micro/v3/api/resolver" + "go-micro.dev/v4/api/resolver" ) type Resolver struct { diff --git a/api/resolver/path/path.go b/api/resolver/path/path.go index 17c8c8c4..3fbdfac3 100644 --- a/api/resolver/path/path.go +++ b/api/resolver/path/path.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/asim/go-micro/v3/api/resolver" + "go-micro.dev/v4/api/resolver" ) type Resolver struct { diff --git a/api/resolver/vpath/vpath.go b/api/resolver/vpath/vpath.go index 4b18d20c..940e7e48 100644 --- a/api/resolver/vpath/vpath.go +++ b/api/resolver/vpath/vpath.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/asim/go-micro/v3/api/resolver" + "go-micro.dev/v4/api/resolver" ) func NewResolver(opts ...resolver.Option) resolver.Resolver { diff --git a/api/router/options.go b/api/router/options.go index f9915c24..dbdd6334 100644 --- a/api/router/options.go +++ b/api/router/options.go @@ -1,9 +1,9 @@ package router import ( - "github.com/asim/go-micro/v3/api/resolver" - "github.com/asim/go-micro/v3/api/resolver/vpath" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/api/resolver" + "go-micro.dev/v4/api/resolver/vpath" + "go-micro.dev/v4/registry" ) type Options struct { diff --git a/api/router/registry/registry.go b/api/router/registry/registry.go index f157fb6f..d757c228 100644 --- a/api/router/registry/registry.go +++ b/api/router/registry/registry.go @@ -10,13 +10,13 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/api/router" - "github.com/asim/go-micro/v3/api/router/util" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/registry/cache" + "go-micro.dev/v4/api" + "go-micro.dev/v4/api/router" + "go-micro.dev/v4/api/router/util" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/registry/cache" ) // endpoint struct, that holds compiled pcre diff --git a/api/router/registry/registry_test.go b/api/router/registry/registry_test.go index 8221b83a..f49f483a 100644 --- a/api/router/registry/registry_test.go +++ b/api/router/registry/registry_test.go @@ -3,7 +3,7 @@ package registry import ( "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/stretchr/testify/assert" ) diff --git a/api/router/router.go b/api/router/router.go index 10d9c7c1..7c11b38d 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -4,7 +4,7 @@ package router import ( "net/http" - "github.com/asim/go-micro/v3/api" + "go-micro.dev/v4/api" ) // Router is used to determine an endpoint for a request diff --git a/api/router/static/static.go b/api/router/static/static.go index bc640bf9..bf02d8f6 100644 --- a/api/router/static/static.go +++ b/api/router/static/static.go @@ -8,13 +8,13 @@ import ( "strings" "sync" - "github.com/asim/go-micro/v3/api" - "github.com/asim/go-micro/v3/api/router" - "github.com/asim/go-micro/v3/api/router/util" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - rutil "github.com/asim/go-micro/v3/util/registry" + "go-micro.dev/v4/api" + "go-micro.dev/v4/api/router" + "go-micro.dev/v4/api/router/util" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + rutil "go-micro.dev/v4/util/registry" ) type endpoint struct { diff --git a/api/router/util/parse.go b/api/router/util/parse.go index 07598f68..43f82d54 100644 --- a/api/router/util/parse.go +++ b/api/router/util/parse.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) // InvalidTemplateError indicates that the path template is not valid. diff --git a/api/router/util/parse_test.go b/api/router/util/parse_test.go index 7e74ccf3..884651a3 100644 --- a/api/router/util/parse_test.go +++ b/api/router/util/parse_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) func TestTokenize(t *testing.T) { diff --git a/api/router/util/runtime.go b/api/router/util/runtime.go index d36a77ac..d1700d86 100644 --- a/api/router/util/runtime.go +++ b/api/router/util/runtime.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) var ( diff --git a/api/server/acme/autocert/autocert.go b/api/server/acme/autocert/autocert.go index 8bfe4356..91adc4c5 100644 --- a/api/server/acme/autocert/autocert.go +++ b/api/server/acme/autocert/autocert.go @@ -7,8 +7,8 @@ import ( "net" "os" - "github.com/asim/go-micro/v3/api/server/acme" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/api/server/acme" + "go-micro.dev/v4/logger" "golang.org/x/crypto/acme/autocert" ) diff --git a/api/server/http/http.go b/api/server/http/http.go index b37fbd1e..c025b19f 100644 --- a/api/server/http/http.go +++ b/api/server/http/http.go @@ -8,9 +8,9 @@ import ( "os" "sync" - "github.com/asim/go-micro/v3/api/server" - "github.com/asim/go-micro/v3/api/server/cors" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/api/server" + "go-micro.dev/v4/api/server/cors" + "go-micro.dev/v4/logger" "github.com/gorilla/handlers" ) diff --git a/api/server/http/http_test.go b/api/server/http/http_test.go index 3eb9b387..832211ab 100644 --- a/api/server/http/http_test.go +++ b/api/server/http/http_test.go @@ -2,8 +2,8 @@ package http import ( "fmt" - "github.com/asim/go-micro/v3/api/server" - "github.com/asim/go-micro/v3/api/server/cors" + "go-micro.dev/v4/api/server" + "go-micro.dev/v4/api/server/cors" "io/ioutil" "net/http" "testing" diff --git a/api/server/options.go b/api/server/options.go index 1c48501b..55780f2f 100644 --- a/api/server/options.go +++ b/api/server/options.go @@ -2,11 +2,11 @@ package server import ( "crypto/tls" - "github.com/asim/go-micro/v3/api/server/cors" + "go-micro.dev/v4/api/server/cors" "net/http" - "github.com/asim/go-micro/v3/api/resolver" - "github.com/asim/go-micro/v3/api/server/acme" + "go-micro.dev/v4/api/resolver" + "go-micro.dev/v4/api/server/acme" ) type Option func(o *Options) diff --git a/broker/http.go b/broker/http.go index 5c16d8cf..48bbd0e9 100644 --- a/broker/http.go +++ b/broker/http.go @@ -17,13 +17,13 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/codec/json" - merr "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/registry/cache" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4/codec/json" + merr "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/registry/cache" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" "github.com/google/uuid" "golang.org/x/net/http2" ) diff --git a/broker/http_test.go b/broker/http_test.go index d088a4d9..b39c8d41 100644 --- a/broker/http_test.go +++ b/broker/http_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/registry" "github.com/google/uuid" ) diff --git a/broker/options.go b/broker/options.go index c5408160..112ee3b4 100644 --- a/broker/options.go +++ b/broker/options.go @@ -4,8 +4,8 @@ import ( "context" "crypto/tls" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/registry" ) type Options struct { diff --git a/client/backoff.go b/client/backoff.go index 1978ee60..21dea703 100644 --- a/client/backoff.go +++ b/client/backoff.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/util/backoff" + "go-micro.dev/v4/util/backoff" ) type BackoffFunc func(ctx context.Context, req Request, attempts int) (time.Duration, error) diff --git a/client/cache.go b/client/cache.go index b94bb850..69c3da5b 100644 --- a/client/cache.go +++ b/client/cache.go @@ -7,7 +7,7 @@ import ( "hash/fnv" "time" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4/metadata" cache "github.com/patrickmn/go-cache" ) diff --git a/client/cache_test.go b/client/cache_test.go index 84c6de4b..1fa7ef3f 100644 --- a/client/cache_test.go +++ b/client/cache_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4/metadata" ) func TestCache(t *testing.T) { diff --git a/client/client.go b/client/client.go index 7636cea6..be4510b0 100644 --- a/client/client.go +++ b/client/client.go @@ -5,7 +5,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) // Client is the interface used to make requests to services. diff --git a/client/common_test.go b/client/common_test.go index 67e78d9e..e33b3c39 100644 --- a/client/common_test.go +++ b/client/common_test.go @@ -1,7 +1,7 @@ package client import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) var ( diff --git a/client/options.go b/client/options.go index 03e9e2a9..d044ee5d 100644 --- a/client/options.go +++ b/client/options.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/transport" ) type Options struct { diff --git a/client/options_test.go b/client/options_test.go index 9d025adb..d4e67337 100644 --- a/client/options_test.go +++ b/client/options_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func TestCallOptions(t *testing.T) { diff --git a/client/retry.go b/client/retry.go index 8739389a..c05ffb86 100644 --- a/client/retry.go +++ b/client/retry.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/errors" ) // note that returning either false or a non-nil error will result in the call not being retried diff --git a/client/rpc_client.go b/client/rpc_client.go index a772a969..77a4efc8 100644 --- a/client/rpc_client.go +++ b/client/rpc_client.go @@ -6,17 +6,17 @@ import ( "sync/atomic" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - raw "github.com/asim/go-micro/v3/codec/bytes" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/transport" - "github.com/asim/go-micro/v3/util/buf" - "github.com/asim/go-micro/v3/util/net" - "github.com/asim/go-micro/v3/util/pool" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + raw "go-micro.dev/v4/codec/bytes" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/transport" + "go-micro.dev/v4/util/buf" + "go-micro.dev/v4/util/net" + "go-micro.dev/v4/util/pool" "github.com/google/uuid" ) diff --git a/client/rpc_client_test.go b/client/rpc_client_test.go index 6f51d07e..ac4bd1e0 100644 --- a/client/rpc_client_test.go +++ b/client/rpc_client_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" ) func newTestRegistry() registry.Registry { diff --git a/client/rpc_codec.go b/client/rpc_codec.go index 0c849a85..79b50ee5 100644 --- a/client/rpc_codec.go +++ b/client/rpc_codec.go @@ -4,16 +4,16 @@ import ( "bytes" errs "errors" - "github.com/asim/go-micro/v3/codec" - raw "github.com/asim/go-micro/v3/codec/bytes" - "github.com/asim/go-micro/v3/codec/grpc" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/codec/jsonrpc" - "github.com/asim/go-micro/v3/codec/proto" - "github.com/asim/go-micro/v3/codec/protorpc" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/codec" + raw "go-micro.dev/v4/codec/bytes" + "go-micro.dev/v4/codec/grpc" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/codec/jsonrpc" + "go-micro.dev/v4/codec/proto" + "go-micro.dev/v4/codec/protorpc" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/transport" ) const ( diff --git a/client/rpc_request.go b/client/rpc_request.go index 782520ba..0c56b790 100644 --- a/client/rpc_request.go +++ b/client/rpc_request.go @@ -1,7 +1,7 @@ package client import ( - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type rpcRequest struct { diff --git a/client/rpc_response.go b/client/rpc_response.go index 0fa33ab6..de7c9a00 100644 --- a/client/rpc_response.go +++ b/client/rpc_response.go @@ -1,8 +1,8 @@ package client import ( - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/transport" ) type rpcResponse struct { diff --git a/client/rpc_stream.go b/client/rpc_stream.go index a5b617c4..09ade292 100644 --- a/client/rpc_stream.go +++ b/client/rpc_stream.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) // Implements the streamer interface diff --git a/client/wrapper.go b/client/wrapper.go index fa21e17a..4e7e3389 100644 --- a/client/wrapper.go +++ b/client/wrapper.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) // CallFunc represents the individual call func diff --git a/cmd/cmd.go b/cmd/cmd.go index c92a5d8d..6373ec57 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -7,22 +7,22 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/auth" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cache" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/debug/profile" - "github.com/asim/go-micro/v3/debug/profile/http" - "github.com/asim/go-micro/v3/debug/profile/pprof" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/store" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/auth" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cache" + "go-micro.dev/v4/client" + "go-micro.dev/v4/config" + "go-micro.dev/v4/debug/profile" + "go-micro.dev/v4/debug/profile/http" + "go-micro.dev/v4/debug/profile/pprof" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/server" + "go-micro.dev/v4/store" + "go-micro.dev/v4/transport" "github.com/urfave/cli/v2" ) diff --git a/cmd/gomu/README.md b/cmd/gomu/README.md index cd374f05..430b3912 100644 --- a/cmd/gomu/README.md +++ b/cmd/gomu/README.md @@ -119,7 +119,7 @@ package helloworld import ( "context" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" "helloworld/greeter" pb "helloworld/proto" diff --git a/cmd/gomu/cmd/cli/call/call.go b/cmd/gomu/cmd/cli/call/call.go index ef37ead6..f6bf08ca 100644 --- a/cmd/gomu/cmd/cli/call/call.go +++ b/cmd/gomu/cmd/cli/call/call.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/asim/go-micro/cmd/gomu/cmd" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4" + "go-micro.dev/v4/client" "github.com/urfave/cli/v2" ) diff --git a/cmd/gomu/cmd/cli/run/run.go b/cmd/gomu/cmd/cli/run/run.go index e09ab852..0323d47f 100644 --- a/cmd/gomu/cmd/cli/run/run.go +++ b/cmd/gomu/cmd/cli/run/run.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/asim/go-micro/cmd/gomu/cmd" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/runtime/local/git" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/runtime/local/git" "github.com/fsnotify/fsnotify" "github.com/urfave/cli/v2" ) diff --git a/cmd/gomu/cmd/cli/stream/bidi.go b/cmd/gomu/cmd/cli/stream/bidi.go index 7cf9c511..68caf48e 100644 --- a/cmd/gomu/cmd/cli/stream/bidi.go +++ b/cmd/gomu/cmd/cli/stream/bidi.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4" + "go-micro.dev/v4/client" "github.com/urfave/cli/v2" ) diff --git a/cmd/gomu/cmd/cli/stream/server.go b/cmd/gomu/cmd/cli/stream/server.go index 2d121ab3..0df1d24b 100644 --- a/cmd/gomu/cmd/cli/stream/server.go +++ b/cmd/gomu/cmd/cli/stream/server.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4" + "go-micro.dev/v4/client" "github.com/urfave/cli/v2" ) diff --git a/cmd/gomu/cmd/cmd.go b/cmd/gomu/cmd/cmd.go index 6de95846..5b04fc89 100644 --- a/cmd/gomu/cmd/cmd.go +++ b/cmd/gomu/cmd/cmd.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - mcmd "github.com/asim/go-micro/v3/cmd" + mcmd "go-micro.dev/v4/cmd" "github.com/urfave/cli/v2" ) diff --git a/cmd/gomu/generator/template/handler.go b/cmd/gomu/generator/template/handler.go index 7e5b760b..bc88d257 100644 --- a/cmd/gomu/generator/template/handler.go +++ b/cmd/gomu/generator/template/handler.go @@ -6,7 +6,7 @@ var HandlerFNC = `package handler import ( "context" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" pb "{{.Vendor}}{{.Service}}/proto" ) @@ -28,7 +28,7 @@ import ( "io" "time" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" pb "{{.Vendor}}{{.Service}}/proto" ) diff --git a/cmd/gomu/generator/template/main.go b/cmd/gomu/generator/template/main.go index 45eb09e9..84fa109a 100644 --- a/cmd/gomu/generator/template/main.go +++ b/cmd/gomu/generator/template/main.go @@ -9,8 +9,8 @@ import ( pb "{{.Vendor}}{{lower .Service}}/proto" - "github.com/asim/go-micro/v3" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4" + log "go-micro.dev/v4/logger" ) var ( @@ -47,8 +47,8 @@ import ( "{{.Vendor}}{{.Service}}/handler" {{if .Jaeger}} ot "github.com/asim/go-micro/plugins/wrapper/trace/opentracing/v3" -{{end}} "github.com/asim/go-micro/v3" - log "github.com/asim/go-micro/v3/logger"{{if .Jaeger}} +{{end}} "go-micro.dev/v4" + log "go-micro.dev/v4/logger"{{if .Jaeger}} "github.com/asim/go-micro/cmd/gomu/debug/trace/jaeger"{{end}} ) @@ -99,8 +99,8 @@ import ( pb "{{.Vendor}}{{.Service}}/proto" {{if .Jaeger}} ot "github.com/asim/go-micro/plugins/wrapper/trace/opentracing/v3" -{{end}} "github.com/asim/go-micro/v3" - log "github.com/asim/go-micro/v3/logger"{{if .Jaeger}} +{{end}} "go-micro.dev/v4" + log "go-micro.dev/v4/logger"{{if .Jaeger}} "github.com/asim/go-micro/cmd/gomu/debug/trace/jaeger"{{end}} ) diff --git a/cmd/gomu/go.mod b/cmd/gomu/go.mod index 40881c70..fde7642f 100644 --- a/cmd/gomu/go.mod +++ b/cmd/gomu/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect - github.com/asim/go-micro/v3 v3.6.1-0.20210831082736-088ccb50019c + go-micro.dev/v4 v4.0.0 github.com/fsnotify/fsnotify v1.4.9 github.com/opentracing/opentracing-go v1.2.0 github.com/uber/jaeger-client-go v2.29.1+incompatible diff --git a/cmd/gomu/go.sum b/cmd/gomu/go.sum index c27e55f5..4d938ab8 100644 --- a/cmd/gomu/go.sum +++ b/cmd/gomu/go.sum @@ -71,8 +71,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asim/go-micro/v3 v3.6.1-0.20210831082736-088ccb50019c h1:bwjwOyCBbClb9BwnVo8XohDYzA3Huk/PVpxSfqrx3xg= -github.com/asim/go-micro/v3 v3.6.1-0.20210831082736-088ccb50019c/go.mod h1:UQd2JfP/+4goQxddksr2r6ZSaUXNIlVE8hlepbAx/DI= +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/cmd/options.go b/cmd/options.go index 430e68ea..8ed3a29b 100644 --- a/cmd/options.go +++ b/cmd/options.go @@ -3,19 +3,19 @@ package cmd import ( "context" - "github.com/asim/go-micro/v3/auth" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cache" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/debug/profile" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/store" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/auth" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cache" + "go-micro.dev/v4/client" + "go-micro.dev/v4/config" + "go-micro.dev/v4/debug/profile" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/server" + "go-micro.dev/v4/store" + "go-micro.dev/v4/transport" ) type Options struct { diff --git a/cmd/protoc-gen-micro/examples/greeter/greeter.pb.micro.go b/cmd/protoc-gen-micro/examples/greeter/greeter.pb.micro.go index 87fe0634..f47b437a 100644 --- a/cmd/protoc-gen-micro/examples/greeter/greeter.pb.micro.go +++ b/cmd/protoc-gen-micro/examples/greeter/greeter.pb.micro.go @@ -12,9 +12,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/protoc-gen-micro/go.mod b/cmd/protoc-gen-micro/go.mod index 6617b860..ee014d88 100644 --- a/cmd/protoc-gen-micro/go.mod +++ b/cmd/protoc-gen-micro/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/cmd/protoc-gen-micro/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.6.0 + go-micro.dev/v4 v4.0.0 google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8 google.golang.org/protobuf v1.27.1 ) diff --git a/cmd/protoc-gen-micro/go.sum b/cmd/protoc-gen-micro/go.sum index 9a2dcf38..6e05efa7 100644 --- a/cmd/protoc-gen-micro/go.sum +++ b/cmd/protoc-gen-micro/go.sum @@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC 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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asim/go-micro/v3 v3.6.0 h1:I6UVJBpBtWNKCjWf0dRpZznRCW9TR4DXjV4wieyGhK0= -github.com/asim/go-micro/v3 v3.6.0/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8= +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/cmd/protoc-gen-micro/plugin/micro/micro.go b/cmd/protoc-gen-micro/plugin/micro/micro.go index b29bcd7c..feda59d0 100644 --- a/cmd/protoc-gen-micro/plugin/micro/micro.go +++ b/cmd/protoc-gen-micro/plugin/micro/micro.go @@ -15,10 +15,10 @@ import ( // Paths for packages used by code generated in this file, // relative to the import_prefix of the generator.Generator. const ( - apiPkgPath = "github.com/asim/go-micro/v3/api" + apiPkgPath = "go-micro.dev/v4/api" contextPkgPath = "context" - clientPkgPath = "github.com/asim/go-micro/v3/client" - serverPkgPath = "github.com/asim/go-micro/v3/server" + clientPkgPath = "go-micro.dev/v4/client" + serverPkgPath = "go-micro.dev/v4/server" ) func init() { diff --git a/codec/bytes/bytes.go b/codec/bytes/bytes.go index e27caf56..121212e3 100644 --- a/codec/bytes/bytes.go +++ b/codec/bytes/bytes.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type Codec struct { diff --git a/codec/bytes/marshaler.go b/codec/bytes/marshaler.go index 4da51fde..1c48b449 100644 --- a/codec/bytes/marshaler.go +++ b/codec/bytes/marshaler.go @@ -1,7 +1,7 @@ package bytes import ( - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type Marshaler struct{} diff --git a/codec/grpc/grpc.go b/codec/grpc/grpc.go index 29e2e786..038819f3 100644 --- a/codec/grpc/grpc.go +++ b/codec/grpc/grpc.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" "github.com/golang/protobuf/proto" ) diff --git a/codec/json/json.go b/codec/json/json.go index 449cb759..45b127c1 100644 --- a/codec/json/json.go +++ b/codec/json/json.go @@ -5,7 +5,7 @@ import ( "encoding/json" "io" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" ) diff --git a/codec/jsonrpc/client.go b/codec/jsonrpc/client.go index 4826cbd2..6b3e3284 100644 --- a/codec/jsonrpc/client.go +++ b/codec/jsonrpc/client.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type clientCodec struct { diff --git a/codec/jsonrpc/jsonrpc.go b/codec/jsonrpc/jsonrpc.go index 86554203..2ceffdb5 100644 --- a/codec/jsonrpc/jsonrpc.go +++ b/codec/jsonrpc/jsonrpc.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type jsonCodec struct { diff --git a/codec/jsonrpc/server.go b/codec/jsonrpc/server.go index 128a3802..8ed5d889 100644 --- a/codec/jsonrpc/server.go +++ b/codec/jsonrpc/server.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type serverCodec struct { diff --git a/codec/proto/marshaler.go b/codec/proto/marshaler.go index 86eb45d2..b7a042e3 100644 --- a/codec/proto/marshaler.go +++ b/codec/proto/marshaler.go @@ -3,7 +3,7 @@ package proto import ( "bytes" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" "github.com/golang/protobuf/proto" "github.com/oxtoacart/bpool" ) diff --git a/codec/proto/proto.go b/codec/proto/proto.go index c4375ec2..175c8cbe 100644 --- a/codec/proto/proto.go +++ b/codec/proto/proto.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" "github.com/golang/protobuf/proto" ) diff --git a/codec/protorpc/protorpc.go b/codec/protorpc/protorpc.go index 7a28987c..23749d21 100644 --- a/codec/protorpc/protorpc.go +++ b/codec/protorpc/protorpc.go @@ -8,7 +8,7 @@ import ( "strconv" "sync" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" "github.com/golang/protobuf/proto" ) diff --git a/codec/text/text.go b/codec/text/text.go index 8aa7970e..487fc74b 100644 --- a/codec/text/text.go +++ b/codec/text/text.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type Codec struct { diff --git a/config/config.go b/config/config.go index 5715cdd7..09b88e3c 100644 --- a/config/config.go +++ b/config/config.go @@ -4,10 +4,10 @@ package config import ( "context" - "github.com/asim/go-micro/v3/config/loader" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/source" - "github.com/asim/go-micro/v3/config/source/file" + "go-micro.dev/v4/config/loader" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/source" + "go-micro.dev/v4/config/source/file" ) // Config is an interface abstraction for dynamic configuration diff --git a/config/default.go b/config/default.go index 7c3ea134..95a7ca67 100644 --- a/config/default.go +++ b/config/default.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/config/loader" - "github.com/asim/go-micro/v3/config/loader/memory" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/reader/json" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/loader" + "go-micro.dev/v4/config/loader/memory" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/reader/json" + "go-micro.dev/v4/config/source" ) type config struct { diff --git a/config/default_test.go b/config/default_test.go index f3db75a3..539af557 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/config/source" - "github.com/asim/go-micro/v3/config/source/env" - "github.com/asim/go-micro/v3/config/source/file" - "github.com/asim/go-micro/v3/config/source/memory" + "go-micro.dev/v4/config/source" + "go-micro.dev/v4/config/source/env" + "go-micro.dev/v4/config/source/file" + "go-micro.dev/v4/config/source/memory" ) func createFileForIssue18(t *testing.T, content string) *os.File { diff --git a/config/encoder/json/json.go b/config/encoder/json/json.go index b1b669f3..8c90b166 100644 --- a/config/encoder/json/json.go +++ b/config/encoder/json/json.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type jsonEncoder struct{} diff --git a/config/loader/loader.go b/config/loader/loader.go index e46ddc7c..ade68817 100644 --- a/config/loader/loader.go +++ b/config/loader/loader.go @@ -4,8 +4,8 @@ package loader import ( "context" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/source" ) // Loader manages loading sources diff --git a/config/loader/memory/memory.go b/config/loader/memory/memory.go index a01d38d2..886da86d 100644 --- a/config/loader/memory/memory.go +++ b/config/loader/memory/memory.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/config/loader" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/reader/json" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/loader" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/reader/json" + "go-micro.dev/v4/config/source" ) type memory struct { diff --git a/config/loader/memory/options.go b/config/loader/memory/options.go index fd1bf90f..82758e92 100644 --- a/config/loader/memory/options.go +++ b/config/loader/memory/options.go @@ -1,9 +1,9 @@ package memory import ( - "github.com/asim/go-micro/v3/config/loader" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/loader" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/source" ) // WithSource appends a source to list of sources diff --git a/config/options.go b/config/options.go index 9f382fe0..a2a2f05f 100644 --- a/config/options.go +++ b/config/options.go @@ -1,9 +1,9 @@ package config import ( - "github.com/asim/go-micro/v3/config/loader" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/loader" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/source" ) // WithLoader sets the loader for manager config diff --git a/config/reader/json/json.go b/config/reader/json/json.go index df5662c9..ebcec372 100644 --- a/config/reader/json/json.go +++ b/config/reader/json/json.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "github.com/asim/go-micro/v3/config/encoder" - "github.com/asim/go-micro/v3/config/encoder/json" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/encoder" + "go-micro.dev/v4/config/encoder/json" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/source" "github.com/imdario/mergo" ) diff --git a/config/reader/json/json_test.go b/config/reader/json/json_test.go index e4b33c43..21171aa7 100644 --- a/config/reader/json/json_test.go +++ b/config/reader/json/json_test.go @@ -3,7 +3,7 @@ package json import ( "testing" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) func TestReader(t *testing.T) { diff --git a/config/reader/json/values.go b/config/reader/json/values.go index ffc428f5..70407085 100644 --- a/config/reader/json/values.go +++ b/config/reader/json/values.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/source" simple "github.com/bitly/go-simplejson" ) diff --git a/config/reader/json/values_test.go b/config/reader/json/values_test.go index 5ccb31bf..c684f193 100644 --- a/config/reader/json/values_test.go +++ b/config/reader/json/values_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) func TestValues(t *testing.T) { diff --git a/config/reader/options.go b/config/reader/options.go index 15656859..0c59fcc5 100644 --- a/config/reader/options.go +++ b/config/reader/options.go @@ -1,8 +1,8 @@ package reader import ( - "github.com/asim/go-micro/v3/config/encoder" - "github.com/asim/go-micro/v3/config/encoder/json" + "go-micro.dev/v4/config/encoder" + "go-micro.dev/v4/config/encoder/json" ) type Options struct { diff --git a/config/reader/reader.go b/config/reader/reader.go index 971db873..d72c666c 100644 --- a/config/reader/reader.go +++ b/config/reader/reader.go @@ -4,7 +4,7 @@ package reader import ( "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) // Reader is an interface for merging changesets diff --git a/config/secrets/box/box.go b/config/secrets/box/box.go index b08d7f1e..96cbfee0 100644 --- a/config/secrets/box/box.go +++ b/config/secrets/box/box.go @@ -2,7 +2,7 @@ package box import ( - "github.com/asim/go-micro/v3/config/secrets" + "go-micro.dev/v4/config/secrets" "github.com/pkg/errors" naclbox "golang.org/x/crypto/nacl/box" diff --git a/config/secrets/box/box_test.go b/config/secrets/box/box_test.go index 1adf7d95..89e2aab5 100644 --- a/config/secrets/box/box_test.go +++ b/config/secrets/box/box_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/config/secrets" + "go-micro.dev/v4/config/secrets" naclbox "golang.org/x/crypto/nacl/box" ) diff --git a/config/secrets/secretbox/secretbox.go b/config/secrets/secretbox/secretbox.go index 3d0f31a3..df957a5b 100644 --- a/config/secrets/secretbox/secretbox.go +++ b/config/secrets/secretbox/secretbox.go @@ -3,7 +3,7 @@ package secretbox import ( - "github.com/asim/go-micro/v3/config/secrets" + "go-micro.dev/v4/config/secrets" "github.com/pkg/errors" "golang.org/x/crypto/nacl/secretbox" diff --git a/config/secrets/secretbox/secretbox_test.go b/config/secrets/secretbox/secretbox_test.go index 49420fe6..5c1a15ab 100644 --- a/config/secrets/secretbox/secretbox_test.go +++ b/config/secrets/secretbox/secretbox_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/config/secrets" + "go-micro.dev/v4/config/secrets" ) func TestSecretBox(t *testing.T) { diff --git a/config/source/cli/cli.go b/config/source/cli/cli.go index 9ee09259..920df953 100644 --- a/config/source/cli/cli.go +++ b/config/source/cli/cli.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/config/source" "github.com/imdario/mergo" "github.com/urfave/cli/v2" ) diff --git a/config/source/cli/cli_test.go b/config/source/cli/cli_test.go index 34c1a1c2..3258459b 100644 --- a/config/source/cli/cli_test.go +++ b/config/source/cli/cli_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/config" + "go-micro.dev/v4/config/source" "github.com/urfave/cli/v2" ) diff --git a/config/source/cli/options.go b/config/source/cli/options.go index 4dddf1a2..329cdb30 100644 --- a/config/source/cli/options.go +++ b/config/source/cli/options.go @@ -3,7 +3,7 @@ package cli import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/urfave/cli/v2" ) diff --git a/config/source/env/env.go b/config/source/env/env.go index 14000f29..2a524007 100644 --- a/config/source/env/env.go +++ b/config/source/env/env.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/imdario/mergo" ) diff --git a/config/source/env/env_test.go b/config/source/env/env_test.go index 8e3723bc..c5425a72 100644 --- a/config/source/env/env_test.go +++ b/config/source/env/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) func TestEnv_Read(t *testing.T) { diff --git a/config/source/env/options.go b/config/source/env/options.go index 412c9082..25ebbd6c 100644 --- a/config/source/env/options.go +++ b/config/source/env/options.go @@ -5,7 +5,7 @@ import ( "strings" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type strippedPrefixKey struct{} diff --git a/config/source/env/watcher.go b/config/source/env/watcher.go index 82e6d7a8..22e1aa71 100644 --- a/config/source/env/watcher.go +++ b/config/source/env/watcher.go @@ -1,7 +1,7 @@ package env import ( - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type watcher struct { diff --git a/config/source/file/file.go b/config/source/file/file.go index 1a01596d..d03f1716 100644 --- a/config/source/file/file.go +++ b/config/source/file/file.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type file struct { diff --git a/config/source/file/file_test.go b/config/source/file/file_test.go index 78386791..5f60d2bf 100644 --- a/config/source/file/file_test.go +++ b/config/source/file/file_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/config/source/file" + "go-micro.dev/v4/config" + "go-micro.dev/v4/config/source/file" ) func TestConfig(t *testing.T) { diff --git a/config/source/file/format.go b/config/source/file/format.go index 0d151713..b04f0ff3 100644 --- a/config/source/file/format.go +++ b/config/source/file/format.go @@ -3,7 +3,7 @@ package file import ( "strings" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) func format(p string, e encoder.Encoder) string { diff --git a/config/source/file/format_test.go b/config/source/file/format_test.go index 3aa52619..24441df5 100644 --- a/config/source/file/format_test.go +++ b/config/source/file/format_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) func TestFormat(t *testing.T) { diff --git a/config/source/file/options.go b/config/source/file/options.go index 9b569bf7..8d014953 100644 --- a/config/source/file/options.go +++ b/config/source/file/options.go @@ -3,7 +3,7 @@ package file import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type filePathKey struct{} diff --git a/config/source/file/watcher.go b/config/source/file/watcher.go index b6cbe0a0..15274542 100644 --- a/config/source/file/watcher.go +++ b/config/source/file/watcher.go @@ -5,7 +5,7 @@ package file import ( "os" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/fsnotify/fsnotify" ) diff --git a/config/source/file/watcher_linux.go b/config/source/file/watcher_linux.go index 0059d9fb..c006d35f 100644 --- a/config/source/file/watcher_linux.go +++ b/config/source/file/watcher_linux.go @@ -5,7 +5,7 @@ package file import ( "os" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/fsnotify/fsnotify" ) diff --git a/config/source/flag/flag.go b/config/source/flag/flag.go index 747a32fb..c6903a6f 100644 --- a/config/source/flag/flag.go +++ b/config/source/flag/flag.go @@ -3,7 +3,7 @@ package flag import ( "errors" "flag" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/imdario/mergo" "strings" "time" diff --git a/config/source/flag/options.go b/config/source/flag/options.go index 1bedce97..674bef8b 100644 --- a/config/source/flag/options.go +++ b/config/source/flag/options.go @@ -3,7 +3,7 @@ package flag import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type includeUnsetKey struct{} diff --git a/config/source/memory/memory.go b/config/source/memory/memory.go index 91e22956..e6c67f8c 100644 --- a/config/source/memory/memory.go +++ b/config/source/memory/memory.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/google/uuid" ) diff --git a/config/source/memory/options.go b/config/source/memory/options.go index 7de41e25..02d19948 100644 --- a/config/source/memory/options.go +++ b/config/source/memory/options.go @@ -3,7 +3,7 @@ package memory import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type changeSetKey struct{} diff --git a/config/source/memory/watcher.go b/config/source/memory/watcher.go index db4611d6..e3d5011c 100644 --- a/config/source/memory/watcher.go +++ b/config/source/memory/watcher.go @@ -1,7 +1,7 @@ package memory import ( - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type watcher struct { diff --git a/config/source/options.go b/config/source/options.go index 881a896c..742edf45 100644 --- a/config/source/options.go +++ b/config/source/options.go @@ -3,9 +3,9 @@ package source import ( "context" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/config/encoder" - "github.com/asim/go-micro/v3/config/encoder/json" + "go-micro.dev/v4/client" + "go-micro.dev/v4/config/encoder" + "go-micro.dev/v4/config/encoder/json" ) type Options struct { diff --git a/config/value.go b/config/value.go index 55dc2804..b42d2e87 100644 --- a/config/value.go +++ b/config/value.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/asim/go-micro/v3/config/reader" + "go-micro.dev/v4/config/reader" ) type value struct{} diff --git a/debug/handler/debug.go b/debug/handler/debug.go index 94a86a5f..dce67c8f 100644 --- a/debug/handler/debug.go +++ b/debug/handler/debug.go @@ -5,12 +5,12 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/debug/log" - proto "github.com/asim/go-micro/v3/debug/proto" - "github.com/asim/go-micro/v3/debug/stats" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/debug/log" + proto "go-micro.dev/v4/debug/proto" + "go-micro.dev/v4/debug/stats" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/server" ) // NewHandler returns an instance of the Debug Handler diff --git a/debug/log/memory/memory.go b/debug/log/memory/memory.go index 835f4056..326fd4b1 100644 --- a/debug/log/memory/memory.go +++ b/debug/log/memory/memory.go @@ -4,8 +4,8 @@ package memory import ( "fmt" - "github.com/asim/go-micro/v3/debug/log" - "github.com/asim/go-micro/v3/util/ring" + "go-micro.dev/v4/debug/log" + "go-micro.dev/v4/util/ring" ) var ( diff --git a/debug/log/memory/memory_test.go b/debug/log/memory/memory_test.go index c014ef76..25f1191f 100644 --- a/debug/log/memory/memory_test.go +++ b/debug/log/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/debug/log" + "go-micro.dev/v4/debug/log" ) func TestLogger(t *testing.T) { diff --git a/debug/log/memory/stream.go b/debug/log/memory/stream.go index 38e6dcd3..9267a52d 100644 --- a/debug/log/memory/stream.go +++ b/debug/log/memory/stream.go @@ -1,7 +1,7 @@ package memory import ( - "github.com/asim/go-micro/v3/debug/log" + "go-micro.dev/v4/debug/log" ) type logStream struct { diff --git a/debug/log/noop/noop.go b/debug/log/noop/noop.go index dbabf8c3..a4699469 100644 --- a/debug/log/noop/noop.go +++ b/debug/log/noop/noop.go @@ -1,7 +1,7 @@ package noop import ( - "github.com/asim/go-micro/v3/debug/log" + "go-micro.dev/v4/debug/log" ) type noop struct{} diff --git a/debug/log/os.go b/debug/log/os.go index 70f926ce..b0d79cd8 100644 --- a/debug/log/os.go +++ b/debug/log/os.go @@ -3,7 +3,7 @@ package log import ( "sync" - "github.com/asim/go-micro/v3/util/ring" + "go-micro.dev/v4/util/ring" "github.com/google/uuid" ) diff --git a/debug/profile/http/http.go b/debug/profile/http/http.go index 39d73ad4..fa2da3ce 100644 --- a/debug/profile/http/http.go +++ b/debug/profile/http/http.go @@ -7,7 +7,7 @@ import ( "net/http/pprof" "sync" - "github.com/asim/go-micro/v3/debug/profile" + "go-micro.dev/v4/debug/profile" ) type httpProfile struct { diff --git a/debug/profile/pprof/pprof.go b/debug/profile/pprof/pprof.go index 27981afe..d77e2c7d 100644 --- a/debug/profile/pprof/pprof.go +++ b/debug/profile/pprof/pprof.go @@ -8,7 +8,7 @@ import ( "runtime/pprof" "sync" - "github.com/asim/go-micro/v3/debug/profile" + "go-micro.dev/v4/debug/profile" ) type profiler struct { diff --git a/debug/proto/debug.pb.micro.go b/debug/proto/debug.pb.micro.go index 2ede91ca..ab6b87f0 100644 --- a/debug/proto/debug.pb.micro.go +++ b/debug/proto/debug.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/debug/stats/default.go b/debug/stats/default.go index 99f29586..7bf91aec 100644 --- a/debug/stats/default.go +++ b/debug/stats/default.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/util/ring" + "go-micro.dev/v4/util/ring" ) type stats struct { diff --git a/debug/trace/default.go b/debug/trace/default.go index fdc83bf6..d8443b4f 100644 --- a/debug/trace/default.go +++ b/debug/trace/default.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/util/ring" + "go-micro.dev/v4/util/ring" "github.com/google/uuid" ) diff --git a/debug/trace/trace.go b/debug/trace/trace.go index 645babdd..1275bb67 100644 --- a/debug/trace/trace.go +++ b/debug/trace/trace.go @@ -5,7 +5,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4/metadata" ) // Tracer is an interface for distributed tracing diff --git a/event.go b/event.go index 36fc439f..0215d2df 100644 --- a/event.go +++ b/event.go @@ -3,7 +3,7 @@ package micro import ( "context" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) type event struct { diff --git a/examples/broker/consumer/consumer.go b/examples/broker/consumer/consumer.go index 278c7d94..a3ed93c7 100644 --- a/examples/broker/consumer/consumer.go +++ b/examples/broker/consumer/consumer.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" // To enable rabbitmq plugin uncomment //_ "github.com/micro/go-plugins/broker/rabbitmq" ) diff --git a/examples/broker/main.go b/examples/broker/main.go index 481b7963..053e601a 100644 --- a/examples/broker/main.go +++ b/examples/broker/main.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" ) var ( diff --git a/examples/broker/producer/producer.go b/examples/broker/producer/producer.go index 41a217b0..4f578a25 100644 --- a/examples/broker/producer/producer.go +++ b/examples/broker/producer/producer.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" // To enable rabbitmq plugin uncomment //_ "github.com/micro/go-plugins/broker/rabbitmq" ) diff --git a/examples/cache/handler/cache.go b/examples/cache/handler/cache.go index 1c6244b5..e3f1a4e1 100644 --- a/examples/cache/handler/cache.go +++ b/examples/cache/handler/cache.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/asim/go-micro/v3/cache" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/cache" + log "go-micro.dev/v4/logger" pb "github.com/asim/go-micro/examples/v3/cache/proto" ) diff --git a/examples/cache/main.go b/examples/cache/main.go index 8e4fc1b1..bf5e1050 100644 --- a/examples/cache/main.go +++ b/examples/cache/main.go @@ -4,8 +4,8 @@ import ( "github.com/asim/go-micro/examples/v3/cache/handler" pb "github.com/asim/go-micro/examples/v3/cache/proto" - "github.com/asim/go-micro/v3" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4" + log "go-micro.dev/v4/logger" ) var ( diff --git a/examples/cache/proto/cache.pb.micro.go b/examples/cache/proto/cache.pb.micro.go index b5d7743c..6d75d948 100644 --- a/examples/cache/proto/cache.pb.micro.go +++ b/examples/cache/proto/cache.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/client/codegen/README.md b/examples/client/codegen/README.md index fa971454..92dbb508 100644 --- a/examples/client/codegen/README.md +++ b/examples/client/codegen/README.md @@ -133,7 +133,7 @@ import ( "fmt" "context" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" hello "path/to/hello/proto" ) diff --git a/examples/client/codegen/codegen.go b/examples/client/codegen/codegen.go index 2d8ae2a8..5e19c046 100644 --- a/examples/client/codegen/codegen.go +++ b/examples/client/codegen/codegen.go @@ -5,7 +5,7 @@ import ( "context" example "github.com/asim/go-micro/examples/v3/server/proto/example" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/cmd" ) var ( diff --git a/examples/client/dc_filter/dc_filter.go b/examples/client/dc_filter/dc_filter.go index 2f98175d..5084917e 100644 --- a/examples/client/dc_filter/dc_filter.go +++ b/examples/client/dc_filter/dc_filter.go @@ -6,11 +6,11 @@ import ( "math/rand" "time" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" example "github.com/asim/go-micro/examples/v3/server/proto/example" ) diff --git a/examples/client/dc_selector/dc_selector.go b/examples/client/dc_selector/dc_selector.go index 3c743d3b..e8a41cab 100644 --- a/examples/client/dc_selector/dc_selector.go +++ b/examples/client/dc_selector/dc_selector.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" example "github.com/asim/go-micro/examples/v3/server/proto/example" ) diff --git a/examples/client/main.go b/examples/client/main.go index 395dc4d1..86114d85 100644 --- a/examples/client/main.go +++ b/examples/client/main.go @@ -5,9 +5,9 @@ import ( "context" example "github.com/asim/go-micro/examples/v3/server/proto/example" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4" + "go-micro.dev/v4/client" + "go-micro.dev/v4/metadata" ) // publishes a message diff --git a/examples/client/pub/pub.go b/examples/client/pub/pub.go index 27d826a7..462e1bdb 100644 --- a/examples/client/pub/pub.go +++ b/examples/client/pub/pub.go @@ -5,7 +5,7 @@ import ( "context" example "github.com/asim/go-micro/examples/v3/server/proto/example" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) // publishes a message diff --git a/examples/client/selector/selector.go b/examples/client/selector/selector.go index f229bf90..10eb1a81 100644 --- a/examples/client/selector/selector.go +++ b/examples/client/selector/selector.go @@ -7,10 +7,10 @@ import ( "time" example "github.com/asim/go-micro/examples/v3/server/proto/example" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" ) func init() { diff --git a/examples/client/wrapper/wrapper.go b/examples/client/wrapper/wrapper.go index fd63166a..ac846e2c 100644 --- a/examples/client/wrapper/wrapper.go +++ b/examples/client/wrapper/wrapper.go @@ -6,10 +6,10 @@ import ( "context" example "github.com/asim/go-micro/examples/v3/server/proto/example" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" ) // wrapper example code diff --git a/examples/config/file/main.go b/examples/config/file/main.go index 4d574cf0..b4e16b6f 100644 --- a/examples/config/file/main.go +++ b/examples/config/file/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/config/source/file" + "go-micro.dev/v4/config" + "go-micro.dev/v4/config/source/file" ) func main() { diff --git a/examples/config/grpc/client/main.go b/examples/config/grpc/client/main.go index 933f0610..93e86cae 100644 --- a/examples/config/grpc/client/main.go +++ b/examples/config/grpc/client/main.go @@ -2,8 +2,8 @@ package main import ( grpcConfig "github.com/asim/go-micro/plugins/config/source/grpc/v3" - "github.com/asim/go-micro/v3/config" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/config" + log "go-micro.dev/v4/logger" ) type Micro struct { diff --git a/examples/config/grpc/srv/main.go b/examples/config/grpc/srv/main.go index 7d74cb54..3190459f 100644 --- a/examples/config/grpc/srv/main.go +++ b/examples/config/grpc/srv/main.go @@ -11,11 +11,11 @@ import ( yaml "github.com/asim/go-micro/plugins/config/encoder/yaml/v3" proto "github.com/asim/go-micro/plugins/config/source/grpc/v3/proto" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/reader/json" - "github.com/asim/go-micro/v3/config/source/file" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/config" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/reader/json" + "go-micro.dev/v4/config/source/file" + log "go-micro.dev/v4/logger" grpc "google.golang.org/grpc" ) diff --git a/examples/config/modify/modify.go b/examples/config/modify/modify.go index 6bba9769..9cf23f9f 100644 --- a/examples/config/modify/modify.go +++ b/examples/config/modify/modify.go @@ -4,10 +4,10 @@ import ( "fmt" "io/ioutil" - "github.com/asim/go-micro/v3/config" + "go-micro.dev/v4/config" "github.com/asim/go-micro/plugins/config/encoder/toml/v3" - "github.com/asim/go-micro/v3/config/source" - "github.com/asim/go-micro/v3/config/source/file" + "go-micro.dev/v4/config/source" + "go-micro.dev/v4/config/source/file" ) func main() { diff --git a/examples/config/yaml/main.go b/examples/config/yaml/main.go index 7b77c4c4..bfa5823f 100644 --- a/examples/config/yaml/main.go +++ b/examples/config/yaml/main.go @@ -4,10 +4,10 @@ import ( "fmt" yaml "github.com/asim/go-micro/plugins/config/encoder/yaml/v3" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/config/reader" - "github.com/asim/go-micro/v3/config/reader/json" - "github.com/asim/go-micro/v3/config/source/file" + "go-micro.dev/v4/config" + "go-micro.dev/v4/config/reader" + "go-micro.dev/v4/config/reader/json" + "go-micro.dev/v4/config/source/file" ) func main() { diff --git a/examples/event/srv/main.go b/examples/event/srv/main.go index 0c902b0f..771d793d 100644 --- a/examples/event/srv/main.go +++ b/examples/event/srv/main.go @@ -3,9 +3,9 @@ package main import ( "context" - "github.com/asim/go-micro/v3" - proto "github.com/asim/go-micro/v3/api/proto" - "github.com/asim/go-micro/v3/util/log" + "go-micro.dev/v4" + proto "go-micro.dev/v4/api/proto" + "go-micro.dev/v4/util/log" ) // All methods of Event will be executed when a message is received diff --git a/examples/filter/main.go b/examples/filter/main.go index c78453b0..44dbeacd 100644 --- a/examples/filter/main.go +++ b/examples/filter/main.go @@ -6,7 +6,7 @@ import ( "github.com/asim/go-micro/examples/v3/filter/version" proto "github.com/asim/go-micro/examples/v3/service/proto" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) func main() { diff --git a/examples/filter/version/version.go b/examples/filter/version/version.go index d9d3f1bf..cbf436b8 100644 --- a/examples/filter/version/version.go +++ b/examples/filter/version/version.go @@ -2,9 +2,9 @@ package version import ( - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/registry" ) // Filter will filter the version of the service diff --git a/examples/flags/main.go b/examples/flags/main.go index bcb8e079..3a81a650 100644 --- a/examples/flags/main.go +++ b/examples/flags/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/urfave/cli/v2" ) diff --git a/examples/function/main.go b/examples/function/main.go index 2603d07d..de4208e0 100644 --- a/examples/function/main.go +++ b/examples/function/main.go @@ -4,7 +4,7 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/function/proto" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) type Greeter struct{} diff --git a/examples/function/proto/greeter.micro.go b/examples/function/proto/greeter.micro.go index 3d541c4f..fd233063 100644 --- a/examples/function/proto/greeter.micro.go +++ b/examples/function/proto/greeter.micro.go @@ -19,8 +19,8 @@ import math "math" import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/getip/main.go b/examples/getip/main.go index f4617ca1..fb4a3c74 100644 --- a/examples/getip/main.go +++ b/examples/getip/main.go @@ -5,8 +5,8 @@ import ( "fmt" proto "github.com/asim/go-micro/examples/v3/service/proto" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4" + "go-micro.dev/v4/metadata" ) type Greeter struct{} diff --git a/examples/getip/proto/greeter.micro.go b/examples/getip/proto/greeter.micro.go index 87656459..6c5e3414 100644 --- a/examples/getip/proto/greeter.micro.go +++ b/examples/getip/proto/greeter.micro.go @@ -19,8 +19,8 @@ import math "math" import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/go.mod b/examples/go.mod index d9259a98..c324cac9 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -10,7 +10,7 @@ require ( github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210403073940-e7a7e3a05092 github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v3 v3.0.0-20210403073940-e7a7e3a05092 github.com/asim/go-micro/plugins/wrapper/select/shard/v3 v3.0.0-20210403073940-e7a7e3a05092 - github.com/asim/go-micro/v3 v3.6.1-0.20210831143116-05a299b76c7c + go-micro.dev/v4 v4.0.0 github.com/gin-gonic/gin v1.7.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/protobuf v1.5.2 diff --git a/examples/go.sum b/examples/go.sum index 39ac4f56..2bc43719 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -101,10 +101,10 @@ github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v3 v3.0.0-20210403073 github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v3 v3.0.0-20210403073940-e7a7e3a05092/go.mod h1:ylLMnWRirHZgMKEUyhnseG44r0UqXyqpFCIlxbFd9fU= github.com/asim/go-micro/plugins/wrapper/select/shard/v3 v3.0.0-20210403073940-e7a7e3a05092 h1:YU1Qks1LnRQU/b9UbHz0V1ZMjlWcuQmPf95g403VRiY= github.com/asim/go-micro/plugins/wrapper/select/shard/v3 v3.0.0-20210403073940-e7a7e3a05092/go.mod h1:W82nHY+YFENWaye4jazv6nX+OYru9T7It+wUqJA9Vc0= -github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c/go.mod h1:fAeb2KUnD3z4XwtQ91XFxw5zgGKhoTsLc6Ie81QdER4= -github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8= -github.com/asim/go-micro/v3 v3.6.1-0.20210831143116-05a299b76c7c h1:CaJvJPUEbd5aBmCBhOHmWDHCQr2HCxyCkbBxHW7w/kY= -github.com/asim/go-micro/v3 v3.6.1-0.20210831143116-05a299b76c7c/go.mod h1:UQd2JfP/+4goQxddksr2r6ZSaUXNIlVE8hlepbAx/DI= +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= diff --git a/examples/graceful/main.go b/examples/graceful/main.go index 85a35a52..1e8b40c5 100644 --- a/examples/graceful/main.go +++ b/examples/graceful/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4" + "go-micro.dev/v4/server" ) func main() { diff --git a/examples/greeter/cli/main.go b/examples/greeter/cli/main.go index c0885f14..6c6984ea 100644 --- a/examples/greeter/cli/main.go +++ b/examples/greeter/cli/main.go @@ -5,7 +5,7 @@ import ( "fmt" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) func main() { diff --git a/examples/greeter/srv/main.go b/examples/greeter/srv/main.go index 3da4f2b0..0c7f3d72 100644 --- a/examples/greeter/srv/main.go +++ b/examples/greeter/srv/main.go @@ -6,8 +6,8 @@ import ( "time" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/util/log" + "go-micro.dev/v4" + "go-micro.dev/v4/util/log" "google.golang.org/grpc" ) diff --git a/examples/greeter/srv/proto/hello/hello.pb.micro.go b/examples/greeter/srv/proto/hello/hello.pb.micro.go index e8fc1405..d9561927 100644 --- a/examples/greeter/srv/proto/hello/hello.pb.micro.go +++ b/examples/greeter/srv/proto/hello/hello.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/heartbeat/main.go b/examples/heartbeat/main.go index caf71df9..f0c8b5e0 100644 --- a/examples/heartbeat/main.go +++ b/examples/heartbeat/main.go @@ -3,8 +3,8 @@ package main import ( "time" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/util/log" + "go-micro.dev/v4" + "go-micro.dev/v4/util/log" ) func main() { diff --git a/examples/helloworld/main.go b/examples/helloworld/main.go index c733e2a6..6bae05ea 100644 --- a/examples/helloworld/main.go +++ b/examples/helloworld/main.go @@ -5,7 +5,7 @@ import ( "log" pb "github.com/asim/go-micro/examples/v3/helloworld/proto" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) type Greeter struct{} diff --git a/examples/helloworld/proto/greeter.pb.micro.go b/examples/helloworld/proto/greeter.pb.micro.go index a15e4a19..a5cd89c8 100644 --- a/examples/helloworld/proto/greeter.pb.micro.go +++ b/examples/helloworld/proto/greeter.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/http/cli/main.go b/examples/http/cli/main.go index ca30916e..3dc23bcd 100644 --- a/examples/http/cli/main.go +++ b/examples/http/cli/main.go @@ -5,9 +5,9 @@ import ( "log" httpClient "github.com/asim/go-micro/plugins/client/http/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/client" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" ) func main() { diff --git a/examples/http/rpccli/main.go b/examples/http/rpccli/main.go index 8abc5001..205dbf1d 100644 --- a/examples/http/rpccli/main.go +++ b/examples/http/rpccli/main.go @@ -5,9 +5,9 @@ import ( "log" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4" + "go-micro.dev/v4/client" + "go-micro.dev/v4/registry" ) func main() { diff --git a/examples/http/srv/main.go b/examples/http/srv/main.go index d59acf5e..05d5b96b 100644 --- a/examples/http/srv/main.go +++ b/examples/http/srv/main.go @@ -4,10 +4,10 @@ import ( "log" httpServer "github.com/asim/go-micro/plugins/server/http/v3" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" "github.com/gin-gonic/gin" ) diff --git a/examples/metadata/cli/main.go b/examples/metadata/cli/main.go index c84ead73..63497a89 100644 --- a/examples/metadata/cli/main.go +++ b/examples/metadata/cli/main.go @@ -4,8 +4,8 @@ import ( "fmt" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4" + "go-micro.dev/v4/metadata" "context" ) diff --git a/examples/metadata/srv/main.go b/examples/metadata/srv/main.go index ef5f587f..05e102e9 100644 --- a/examples/metadata/srv/main.go +++ b/examples/metadata/srv/main.go @@ -6,8 +6,8 @@ import ( "time" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4" + "go-micro.dev/v4/metadata" "context" ) diff --git a/examples/mocking/main.go b/examples/mocking/main.go index 0ca418e6..4976d9ae 100644 --- a/examples/mocking/main.go +++ b/examples/mocking/main.go @@ -6,7 +6,7 @@ import ( proto "github.com/asim/go-micro/examples/v3/helloworld/proto" "github.com/asim/go-micro/examples/v3/mocking/mock" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/urfave/cli/v2" ) diff --git a/examples/mocking/mock/mock.go b/examples/mocking/mock/mock.go index a65881f2..48cce100 100644 --- a/examples/mocking/mock/mock.go +++ b/examples/mocking/mock/mock.go @@ -4,7 +4,7 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/helloworld/proto" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) type mockGreeterService struct { diff --git a/examples/noproto/client/main.go b/examples/noproto/client/main.go index 952710b9..dc963b2c 100644 --- a/examples/noproto/client/main.go +++ b/examples/noproto/client/main.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4" + "go-micro.dev/v4/client" ) func main() { diff --git a/examples/noproto/main.go b/examples/noproto/main.go index 69d91ec8..bd95456e 100644 --- a/examples/noproto/main.go +++ b/examples/noproto/main.go @@ -3,7 +3,7 @@ package main import ( "context" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) type Greeter struct{} diff --git a/examples/options/README.md b/examples/options/README.md index 1fdb155c..7a764279 100644 --- a/examples/options/README.md +++ b/examples/options/README.md @@ -26,7 +26,7 @@ func Name(n string) Option { Here's an example at the top level ``` -import "github.com/asim/go-micro/v3" +import "go-micro.dev/v4" service := micro.NewService( diff --git a/examples/pubsub/cli/main.go b/examples/pubsub/cli/main.go index aa5d815b..a51f365c 100644 --- a/examples/pubsub/cli/main.go +++ b/examples/pubsub/cli/main.go @@ -6,8 +6,8 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/pubsub/srv/proto" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/util/log" + "go-micro.dev/v4" + "go-micro.dev/v4/util/log" "github.com/pborman/uuid" ) diff --git a/examples/pubsub/srv/main.go b/examples/pubsub/srv/main.go index a2bcf8fc..ed59835d 100644 --- a/examples/pubsub/srv/main.go +++ b/examples/pubsub/srv/main.go @@ -2,10 +2,10 @@ package main import ( proto "github.com/asim/go-micro/examples/v3/pubsub/srv/proto" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/util/log" + "go-micro.dev/v4" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/server" + "go-micro.dev/v4/util/log" "context" ) diff --git a/examples/redirect/main.go b/examples/redirect/main.go index 5b9412c2..774187dc 100644 --- a/examples/redirect/main.go +++ b/examples/redirect/main.go @@ -4,8 +4,8 @@ import ( "log" "context" - "github.com/asim/go-micro/v3" - api "github.com/asim/go-micro/v3/api/proto" + "go-micro.dev/v4" + api "go-micro.dev/v4/api/proto" ) type Redirect struct{} diff --git a/examples/roundrobin/api.go b/examples/roundrobin/api.go index d97ebf25..ced98a2e 100644 --- a/examples/roundrobin/api.go +++ b/examples/roundrobin/api.go @@ -6,10 +6,10 @@ import ( "strings" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4" + "go-micro.dev/v4/errors" roundrobin "github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v3" - api "github.com/asim/go-micro/v3/api/proto" + api "go-micro.dev/v4/api/proto" "context" ) diff --git a/examples/secure/README.md b/examples/secure/README.md index 2fb10957..c8634871 100644 --- a/examples/secure/README.md +++ b/examples/secure/README.md @@ -20,8 +20,8 @@ Create a tls.go file package main import ( - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/client" + "go-micro.dev/v4/transport" ) func init() { diff --git a/examples/secure/cli/main.go b/examples/secure/cli/main.go index dd6c16e6..4350e203 100644 --- a/examples/secure/cli/main.go +++ b/examples/secure/cli/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/client" + "go-micro.dev/v4/transport" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" diff --git a/examples/secure/srv/main.go b/examples/secure/srv/main.go index 5ea7f3e1..4f580c00 100644 --- a/examples/secure/srv/main.go +++ b/examples/secure/srv/main.go @@ -6,8 +6,8 @@ import ( "context" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4" + "go-micro.dev/v4/transport" ) type Say struct{} diff --git a/examples/secure/srv/proto/hello/hello.micro.go b/examples/secure/srv/proto/hello/hello.micro.go index 8f01d006..0f7920ca 100644 --- a/examples/secure/srv/proto/hello/hello.micro.go +++ b/examples/secure/srv/proto/hello/hello.micro.go @@ -19,8 +19,8 @@ import math "math" import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/server/codegen/codegen.go b/examples/server/codegen/codegen.go index ebb41bbe..d7d63f5d 100644 --- a/examples/server/codegen/codegen.go +++ b/examples/server/codegen/codegen.go @@ -5,8 +5,8 @@ import ( "context" "github.com/asim/go-micro/examples/v3/server/subscriber" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/server" example "github.com/asim/go-micro/examples/v3/server/proto/example" ) diff --git a/examples/server/handler/example.go b/examples/server/handler/example.go index 57e968cc..8a4daee3 100644 --- a/examples/server/handler/example.go +++ b/examples/server/handler/example.go @@ -4,8 +4,8 @@ import ( "log" example "github.com/asim/go-micro/examples/v3/server/proto/example" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/server" "context" ) diff --git a/examples/server/main.go b/examples/server/main.go index 50f8b5c3..fe5c5e3d 100644 --- a/examples/server/main.go +++ b/examples/server/main.go @@ -5,8 +5,8 @@ import ( "github.com/asim/go-micro/examples/v3/server/handler" "github.com/asim/go-micro/examples/v3/server/subscriber" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/server" ) func main() { diff --git a/examples/server/proto/example/example.micro.go b/examples/server/proto/example/example.micro.go index 347ff54d..29bce656 100644 --- a/examples/server/proto/example/example.micro.go +++ b/examples/server/proto/example/example.micro.go @@ -24,8 +24,8 @@ import math "math" import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/server/wrapper/main.go b/examples/server/wrapper/main.go index 1776126b..ee9dff11 100644 --- a/examples/server/wrapper/main.go +++ b/examples/server/wrapper/main.go @@ -6,8 +6,8 @@ import ( "context" "github.com/asim/go-micro/examples/v3/server/handler" "github.com/asim/go-micro/examples/v3/server/subscriber" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/server" ) func logWrapper(fn server.HandlerFunc) server.HandlerFunc { diff --git a/examples/service/main.go b/examples/service/main.go index 557fc507..9b92f277 100644 --- a/examples/service/main.go +++ b/examples/service/main.go @@ -7,7 +7,7 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/service/proto" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/urfave/cli/v2" ) diff --git a/examples/service/proto/greeter.pb.micro.go b/examples/service/proto/greeter.pb.micro.go index 173fc227..628d6962 100644 --- a/examples/service/proto/greeter.pb.micro.go +++ b/examples/service/proto/greeter.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/sharding/api.go b/examples/sharding/api.go index f59391d7..cc587fa4 100644 --- a/examples/sharding/api.go +++ b/examples/sharding/api.go @@ -6,10 +6,10 @@ import ( "strings" hello "github.com/asim/go-micro/examples/v3/greeter/srv/proto/hello" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4" + "go-micro.dev/v4/errors" shard "github.com/asim/go-micro/plugins/wrapper/select/shard/v3" - api "github.com/asim/go-micro/v3/api/proto" + api "go-micro.dev/v4/api/proto" "context" ) diff --git a/examples/shutdown/main.go b/examples/shutdown/main.go index a44edbd7..15c71cc9 100644 --- a/examples/shutdown/main.go +++ b/examples/shutdown/main.go @@ -5,7 +5,7 @@ import ( "time" "context" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) func main() { diff --git a/examples/stream/client/main.go b/examples/stream/client/main.go index f7478c8b..f682d82e 100644 --- a/examples/stream/client/main.go +++ b/examples/stream/client/main.go @@ -6,7 +6,7 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/stream/server/proto" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) func bidirectional(cl proto.StreamerService) { diff --git a/examples/stream/server/main.go b/examples/stream/server/main.go index 24eae8da..1ebe854e 100644 --- a/examples/stream/server/main.go +++ b/examples/stream/server/main.go @@ -7,7 +7,7 @@ import ( "log" proto "github.com/asim/go-micro/examples/v3/stream/server/proto" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) type Streamer struct{} diff --git a/examples/stream/server/proto/stream.micro.go b/examples/stream/server/proto/stream.micro.go index fea67005..c404b7ba 100644 --- a/examples/stream/server/proto/stream.micro.go +++ b/examples/stream/server/proto/stream.micro.go @@ -19,8 +19,8 @@ import math "math" import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/examples/waitgroup/main.go b/examples/waitgroup/main.go index 09f6d4b6..9f18551b 100644 --- a/examples/waitgroup/main.go +++ b/examples/waitgroup/main.go @@ -5,8 +5,8 @@ import ( "sync" "context" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4" + "go-micro.dev/v4/server" ) // waitgroup is a handler wrapper which adds a handler to a sync.WaitGroup diff --git a/examples/wrapper/cli/main.go b/examples/wrapper/cli/main.go index df0c1043..c9fe888e 100644 --- a/examples/wrapper/cli/main.go +++ b/examples/wrapper/cli/main.go @@ -5,8 +5,8 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/service/proto" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4" + "go-micro.dev/v4/client" ) // log wrapper logs every time a request is made diff --git a/examples/wrapper/main.go b/examples/wrapper/main.go index 6c648c4e..b0ea8f57 100644 --- a/examples/wrapper/main.go +++ b/examples/wrapper/main.go @@ -6,8 +6,8 @@ import ( "context" proto "github.com/asim/go-micro/examples/v3/service/proto" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4" + "go-micro.dev/v4/server" ) type Greeter struct{} diff --git a/function.go b/function.go index 08e021af..eee6ec52 100644 --- a/function.go +++ b/function.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" ) type function struct { diff --git a/function_test.go b/function_test.go index 7eee0008..6d4759c6 100644 --- a/function_test.go +++ b/function_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - proto "github.com/asim/go-micro/v3/debug/proto" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/util/test" + proto "go-micro.dev/v4/debug/proto" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/util/test" ) func TestFunction(t *testing.T) { diff --git a/go.mod b/go.mod index 285e0f2d..d05dfe42 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/asim/go-micro/v3 +module go-micro.dev/v4 go 1.16 diff --git a/logger/default.go b/logger/default.go index 8572d9d4..df9532a0 100644 --- a/logger/default.go +++ b/logger/default.go @@ -10,7 +10,7 @@ import ( "sync" "time" - dlog "github.com/asim/go-micro/v3/debug/log" + dlog "go-micro.dev/v4/debug/log" ) func init() { diff --git a/micro.go b/micro.go index ade22f41..e1c19c03 100644 --- a/micro.go +++ b/micro.go @@ -4,8 +4,8 @@ package micro import ( "context" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/server" ) type serviceKey struct{} diff --git a/options.go b/options.go index dafc9e50..d6270626 100644 --- a/options.go +++ b/options.go @@ -4,20 +4,20 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/auth" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cache" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/config" - "github.com/asim/go-micro/v3/debug/profile" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/store" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/auth" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cache" + "go-micro.dev/v4/client" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/config" + "go-micro.dev/v4/debug/profile" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/server" + "go-micro.dev/v4/store" + "go-micro.dev/v4/transport" "github.com/urfave/cli/v2" ) diff --git a/plugins/README.md b/plugins/README.md index 94255227..de7434fd 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -52,7 +52,7 @@ Create your service and ensure you call `service.Init` package main import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" ) func main() { @@ -97,7 +97,7 @@ Import and set as options when creating a new service ```go import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/asim/go-micro/plugins/registry/kubernetes/v3" ) diff --git a/plugins/acme/certmagic/certmagic.go b/plugins/acme/certmagic/certmagic.go index abd0667f..4d64fdca 100644 --- a/plugins/acme/certmagic/certmagic.go +++ b/plugins/acme/certmagic/certmagic.go @@ -7,8 +7,8 @@ import ( "net" "time" - "github.com/asim/go-micro/v3/api/server/acme" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/api/server/acme" + "go-micro.dev/v4/logger" "github.com/caddyserver/certmagic" ) diff --git a/plugins/acme/certmagic/go.mod b/plugins/acme/certmagic/go.mod index 3c808484..a851d261 100644 --- a/plugins/acme/certmagic/go.mod +++ b/plugins/acme/certmagic/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/acme/certmagic/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/caddyserver/certmagic v0.11.2 ) diff --git a/plugins/acme/certmagic/storage.go b/plugins/acme/certmagic/storage.go index c0abc4de..c9338c21 100644 --- a/plugins/acme/certmagic/storage.go +++ b/plugins/acme/certmagic/storage.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/store" - "github.com/asim/go-micro/v3/sync" + "go-micro.dev/v4/store" + "go-micro.dev/v4/sync" "github.com/caddyserver/certmagic" ) diff --git a/plugins/auth/jwt/go.mod b/plugins/auth/jwt/go.mod index fb88e06a..0a8a03d8 100644 --- a/plugins/auth/jwt/go.mod +++ b/plugins/auth/jwt/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/auth/jwt/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible ) diff --git a/plugins/auth/jwt/jwt.go b/plugins/auth/jwt/jwt.go index b79de4f0..09830cc5 100644 --- a/plugins/auth/jwt/jwt.go +++ b/plugins/auth/jwt/jwt.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/auth" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/auth" + "go-micro.dev/v4/cmd" jwtToken "github.com/asim/go-micro/plugins/auth/jwt/v3/token" ) diff --git a/plugins/auth/jwt/token/jwt.go b/plugins/auth/jwt/token/jwt.go index 39d33da0..e09a4584 100644 --- a/plugins/auth/jwt/token/jwt.go +++ b/plugins/auth/jwt/token/jwt.go @@ -5,7 +5,7 @@ import ( "time" "github.com/dgrijalva/jwt-go" - "github.com/asim/go-micro/v3/auth" + "go-micro.dev/v4/auth" ) // authClaims to be encoded in the JWT diff --git a/plugins/auth/jwt/token/jwt_test.go b/plugins/auth/jwt/token/jwt_test.go index a36263ce..c553e3ed 100644 --- a/plugins/auth/jwt/token/jwt_test.go +++ b/plugins/auth/jwt/token/jwt_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/auth" + "go-micro.dev/v4/auth" ) func TestGenerate(t *testing.T) { diff --git a/plugins/auth/jwt/token/options.go b/plugins/auth/jwt/token/options.go index 8850952e..06d91110 100644 --- a/plugins/auth/jwt/token/options.go +++ b/plugins/auth/jwt/token/options.go @@ -3,7 +3,7 @@ package token import ( "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) type Options struct { diff --git a/plugins/auth/jwt/token/token.go b/plugins/auth/jwt/token/token.go index ce1550ef..d71162a5 100644 --- a/plugins/auth/jwt/token/token.go +++ b/plugins/auth/jwt/token/token.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/asim/go-micro/v3/auth" + "go-micro.dev/v4/auth" ) var ( diff --git a/plugins/broker/gocloud/go.mod b/plugins/broker/gocloud/go.mod index 4df31104..5e4a4507 100644 --- a/plugins/broker/gocloud/go.mod +++ b/plugins/broker/gocloud/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/gocloud/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/streadway/amqp v1.0.0 gocloud.dev v0.17.0 gocloud.dev/pubsub/rabbitpubsub v0.17.0 diff --git a/plugins/broker/gocloud/gocloud.go b/plugins/broker/gocloud/gocloud.go index 0318a7ca..07af2e74 100644 --- a/plugins/broker/gocloud/gocloud.go +++ b/plugins/broker/gocloud/gocloud.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" "github.com/streadway/amqp" "gocloud.dev/gcp" "gocloud.dev/pubsub" diff --git a/plugins/broker/gocloud/gocloud_test.go b/plugins/broker/gocloud/gocloud_test.go index 8387906c..d62bb491 100644 --- a/plugins/broker/gocloud/gocloud_test.go +++ b/plugins/broker/gocloud/gocloud_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func TestBroker(t *testing.T) { diff --git a/plugins/broker/gocloud/options.go b/plugins/broker/gocloud/options.go index e1e11bba..203e781e 100644 --- a/plugins/broker/gocloud/options.go +++ b/plugins/broker/gocloud/options.go @@ -3,7 +3,7 @@ package gocloud import ( "context" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" "gocloud.dev/gcp" ) diff --git a/plugins/broker/googlepubsub/go.mod b/plugins/broker/googlepubsub/go.mod index eed27cfb..ee15a5de 100644 --- a/plugins/broker/googlepubsub/go.mod +++ b/plugins/broker/googlepubsub/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( cloud.google.com/go/pubsub v1.12.0 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 google.golang.org/api v0.49.0 google.golang.org/grpc v1.38.0 diff --git a/plugins/broker/googlepubsub/googlepubsub.go b/plugins/broker/googlepubsub/googlepubsub.go index cd22a7f6..38271fed 100644 --- a/plugins/broker/googlepubsub/googlepubsub.go +++ b/plugins/broker/googlepubsub/googlepubsub.go @@ -8,9 +8,9 @@ import ( "cloud.google.com/go/pubsub" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" "google.golang.org/api/option" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/plugins/broker/googlepubsub/options.go b/plugins/broker/googlepubsub/options.go index e9c74404..85ff8c48 100644 --- a/plugins/broker/googlepubsub/options.go +++ b/plugins/broker/googlepubsub/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" "google.golang.org/api/option" ) diff --git a/plugins/broker/grpc/go.mod b/plugins/broker/grpc/go.mod index d0045133..93c9e31f 100644 --- a/plugins/broker/grpc/go.mod +++ b/plugins/broker/grpc/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.2.0 golang.org/x/net v0.0.0-20210510120150-4163338589ed diff --git a/plugins/broker/grpc/grpc.go b/plugins/broker/grpc/grpc.go index c9d801b6..df6c1a3b 100644 --- a/plugins/broker/grpc/grpc.go +++ b/plugins/broker/grpc/grpc.go @@ -14,15 +14,15 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - merr "github.com/asim/go-micro/v3/errors" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/registry/cache" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + merr "go-micro.dev/v4/errors" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/registry/cache" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" proto "github.com/asim/go-micro/plugins/broker/grpc/v3/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -62,7 +62,7 @@ type grpcEvent struct { } var ( - registryKey = "github.com/asim/go-micro/v3/registry" + registryKey = "go-micro.dev/v4/registry" broadcastVersion = "ff.grpc.broadcast" registerTTL = time.Minute diff --git a/plugins/broker/grpc/grpc_test.go b/plugins/broker/grpc/grpc_test.go index 6ba449b7..f9e6bf91 100644 --- a/plugins/broker/grpc/grpc_test.go +++ b/plugins/broker/grpc/grpc_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" "github.com/asim/go-micro/plugins/registry/memory/v3" ) diff --git a/plugins/broker/http/go.mod b/plugins/broker/http/go.mod index 4dda3123..31dc9a9f 100644 --- a/plugins/broker/http/go.mod +++ b/plugins/broker/http/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 golang.org/x/net v0.0.0-20210510120150-4163338589ed ) diff --git a/plugins/broker/http/http.go b/plugins/broker/http/http.go index a09d4b2f..6d8b8a5d 100644 --- a/plugins/broker/http/http.go +++ b/plugins/broker/http/http.go @@ -18,15 +18,15 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" - merr "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/registry/cache" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" + merr "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/registry/cache" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" "golang.org/x/net/http2" ) diff --git a/plugins/broker/http/http_test.go b/plugins/broker/http/http_test.go index ca939815..41147b2e 100644 --- a/plugins/broker/http/http_test.go +++ b/plugins/broker/http/http_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/registry/memory/v3" ) diff --git a/plugins/broker/kafka/context.go b/plugins/broker/kafka/context.go index c8160840..a586b021 100644 --- a/plugins/broker/kafka/context.go +++ b/plugins/broker/kafka/context.go @@ -3,8 +3,8 @@ package kafka import ( "context" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/server" ) // setSubscribeOption returns a function to setup a context with given value diff --git a/plugins/broker/kafka/go.mod b/plugins/broker/kafka/go.mod index de514970..50b1c4d1 100644 --- a/plugins/broker/kafka/go.mod +++ b/plugins/broker/kafka/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/Shopify/sarama v1.29.1 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 ) diff --git a/plugins/broker/kafka/kafka.go b/plugins/broker/kafka/kafka.go index f15f30dd..905c9973 100644 --- a/plugins/broker/kafka/kafka.go +++ b/plugins/broker/kafka/kafka.go @@ -7,10 +7,10 @@ import ( "github.com/Shopify/sarama" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" ) type kBroker struct { diff --git a/plugins/broker/kafka/options.go b/plugins/broker/kafka/options.go index 0ab9551b..32d67e61 100644 --- a/plugins/broker/kafka/options.go +++ b/plugins/broker/kafka/options.go @@ -4,8 +4,8 @@ import ( "context" "github.com/Shopify/sarama" - "github.com/asim/go-micro/v3/broker" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + log "go-micro.dev/v4/logger" ) var ( diff --git a/plugins/broker/memory/go.mod b/plugins/broker/memory/go.mod index 683c885d..62fdebe6 100644 --- a/plugins/broker/memory/go.mod +++ b/plugins/broker/memory/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/memory/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 ) diff --git a/plugins/broker/memory/memory.go b/plugins/broker/memory/memory.go index 5299ad4c..2722d345 100644 --- a/plugins/broker/memory/memory.go +++ b/plugins/broker/memory/memory.go @@ -9,11 +9,11 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/logger" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/logger" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" ) func init() { diff --git a/plugins/broker/memory/memory_test.go b/plugins/broker/memory/memory_test.go index 19672e2a..026545c4 100644 --- a/plugins/broker/memory/memory_test.go +++ b/plugins/broker/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func TestMemoryBroker(t *testing.T) { diff --git a/plugins/broker/mqtt/README.md b/plugins/broker/mqtt/README.md index 3a4e4867..a66e638f 100644 --- a/plugins/broker/mqtt/README.md +++ b/plugins/broker/mqtt/README.md @@ -20,7 +20,7 @@ Alternatively use directly ```go import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/asim/go-micro/plugins/broker/mqtt" ) diff --git a/plugins/broker/mqtt/go.mod b/plugins/broker/mqtt/go.mod index 2f169bab..0c916ace 100644 --- a/plugins/broker/mqtt/go.mod +++ b/plugins/broker/mqtt/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/mqtt/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/eclipse/paho.mqtt.golang v1.3.5 ) diff --git a/plugins/broker/mqtt/mqtt.go b/plugins/broker/mqtt/mqtt.go index af680e2f..93032689 100644 --- a/plugins/broker/mqtt/mqtt.go +++ b/plugins/broker/mqtt/mqtt.go @@ -22,10 +22,10 @@ import ( "time" mqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" ) type mqttBroker struct { diff --git a/plugins/broker/mqtt/mqtt_handler.go b/plugins/broker/mqtt/mqtt_handler.go index c6f12c5c..71bc03f2 100644 --- a/plugins/broker/mqtt/mqtt_handler.go +++ b/plugins/broker/mqtt/mqtt_handler.go @@ -2,7 +2,7 @@ package mqtt import ( mqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) // mqttPub is a broker.Event diff --git a/plugins/broker/mqtt/mqtt_test.go b/plugins/broker/mqtt/mqtt_test.go index 61279001..1da57991 100644 --- a/plugins/broker/mqtt/mqtt_test.go +++ b/plugins/broker/mqtt/mqtt_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/eclipse/paho.mqtt.golang" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func TestMQTTMock(t *testing.T) { diff --git a/plugins/broker/nats/context.go b/plugins/broker/nats/context.go index 127fa771..014c763c 100644 --- a/plugins/broker/nats/context.go +++ b/plugins/broker/nats/context.go @@ -3,7 +3,7 @@ package nats import ( "context" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) // setBrokerOption returns a function to setup a context with given value diff --git a/plugins/broker/nats/go.mod b/plugins/broker/nats/go.mod index b8dd960d..04343919 100644 --- a/plugins/broker/nats/go.mod +++ b/plugins/broker/nats/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/nats/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/nats-io/nats-server/v2 v2.3.1 // indirect github.com/nats-io/nats.go v1.11.1-0.20210623165838-4b75fc59ae30 ) diff --git a/plugins/broker/nats/nats.go b/plugins/broker/nats/nats.go index dfa2eaca..771d5900 100644 --- a/plugins/broker/nats/nats.go +++ b/plugins/broker/nats/nats.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" nats "github.com/nats-io/nats.go" ) diff --git a/plugins/broker/nats/nats_test.go b/plugins/broker/nats/nats_test.go index cf5dd57e..03b988d3 100644 --- a/plugins/broker/nats/nats_test.go +++ b/plugins/broker/nats/nats_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" nats "github.com/nats-io/nats.go" ) diff --git a/plugins/broker/nats/options.go b/plugins/broker/nats/options.go index 635ff6ef..b9b1ff78 100644 --- a/plugins/broker/nats/options.go +++ b/plugins/broker/nats/options.go @@ -1,7 +1,7 @@ package nats import ( - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" nats "github.com/nats-io/nats.go" ) diff --git a/plugins/broker/nsq/go.mod b/plugins/broker/nsq/go.mod index 9789d075..3dcfb677 100644 --- a/plugins/broker/nsq/go.mod +++ b/plugins/broker/nsq/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/nsq/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 github.com/nsqio/go-nsq v1.0.8 ) diff --git a/plugins/broker/nsq/nsq.go b/plugins/broker/nsq/nsq.go index bb72c4c5..2df97950 100644 --- a/plugins/broker/nsq/nsq.go +++ b/plugins/broker/nsq/nsq.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" "github.com/nsqio/go-nsq" ) diff --git a/plugins/broker/nsq/options.go b/plugins/broker/nsq/options.go index 2d621297..3a30b919 100644 --- a/plugins/broker/nsq/options.go +++ b/plugins/broker/nsq/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" nsq "github.com/nsqio/go-nsq" ) diff --git a/plugins/broker/proxy/go.mod b/plugins/broker/proxy/go.mod index e63611c4..6c377c6c 100644 --- a/plugins/broker/proxy/go.mod +++ b/plugins/broker/proxy/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/proxy/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/gorilla/websocket v1.4.2 ) diff --git a/plugins/broker/proxy/proxy.go b/plugins/broker/proxy/proxy.go index 6083d616..d0a96b17 100644 --- a/plugins/broker/proxy/proxy.go +++ b/plugins/broker/proxy/proxy.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "net/http" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" ) type sidecar struct { diff --git a/plugins/broker/proxy/publication.go b/plugins/broker/proxy/publication.go index 8063aa47..fb48006c 100644 --- a/plugins/broker/proxy/publication.go +++ b/plugins/broker/proxy/publication.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) type publication struct { diff --git a/plugins/broker/proxy/subscriber.go b/plugins/broker/proxy/subscriber.go index 3f9899c5..8240ce66 100644 --- a/plugins/broker/proxy/subscriber.go +++ b/plugins/broker/proxy/subscriber.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/asim/go-micro/v3/broker" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + log "go-micro.dev/v4/logger" ) const ( diff --git a/plugins/broker/rabbitmq/connection.go b/plugins/broker/rabbitmq/connection.go index beeac877..9adca67d 100644 --- a/plugins/broker/rabbitmq/connection.go +++ b/plugins/broker/rabbitmq/connection.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" "github.com/streadway/amqp" ) diff --git a/plugins/broker/rabbitmq/context.go b/plugins/broker/rabbitmq/context.go index 33722b62..429d024c 100644 --- a/plugins/broker/rabbitmq/context.go +++ b/plugins/broker/rabbitmq/context.go @@ -3,8 +3,8 @@ package rabbitmq import ( "context" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/server" ) // setSubscribeOption returns a function to setup a context with given value diff --git a/plugins/broker/rabbitmq/go.mod b/plugins/broker/rabbitmq/go.mod index 677d2ebe..63c723c9 100644 --- a/plugins/broker/rabbitmq/go.mod +++ b/plugins/broker/rabbitmq/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/rabbitmq/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 github.com/streadway/amqp v1.0.0 ) diff --git a/plugins/broker/rabbitmq/options.go b/plugins/broker/rabbitmq/options.go index b45f6353..f3b6114c 100644 --- a/plugins/broker/rabbitmq/options.go +++ b/plugins/broker/rabbitmq/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) type durableQueueKey struct{} diff --git a/plugins/broker/rabbitmq/rabbitmq.go b/plugins/broker/rabbitmq/rabbitmq.go index 4acc0f49..03244b71 100644 --- a/plugins/broker/rabbitmq/rabbitmq.go +++ b/plugins/broker/rabbitmq/rabbitmq.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" "github.com/streadway/amqp" ) diff --git a/plugins/broker/rabbitmq/rabbitmq_test.go b/plugins/broker/rabbitmq/rabbitmq_test.go index f70e66e8..81541245 100644 --- a/plugins/broker/rabbitmq/rabbitmq_test.go +++ b/plugins/broker/rabbitmq/rabbitmq_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - micro "github.com/asim/go-micro/v3" - broker "github.com/asim/go-micro/v3/broker" - server "github.com/asim/go-micro/v3/server" + micro "go-micro.dev/v4" + broker "go-micro.dev/v4/broker" + server "go-micro.dev/v4/server" rabbitmq "github.com/asim/go-micro/plugins/broker/rabbitmq/v3" ) diff --git a/plugins/broker/redis/go.mod b/plugins/broker/redis/go.mod index fd216855..bebb7c88 100644 --- a/plugins/broker/redis/go.mod +++ b/plugins/broker/redis/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/redis/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/gomodule/redigo v1.8.5 ) diff --git a/plugins/broker/redis/options.go b/plugins/broker/redis/options.go index ee401574..f4980430 100644 --- a/plugins/broker/redis/options.go +++ b/plugins/broker/redis/options.go @@ -3,7 +3,7 @@ package redis import ( "time" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) var ( diff --git a/plugins/broker/redis/redis.go b/plugins/broker/redis/redis.go index 6db218dd..437c81ac 100644 --- a/plugins/broker/redis/redis.go +++ b/plugins/broker/redis/redis.go @@ -8,10 +8,10 @@ import ( "time" "github.com/gomodule/redigo/redis" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" ) func init() { diff --git a/plugins/broker/redis/redis_test.go b/plugins/broker/redis/redis_test.go index 9addb221..b5743455 100644 --- a/plugins/broker/redis/redis_test.go +++ b/plugins/broker/redis/redis_test.go @@ -7,7 +7,7 @@ import ( "sort" "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func subscribe(t *testing.T, b broker.Broker, topic string, handle broker.Handler) broker.Subscriber { diff --git a/plugins/broker/segmentio/broker_test.go b/plugins/broker/segmentio/broker_test.go index 9d658da7..b6946d9c 100644 --- a/plugins/broker/segmentio/broker_test.go +++ b/plugins/broker/segmentio/broker_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" segmentio "github.com/asim/go-micro/plugins/broker/segmentio/v3" ) diff --git a/plugins/broker/segmentio/context.go b/plugins/broker/segmentio/context.go index 6fa08c73..db0a2e4a 100644 --- a/plugins/broker/segmentio/context.go +++ b/plugins/broker/segmentio/context.go @@ -3,8 +3,8 @@ package segmentio import ( "context" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/server" ) // setSubscribeOption returns a function to setup a context with given value diff --git a/plugins/broker/segmentio/go.mod b/plugins/broker/segmentio/go.mod index 8b1fc494..91edd875 100644 --- a/plugins/broker/segmentio/go.mod +++ b/plugins/broker/segmentio/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/broker/kafka/v3 v3.5.1 github.com/asim/go-micro/plugins/codec/segmentio/v3 v3.5.1 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 github.com/segmentio/kafka-go v0.4.16 ) diff --git a/plugins/broker/segmentio/options.go b/plugins/broker/segmentio/options.go index 14c73649..80a05827 100644 --- a/plugins/broker/segmentio/options.go +++ b/plugins/broker/segmentio/options.go @@ -3,7 +3,7 @@ package segmentio import ( "context" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" "github.com/segmentio/kafka-go" ) diff --git a/plugins/broker/segmentio/sarama_test.go b/plugins/broker/segmentio/sarama_test.go index 79341544..4191ca25 100644 --- a/plugins/broker/segmentio/sarama_test.go +++ b/plugins/broker/segmentio/sarama_test.go @@ -8,7 +8,7 @@ import ( sarama "github.com/asim/go-micro/plugins/broker/kafka/v3" segjson "github.com/asim/go-micro/plugins/codec/segmentio/v3" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func BenchmarkSaramaCodecJsonPublish(b *testing.B) { diff --git a/plugins/broker/segmentio/segmentio.go b/plugins/broker/segmentio/segmentio.go index fa6879d2..1842ce2e 100644 --- a/plugins/broker/segmentio/segmentio.go +++ b/plugins/broker/segmentio/segmentio.go @@ -8,10 +8,10 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/logger" kafka "github.com/segmentio/kafka-go" ) diff --git a/plugins/broker/segmentio/segmentio_test.go b/plugins/broker/segmentio/segmentio_test.go index fa1b0557..75b3d5ee 100644 --- a/plugins/broker/segmentio/segmentio_test.go +++ b/plugins/broker/segmentio/segmentio_test.go @@ -8,7 +8,7 @@ import ( "github.com/asim/go-micro/plugins/broker/segmentio/v3" segjson "github.com/asim/go-micro/plugins/codec/segmentio/v3" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func BenchmarkSegmentioCodecJsonPublish(b *testing.B) { diff --git a/plugins/broker/snssqs/context.go b/plugins/broker/snssqs/context.go index 6fc8fb93..21306613 100644 --- a/plugins/broker/snssqs/context.go +++ b/plugins/broker/snssqs/context.go @@ -3,9 +3,9 @@ package snssqs import ( "context" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/client" + "go-micro.dev/v4/server" ) // setSubscribeOption returns a function to setup a context with given value diff --git a/plugins/broker/snssqs/go.mod b/plugins/broker/snssqs/go.mod index 9c5fe090..5a13b6ea 100644 --- a/plugins/broker/snssqs/go.mod +++ b/plugins/broker/snssqs/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/snssqs/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.38.69 golang.org/x/text v0.3.6 ) diff --git a/plugins/broker/snssqs/options.go b/plugins/broker/snssqs/options.go index e0510fb3..8cff9910 100644 --- a/plugins/broker/snssqs/options.go +++ b/plugins/broker/snssqs/options.go @@ -2,8 +2,8 @@ package snssqs import ( "github.com/aws/aws-sdk-go/aws" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/client" ) type maxMessagesKey struct{} diff --git a/plugins/broker/snssqs/snssqs.go b/plugins/broker/snssqs/snssqs.go index 04ff6d69..29392b34 100644 --- a/plugins/broker/snssqs/snssqs.go +++ b/plugins/broker/snssqs/snssqs.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-sdk-go/service/sns" "github.com/aws/aws-sdk-go/service/sqs" "github.com/aws/aws-sdk-go/service/sts" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/logger" ) type sessClientKey struct{} diff --git a/plugins/broker/snssqs/snssqs_test.go b/plugins/broker/snssqs/snssqs_test.go index 9a254b37..146aca82 100644 --- a/plugins/broker/snssqs/snssqs_test.go +++ b/plugins/broker/snssqs/snssqs_test.go @@ -3,7 +3,7 @@ package snssqs import ( "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) func TestValidate(t *testing.T) { diff --git a/plugins/broker/sqs/go.mod b/plugins/broker/sqs/go.mod index 8154adc1..2297f00f 100644 --- a/plugins/broker/sqs/go.mod +++ b/plugins/broker/sqs/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/sqs/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.38.69 ) diff --git a/plugins/broker/sqs/options.go b/plugins/broker/sqs/options.go index 88ee0537..884dc872 100644 --- a/plugins/broker/sqs/options.go +++ b/plugins/broker/sqs/options.go @@ -4,7 +4,7 @@ import ( "context" "github.com/aws/aws-sdk-go/service/sqs" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) type sqsClientKey struct{} diff --git a/plugins/broker/sqs/sqs.go b/plugins/broker/sqs/sqs.go index 40edbe08..c803a050 100644 --- a/plugins/broker/sqs/sqs.go +++ b/plugins/broker/sqs/sqs.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sqs" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" ) const ( diff --git a/plugins/broker/stan/context.go b/plugins/broker/stan/context.go index 0b34912d..81ff6f26 100644 --- a/plugins/broker/stan/context.go +++ b/plugins/broker/stan/context.go @@ -3,8 +3,8 @@ package stan import ( "context" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/server" ) // setSubscribeOption returns a function to setup a context with given value diff --git a/plugins/broker/stan/go.mod b/plugins/broker/stan/go.mod index 552e7d89..afa4f579 100644 --- a/plugins/broker/stan/go.mod +++ b/plugins/broker/stan/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/stan/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 github.com/nats-io/nats-server/v2 v2.3.0 // indirect github.com/nats-io/nats-streaming-server v0.22.0 // indirect diff --git a/plugins/broker/stan/options.go b/plugins/broker/stan/options.go index 01b0e196..4ef8532a 100644 --- a/plugins/broker/stan/options.go +++ b/plugins/broker/stan/options.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/server" stan "github.com/nats-io/stan.go" ) diff --git a/plugins/broker/stan/stan.go b/plugins/broker/stan/stan.go index 61238202..68512e57 100644 --- a/plugins/broker/stan/stan.go +++ b/plugins/broker/stan/stan.go @@ -10,10 +10,10 @@ import ( "time" "github.com/google/uuid" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" stan "github.com/nats-io/stan.go" ) diff --git a/plugins/broker/stan/stan_test.go b/plugins/broker/stan/stan_test.go index b1e7dd88..9f9f8c80 100644 --- a/plugins/broker/stan/stan_test.go +++ b/plugins/broker/stan/stan_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" stan "github.com/nats-io/stan.go" ) diff --git a/plugins/broker/stomp/context.go b/plugins/broker/stomp/context.go index fbaa3a43..35ea44f9 100644 --- a/plugins/broker/stomp/context.go +++ b/plugins/broker/stomp/context.go @@ -3,7 +3,7 @@ package stomp import ( "context" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) // Context related keys and funcs diff --git a/plugins/broker/stomp/go.mod b/plugins/broker/stomp/go.mod index a6a8cb2c..0e959cf2 100644 --- a/plugins/broker/stomp/go.mod +++ b/plugins/broker/stomp/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/broker/stomp/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/go-stomp/stomp/v3 v3.0.1 ) diff --git a/plugins/broker/stomp/options.go b/plugins/broker/stomp/options.go index f6b8c5bd..a0109c4a 100644 --- a/plugins/broker/stomp/options.go +++ b/plugins/broker/stomp/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" ) // SubscribeHeaders sets headers for subscriptions diff --git a/plugins/broker/stomp/publication.go b/plugins/broker/stomp/publication.go index 0041408d..2111eef0 100644 --- a/plugins/broker/stomp/publication.go +++ b/plugins/broker/stomp/publication.go @@ -1,7 +1,7 @@ package stomp import ( - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" "github.com/go-stomp/stomp/v3" ) diff --git a/plugins/broker/stomp/stomp.go b/plugins/broker/stomp/stomp.go index 7be89fc2..1d7523ad 100644 --- a/plugins/broker/stomp/stomp.go +++ b/plugins/broker/stomp/stomp.go @@ -9,8 +9,8 @@ import ( "net/url" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" "github.com/go-stomp/stomp/v3" "github.com/go-stomp/stomp/v3/frame" ) diff --git a/plugins/broker/stomp/subscriber.go b/plugins/broker/stomp/subscriber.go index 7d6fa648..f7715b1d 100644 --- a/plugins/broker/stomp/subscriber.go +++ b/plugins/broker/stomp/subscriber.go @@ -1,7 +1,7 @@ package stomp import ( - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" "github.com/go-stomp/stomp/v3" ) diff --git a/plugins/client/grpc/codec.go b/plugins/client/grpc/codec.go index 509a2200..0da1f976 100644 --- a/plugins/client/grpc/codec.go +++ b/plugins/client/grpc/codec.go @@ -9,8 +9,8 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/bytes" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/bytes" "github.com/oxtoacart/bpool" "google.golang.org/grpc" "google.golang.org/grpc/encoding" diff --git a/plugins/client/grpc/error.go b/plugins/client/grpc/error.go index f87725bc..33f0caff 100644 --- a/plugins/client/grpc/error.go +++ b/plugins/client/grpc/error.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "net/http" diff --git a/plugins/client/grpc/go.mod b/plugins/client/grpc/go.mod index 845dc458..4e3e04e8 100644 --- a/plugins/client/grpc/go.mod +++ b/plugins/client/grpc/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c google.golang.org/grpc v1.38.0 diff --git a/plugins/client/grpc/grpc.go b/plugins/client/grpc/grpc.go index c97fd004..1dae28d9 100644 --- a/plugins/client/grpc/grpc.go +++ b/plugins/client/grpc/grpc.go @@ -11,15 +11,15 @@ import ( "sync/atomic" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/client" - raw "github.com/asim/go-micro/v3/codec/bytes" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" - pnet "github.com/asim/go-micro/v3/util/net" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/client" + raw "go-micro.dev/v4/codec/bytes" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" + pnet "go-micro.dev/v4/util/net" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/plugins/client/grpc/grpc_test.go b/plugins/client/grpc/grpc_test.go index cb178c62..23450da1 100644 --- a/plugins/client/grpc/grpc_test.go +++ b/plugins/client/grpc/grpc_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/client" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" pgrpc "google.golang.org/grpc" pb "google.golang.org/grpc/examples/helloworld/helloworld" ) diff --git a/plugins/client/grpc/message.go b/plugins/client/grpc/message.go index 352f7bd8..28cc6f2c 100644 --- a/plugins/client/grpc/message.go +++ b/plugins/client/grpc/message.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) type grpcEvent struct { diff --git a/plugins/client/grpc/options.go b/plugins/client/grpc/options.go index c576270e..678b231b 100644 --- a/plugins/client/grpc/options.go +++ b/plugins/client/grpc/options.go @@ -5,7 +5,7 @@ import ( "context" "crypto/tls" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/plugins/client/grpc/request.go b/plugins/client/grpc/request.go index 1a57ff94..9b2aa78f 100644 --- a/plugins/client/grpc/request.go +++ b/plugins/client/grpc/request.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/client" + "go-micro.dev/v4/codec" ) type grpcRequest struct { diff --git a/plugins/client/grpc/response.go b/plugins/client/grpc/response.go index 227aac7a..d5d65f63 100644 --- a/plugins/client/grpc/response.go +++ b/plugins/client/grpc/response.go @@ -3,8 +3,8 @@ package grpc import ( "strings" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/bytes" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/bytes" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/plugins/client/grpc/stream.go b/plugins/client/grpc/stream.go index 51165734..6d3fca06 100644 --- a/plugins/client/grpc/stream.go +++ b/plugins/client/grpc/stream.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" "google.golang.org/grpc" ) diff --git a/plugins/client/http/codec.go b/plugins/client/http/codec.go index 3d8566c4..8d773512 100644 --- a/plugins/client/http/codec.go +++ b/plugins/client/http/codec.go @@ -4,9 +4,9 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/jsonrpc" - "github.com/asim/go-micro/v3/codec/protorpc" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/jsonrpc" + "go-micro.dev/v4/codec/protorpc" ) type jsonCodec struct{} diff --git a/plugins/client/http/go.mod b/plugins/client/http/go.mod index 57733c42..88c0e65f 100644 --- a/plugins/client/http/go.mod +++ b/plugins/client/http/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 ) diff --git a/plugins/client/http/http.go b/plugins/client/http/http.go index f0ed9333..9c549927 100644 --- a/plugins/client/http/http.go +++ b/plugins/client/http/http.go @@ -15,16 +15,16 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/codec" - raw "github.com/asim/go-micro/v3/codec/bytes" - errors "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/client" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/codec" + raw "go-micro.dev/v4/codec/bytes" + errors "go-micro.dev/v4/errors" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/transport" ) type httpClient struct { diff --git a/plugins/client/http/http_test.go b/plugins/client/http/http_test.go index eb919807..ce32d169 100644 --- a/plugins/client/http/http_test.go +++ b/plugins/client/http/http_test.go @@ -12,9 +12,9 @@ import ( "github.com/asim/go-micro/plugins/client/http/v3/test" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/client" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" ) func TestHTTPClient(t *testing.T) { diff --git a/plugins/client/http/message.go b/plugins/client/http/message.go index 4c73b356..621412c8 100644 --- a/plugins/client/http/message.go +++ b/plugins/client/http/message.go @@ -1,7 +1,7 @@ package http import ( - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) type httpMessage struct { diff --git a/plugins/client/http/request.go b/plugins/client/http/request.go index 07e9896e..b4202579 100644 --- a/plugins/client/http/request.go +++ b/plugins/client/http/request.go @@ -1,8 +1,8 @@ package http import ( - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/client" + "go-micro.dev/v4/codec" ) type httpRequest struct { diff --git a/plugins/client/http/stream.go b/plugins/client/http/stream.go index f18973d0..f2b41c83 100644 --- a/plugins/client/http/stream.go +++ b/plugins/client/http/stream.go @@ -11,7 +11,7 @@ import ( "net/url" "sync" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) // Implements the streamer interface diff --git a/plugins/client/mock/go.mod b/plugins/client/mock/go.mod index 44ffc963..2d6fdc81 100644 --- a/plugins/client/mock/go.mod +++ b/plugins/client/mock/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/client/mock/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/client/mock/mock.go b/plugins/client/mock/mock.go index d0bad286..3a2bcedb 100644 --- a/plugins/client/mock/mock.go +++ b/plugins/client/mock/mock.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/client" + "go-micro.dev/v4/errors" ) var ( diff --git a/plugins/client/mock/mock_test.go b/plugins/client/mock/mock_test.go index 3342cdc0..08752fbf 100644 --- a/plugins/client/mock/mock_test.go +++ b/plugins/client/mock/mock_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/errors" ) func TestClient(t *testing.T) { diff --git a/plugins/client/mock/options.go b/plugins/client/mock/options.go index b0caf32a..948a6cb2 100644 --- a/plugins/client/mock/options.go +++ b/plugins/client/mock/options.go @@ -1,7 +1,7 @@ package mock import ( - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) // Response sets the response methods for a service diff --git a/plugins/client/mucp/go.mod b/plugins/client/mucp/go.mod index e5baefc6..ba999cd2 100644 --- a/plugins/client/mucp/go.mod +++ b/plugins/client/mucp/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/client/mucp/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/client/mucp/mucp.go b/plugins/client/mucp/mucp.go index cb660edf..fb6acc3c 100644 --- a/plugins/client/mucp/mucp.go +++ b/plugins/client/mucp/mucp.go @@ -2,8 +2,8 @@ package mucp import ( - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/client" ) func init() { diff --git a/plugins/codec/bsonrpc/bsonrpc.go b/plugins/codec/bsonrpc/bsonrpc.go index d22b42b4..51568583 100644 --- a/plugins/codec/bsonrpc/bsonrpc.go +++ b/plugins/codec/bsonrpc/bsonrpc.go @@ -7,7 +7,7 @@ import ( "io" "github.com/asim/go-bson" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type bsonCodec struct { diff --git a/plugins/codec/bsonrpc/codec.go b/plugins/codec/bsonrpc/codec.go index cd57b203..b89dc177 100644 --- a/plugins/codec/bsonrpc/codec.go +++ b/plugins/codec/bsonrpc/codec.go @@ -4,7 +4,7 @@ import ( "io" "github.com/asim/go-bson" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type clientCodec struct { diff --git a/plugins/codec/bsonrpc/go.mod b/plugins/codec/bsonrpc/go.mod index 8601ce38..08cc9e8e 100644 --- a/plugins/codec/bsonrpc/go.mod +++ b/plugins/codec/bsonrpc/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-bson v0.0.0-20160318195205-84522947cabd - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/codec/json-iterator/go.mod b/plugins/codec/json-iterator/go.mod index ed67f47c..954d9761 100644 --- a/plugins/codec/json-iterator/go.mod +++ b/plugins/codec/json-iterator/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/codec/json-iterator/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 github.com/json-iterator/go v1.1.11 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c diff --git a/plugins/codec/json-iterator/json.go b/plugins/codec/json-iterator/json.go index 6e92f67b..8c2bc82f 100644 --- a/plugins/codec/json-iterator/json.go +++ b/plugins/codec/json-iterator/json.go @@ -6,7 +6,7 @@ import ( "io" jsoniter "github.com/json-iterator/go" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type Codec struct { diff --git a/plugins/codec/jsonrpc2/README.md b/plugins/codec/jsonrpc2/README.md index 61eb24d8..e4bfde9c 100644 --- a/plugins/codec/jsonrpc2/README.md +++ b/plugins/codec/jsonrpc2/README.md @@ -7,7 +7,7 @@ Import the codec and set within the client/server package main import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/micro/go-micro/client" "github.com/micro/go-micro/server" "github.com/asim/go-micro/plugins/codec/jsonrpc2" diff --git a/plugins/codec/jsonrpc2/client.go b/plugins/codec/jsonrpc2/client.go index ea3ef83f..04665962 100644 --- a/plugins/codec/jsonrpc2/client.go +++ b/plugins/codec/jsonrpc2/client.go @@ -9,7 +9,7 @@ import ( "strconv" "sync" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) const seqNotify = math.MaxUint64 diff --git a/plugins/codec/jsonrpc2/go.mod b/plugins/codec/jsonrpc2/go.mod index d8723710..2c8b9002 100644 --- a/plugins/codec/jsonrpc2/go.mod +++ b/plugins/codec/jsonrpc2/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/codec/jsonrpc2/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/codec/jsonrpc2/jsonrpc2.go b/plugins/codec/jsonrpc2/jsonrpc2.go index 0979c095..73df4572 100644 --- a/plugins/codec/jsonrpc2/jsonrpc2.go +++ b/plugins/codec/jsonrpc2/jsonrpc2.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type jsonCodec struct { diff --git a/plugins/codec/jsonrpc2/server.go b/plugins/codec/jsonrpc2/server.go index 533ea303..55c454b3 100644 --- a/plugins/codec/jsonrpc2/server.go +++ b/plugins/codec/jsonrpc2/server.go @@ -7,7 +7,7 @@ import ( "io" "sync" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type serverCodec struct { diff --git a/plugins/codec/msgpackrpc/README.md b/plugins/codec/msgpackrpc/README.md index 0dfe513c..b7f78613 100644 --- a/plugins/codec/msgpackrpc/README.md +++ b/plugins/codec/msgpackrpc/README.md @@ -8,7 +8,7 @@ package main import ( "github.com/asim/go-micro/plugins/codec/msgpackrpc" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/micro/go-micro/client" "github.com/micro/go-micro/server" ) diff --git a/plugins/codec/msgpackrpc/codec.go b/plugins/codec/msgpackrpc/codec.go index 298bead2..ef36952b 100644 --- a/plugins/codec/msgpackrpc/codec.go +++ b/plugins/codec/msgpackrpc/codec.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" "github.com/tinylib/msgp/msgp" ) diff --git a/plugins/codec/msgpackrpc/go.mod b/plugins/codec/msgpackrpc/go.mod index fdc8b2ab..3a2ef476 100644 --- a/plugins/codec/msgpackrpc/go.mod +++ b/plugins/codec/msgpackrpc/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/codec/msgpackrpc/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/tinylib/msgp v1.1.6 ) diff --git a/plugins/codec/segmentio/go.mod b/plugins/codec/segmentio/go.mod index cff2ad96..280afbb9 100644 --- a/plugins/codec/segmentio/go.mod +++ b/plugins/codec/segmentio/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/codec/segmentio/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c github.com/segmentio/encoding v0.1.12 diff --git a/plugins/codec/segmentio/json.go b/plugins/codec/segmentio/json.go index abe8d37c..750c363c 100644 --- a/plugins/codec/segmentio/json.go +++ b/plugins/codec/segmentio/json.go @@ -6,7 +6,7 @@ import ( "io" "github.com/golang/protobuf/proto" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" segjson "github.com/segmentio/encoding/json" ) diff --git a/plugins/config/encoder/cue/cue.go b/plugins/config/encoder/cue/cue.go index af58a0ab..099c8a59 100644 --- a/plugins/config/encoder/cue/cue.go +++ b/plugins/config/encoder/cue/cue.go @@ -3,7 +3,7 @@ package cue import ( "cuelang.org/go/cue" "github.com/ghodss/yaml" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type cueEncoder struct{} diff --git a/plugins/config/encoder/cue/go.mod b/plugins/config/encoder/cue/go.mod index f2b84279..7579461a 100644 --- a/plugins/config/encoder/cue/go.mod +++ b/plugins/config/encoder/cue/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( cuelang.org/go v0.0.15 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/ghodss/yaml v1.0.0 github.com/stretchr/testify v1.7.0 ) diff --git a/plugins/config/encoder/hcl/go.mod b/plugins/config/encoder/hcl/go.mod index ca5bb99f..3ad5202d 100644 --- a/plugins/config/encoder/hcl/go.mod +++ b/plugins/config/encoder/hcl/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/encoder/hcl/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/hashicorp/hcl v1.0.0 ) diff --git a/plugins/config/encoder/hcl/hcl.go b/plugins/config/encoder/hcl/hcl.go index ea3fff8d..fd333667 100644 --- a/plugins/config/encoder/hcl/hcl.go +++ b/plugins/config/encoder/hcl/hcl.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/hashicorp/hcl" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type hclEncoder struct{} diff --git a/plugins/config/encoder/toml/go.mod b/plugins/config/encoder/toml/go.mod index 3b36b624..30518511 100644 --- a/plugins/config/encoder/toml/go.mod +++ b/plugins/config/encoder/toml/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/BurntSushi/toml v0.3.1 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace github.com/asim/go-micro/v3 => ../../../../../go-micro diff --git a/plugins/config/encoder/toml/toml.go b/plugins/config/encoder/toml/toml.go index 9d24433d..aa7fb532 100644 --- a/plugins/config/encoder/toml/toml.go +++ b/plugins/config/encoder/toml/toml.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/BurntSushi/toml" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type tomlEncoder struct{} diff --git a/plugins/config/encoder/xml/go.mod b/plugins/config/encoder/xml/go.mod index 2069ebd3..f2998ba9 100644 --- a/plugins/config/encoder/xml/go.mod +++ b/plugins/config/encoder/xml/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/config/encoder/xml/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../../go-micro diff --git a/plugins/config/encoder/xml/xml.go b/plugins/config/encoder/xml/xml.go index 90cadc4d..542c2a97 100644 --- a/plugins/config/encoder/xml/xml.go +++ b/plugins/config/encoder/xml/xml.go @@ -3,7 +3,7 @@ package xml import ( "encoding/xml" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type xmlEncoder struct{} diff --git a/plugins/config/encoder/yaml/go.mod b/plugins/config/encoder/yaml/go.mod index 1ff3da2c..b41a4789 100644 --- a/plugins/config/encoder/yaml/go.mod +++ b/plugins/config/encoder/yaml/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/encoder/yaml/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/ghodss/yaml v1.0.0 ) diff --git a/plugins/config/encoder/yaml/yaml.go b/plugins/config/encoder/yaml/yaml.go index 3e4e3cc8..0dc908d8 100644 --- a/plugins/config/encoder/yaml/yaml.go +++ b/plugins/config/encoder/yaml/yaml.go @@ -2,7 +2,7 @@ package yaml import ( "github.com/ghodss/yaml" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type yamlEncoder struct{} diff --git a/plugins/config/source/configmap/configmap.go b/plugins/config/source/configmap/configmap.go index e3fcf925..49971303 100644 --- a/plugins/config/source/configmap/configmap.go +++ b/plugins/config/source/configmap/configmap.go @@ -4,7 +4,7 @@ package configmap import ( "fmt" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "k8s.io/client-go/1.5/kubernetes" ) diff --git a/plugins/config/source/configmap/configmap_test.go b/plugins/config/source/configmap/configmap_test.go index 1fa376e6..3b5010a6 100644 --- a/plugins/config/source/configmap/configmap_test.go +++ b/plugins/config/source/configmap/configmap_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/config" + "go-micro.dev/v4/config" ) func TestGetClient(t *testing.T) { diff --git a/plugins/config/source/configmap/go.mod b/plugins/config/source/configmap/go.mod index 6a98284e..35e08b2b 100644 --- a/plugins/config/source/configmap/go.mod +++ b/plugins/config/source/configmap/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/configmap/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 k8s.io/client-go v1.5.2 ) diff --git a/plugins/config/source/configmap/go.sum b/plugins/config/source/configmap/go.sum index 2b783328..1197ef26 100644 --- a/plugins/config/source/configmap/go.sum +++ b/plugins/config/source/configmap/go.sum @@ -49,8 +49,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asim/go-micro/v3 v3.5.1 h1:OthybEX1VmfBE1EVYWz7aAcJR96myYyR5oNA99e8UmQ= -github.com/asim/go-micro/v3 v3.5.1/go.mod h1:OJ5DnUQmoEVQTNbKRstR7/krtYJI+QaBe/XeN5MZkqE= +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/plugins/config/source/configmap/options.go b/plugins/config/source/configmap/options.go index 823d3480..b9b69585 100644 --- a/plugins/config/source/configmap/options.go +++ b/plugins/config/source/configmap/options.go @@ -3,7 +3,7 @@ package configmap import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type configPathKey struct{} diff --git a/plugins/config/source/configmap/watcher.go b/plugins/config/source/configmap/watcher.go index 871b58d7..38986e97 100644 --- a/plugins/config/source/configmap/watcher.go +++ b/plugins/config/source/configmap/watcher.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "k8s.io/client-go/1.5/kubernetes" "k8s.io/client-go/1.5/pkg/api" "k8s.io/client-go/1.5/pkg/fields" diff --git a/plugins/config/source/consul/consul.go b/plugins/config/source/consul/consul.go index ca2580df..85529127 100644 --- a/plugins/config/source/consul/consul.go +++ b/plugins/config/source/consul/consul.go @@ -6,7 +6,7 @@ import ( "time" "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) // Currently a single consul reader diff --git a/plugins/config/source/consul/go.mod b/plugins/config/source/consul/go.mod index bfa2a5ce..b6028bfb 100644 --- a/plugins/config/source/consul/go.mod +++ b/plugins/config/source/consul/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/consul/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/hashicorp/consul/api v1.9.0 ) diff --git a/plugins/config/source/consul/options.go b/plugins/config/source/consul/options.go index 0b55e91c..f25acda9 100644 --- a/plugins/config/source/consul/options.go +++ b/plugins/config/source/consul/options.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type addressKey struct{} diff --git a/plugins/config/source/consul/util.go b/plugins/config/source/consul/util.go index 28279680..be613cb8 100644 --- a/plugins/config/source/consul/util.go +++ b/plugins/config/source/consul/util.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) type configValue interface { diff --git a/plugins/config/source/consul/watcher.go b/plugins/config/source/consul/watcher.go index 3ff66464..a7d7047b 100644 --- a/plugins/config/source/consul/watcher.go +++ b/plugins/config/source/consul/watcher.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api/watch" - "github.com/asim/go-micro/v3/config/encoder" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/encoder" + "go-micro.dev/v4/config/source" ) type watcher struct { diff --git a/plugins/config/source/etcd/etcd.go b/plugins/config/source/etcd/etcd.go index 3366013d..b2109572 100644 --- a/plugins/config/source/etcd/etcd.go +++ b/plugins/config/source/etcd/etcd.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/v3" ) diff --git a/plugins/config/source/etcd/go.mod b/plugins/config/source/etcd/go.mod index 8b235d6d..e86b0c15 100644 --- a/plugins/config/source/etcd/go.mod +++ b/plugins/config/source/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/etcd/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 go.etcd.io/etcd/api/v3 v3.5.0 go.etcd.io/etcd/client/v3 v3.5.0 ) diff --git a/plugins/config/source/etcd/options.go b/plugins/config/source/etcd/options.go index cc639372..da4375dc 100644 --- a/plugins/config/source/etcd/options.go +++ b/plugins/config/source/etcd/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type addressKey struct{} diff --git a/plugins/config/source/etcd/util.go b/plugins/config/source/etcd/util.go index dafacbcb..5b117a85 100644 --- a/plugins/config/source/etcd/util.go +++ b/plugins/config/source/etcd/util.go @@ -3,7 +3,7 @@ package etcd import ( "strings" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/v3" ) diff --git a/plugins/config/source/etcd/watcher.go b/plugins/config/source/etcd/watcher.go index 00fe516d..d2c4fea3 100644 --- a/plugins/config/source/etcd/watcher.go +++ b/plugins/config/source/etcd/watcher.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "go.etcd.io/etcd/client/v3" ) diff --git a/plugins/config/source/grpc/go.mod b/plugins/config/source/grpc/go.mod index 4c0d19d6..eece628c 100644 --- a/plugins/config/source/grpc/go.mod +++ b/plugins/config/source/grpc/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/grpc/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 golang.org/x/net v0.0.0-20210614182718-04defd469f4e google.golang.org/grpc v1.38.0 diff --git a/plugins/config/source/grpc/grpc.go b/plugins/config/source/grpc/grpc.go index 40286c07..161220df 100644 --- a/plugins/config/source/grpc/grpc.go +++ b/plugins/config/source/grpc/grpc.go @@ -4,7 +4,7 @@ import ( "context" "crypto/tls" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" proto "github.com/asim/go-micro/plugins/config/source/grpc/v3/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/plugins/config/source/grpc/options.go b/plugins/config/source/grpc/options.go index 723758d8..1513efca 100644 --- a/plugins/config/source/grpc/options.go +++ b/plugins/config/source/grpc/options.go @@ -3,7 +3,7 @@ package grpc import ( "context" "crypto/tls" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type addressKey struct{} diff --git a/plugins/config/source/grpc/util.go b/plugins/config/source/grpc/util.go index 3b661cd6..c7e1a0ab 100644 --- a/plugins/config/source/grpc/util.go +++ b/plugins/config/source/grpc/util.go @@ -3,7 +3,7 @@ package grpc import ( "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" proto "github.com/asim/go-micro/plugins/config/source/grpc/v3/proto" ) diff --git a/plugins/config/source/grpc/watcher.go b/plugins/config/source/grpc/watcher.go index fa766a96..f90c3f07 100644 --- a/plugins/config/source/grpc/watcher.go +++ b/plugins/config/source/grpc/watcher.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" proto "github.com/asim/go-micro/plugins/config/source/grpc/v3/proto" ) diff --git a/plugins/config/source/mucp/go.mod b/plugins/config/source/mucp/go.mod index 9ee15f76..0e17695b 100644 --- a/plugins/config/source/mucp/go.mod +++ b/plugins/config/source/mucp/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/mucp/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 ) diff --git a/plugins/config/source/mucp/mucp.go b/plugins/config/source/mucp/mucp.go index 4e819bba..814dd213 100644 --- a/plugins/config/source/mucp/mucp.go +++ b/plugins/config/source/mucp/mucp.go @@ -3,9 +3,9 @@ package mucp import ( "context" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/config/source" - log "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/config/source" + log "go-micro.dev/v4/logger" proto "github.com/asim/go-micro/plugins/config/source/mucp/v3/proto" ) diff --git a/plugins/config/source/mucp/options.go b/plugins/config/source/mucp/options.go index d21015c7..0a68ac0e 100644 --- a/plugins/config/source/mucp/options.go +++ b/plugins/config/source/mucp/options.go @@ -3,7 +3,7 @@ package mucp import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type serviceNameKey struct{} diff --git a/plugins/config/source/mucp/proto/mucp.micro.go b/plugins/config/source/mucp/proto/mucp.micro.go index a63bbadb..f5a5fa03 100644 --- a/plugins/config/source/mucp/proto/mucp.micro.go +++ b/plugins/config/source/mucp/proto/mucp.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/plugins/config/source/mucp/util.go b/plugins/config/source/mucp/util.go index 497c4963..81a1f51c 100644 --- a/plugins/config/source/mucp/util.go +++ b/plugins/config/source/mucp/util.go @@ -3,7 +3,7 @@ package mucp import ( "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" proto "github.com/asim/go-micro/plugins/config/source/mucp/v3/proto" ) diff --git a/plugins/config/source/mucp/watcher.go b/plugins/config/source/mucp/watcher.go index d973620f..7a90d076 100644 --- a/plugins/config/source/mucp/watcher.go +++ b/plugins/config/source/mucp/watcher.go @@ -1,7 +1,7 @@ package mucp import ( - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" proto "github.com/asim/go-micro/plugins/config/source/mucp/v3/proto" ) diff --git a/plugins/config/source/nacos/go.mod b/plugins/config/source/nacos/go.mod index d676b442..04f74dbf 100644 --- a/plugins/config/source/nacos/go.mod +++ b/plugins/config/source/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/nacos/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/nacos-group/nacos-sdk-go/v2 v2.0.0-Alpha.1 ) diff --git a/plugins/config/source/nacos/nacos.go b/plugins/config/source/nacos/nacos.go index b942220f..8aae3d37 100644 --- a/plugins/config/source/nacos/nacos.go +++ b/plugins/config/source/nacos/nacos.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/nacos-group/nacos-sdk-go/v2/clients" "github.com/nacos-group/nacos-sdk-go/v2/clients/config_client" "github.com/nacos-group/nacos-sdk-go/v2/common/constant" diff --git a/plugins/config/source/nacos/options.go b/plugins/config/source/nacos/options.go index c721e89e..3d18d6ff 100644 --- a/plugins/config/source/nacos/options.go +++ b/plugins/config/source/nacos/options.go @@ -3,7 +3,7 @@ package nacos import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "github.com/nacos-group/nacos-sdk-go/v2/common/constant" ) diff --git a/plugins/config/source/nacos/watcher.go b/plugins/config/source/nacos/watcher.go index bc9a532b..aa46e560 100644 --- a/plugins/config/source/nacos/watcher.go +++ b/plugins/config/source/nacos/watcher.go @@ -3,8 +3,8 @@ package nacos import ( "time" - "github.com/asim/go-micro/v3/config/encoder" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/encoder" + "go-micro.dev/v4/config/source" "github.com/nacos-group/nacos-sdk-go/v2/clients/config_client" "github.com/nacos-group/nacos-sdk-go/v2/vo" ) diff --git a/plugins/config/source/pkger/format.go b/plugins/config/source/pkger/format.go index d2f52efc..6283077b 100644 --- a/plugins/config/source/pkger/format.go +++ b/plugins/config/source/pkger/format.go @@ -3,7 +3,7 @@ package pkger import ( "strings" - "github.com/asim/go-micro/v3/config/encoder" + "go-micro.dev/v4/config/encoder" ) func format(p string, e encoder.Encoder) string { diff --git a/plugins/config/source/pkger/go.mod b/plugins/config/source/pkger/go.mod index 540a9310..bdeeb99c 100644 --- a/plugins/config/source/pkger/go.mod +++ b/plugins/config/source/pkger/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/pkger/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/markbates/pkger v0.17.1 ) diff --git a/plugins/config/source/pkger/options.go b/plugins/config/source/pkger/options.go index fa7f490c..5484a769 100644 --- a/plugins/config/source/pkger/options.go +++ b/plugins/config/source/pkger/options.go @@ -3,7 +3,7 @@ package pkger import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type pkgerPathKey struct{} diff --git a/plugins/config/source/pkger/pkger.go b/plugins/config/source/pkger/pkger.go index 39734b3b..a7eb6216 100644 --- a/plugins/config/source/pkger/pkger.go +++ b/plugins/config/source/pkger/pkger.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "github.com/markbates/pkger" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type file struct { diff --git a/plugins/config/source/runtimevar/go.mod b/plugins/config/source/runtimevar/go.mod index 97634cc7..5b528a83 100644 --- a/plugins/config/source/runtimevar/go.mod +++ b/plugins/config/source/runtimevar/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/runtimevar/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 gocloud.dev v0.17.0 ) diff --git a/plugins/config/source/runtimevar/options.go b/plugins/config/source/runtimevar/options.go index 67585b57..d5f81541 100644 --- a/plugins/config/source/runtimevar/options.go +++ b/plugins/config/source/runtimevar/options.go @@ -3,7 +3,7 @@ package runtimevar import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "gocloud.dev/runtimevar" ) diff --git a/plugins/config/source/runtimevar/runtimevar.go b/plugins/config/source/runtimevar/runtimevar.go index d4172e82..32affadd 100644 --- a/plugins/config/source/runtimevar/runtimevar.go +++ b/plugins/config/source/runtimevar/runtimevar.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "gocloud.dev/runtimevar" ) diff --git a/plugins/config/source/runtimevar/watcher.go b/plugins/config/source/runtimevar/watcher.go index f528220b..702ac5d5 100644 --- a/plugins/config/source/runtimevar/watcher.go +++ b/plugins/config/source/runtimevar/watcher.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" "gocloud.dev/runtimevar" ) diff --git a/plugins/config/source/url/go.mod b/plugins/config/source/url/go.mod index 2c38ccfa..016129a5 100644 --- a/plugins/config/source/url/go.mod +++ b/plugins/config/source/url/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/config/source/url/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../../go-micro diff --git a/plugins/config/source/url/options.go b/plugins/config/source/url/options.go index 14dca583..2f26e93d 100644 --- a/plugins/config/source/url/options.go +++ b/plugins/config/source/url/options.go @@ -3,7 +3,7 @@ package url import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type urlKey struct{} diff --git a/plugins/config/source/url/url.go b/plugins/config/source/url/url.go index d64b63f9..88153ce4 100644 --- a/plugins/config/source/url/url.go +++ b/plugins/config/source/url/url.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type urlSource struct { diff --git a/plugins/config/source/url/watcher.go b/plugins/config/source/url/watcher.go index 30f72e37..5e8aaf78 100644 --- a/plugins/config/source/url/watcher.go +++ b/plugins/config/source/url/watcher.go @@ -3,7 +3,7 @@ package url import ( "errors" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type urlWatcher struct { diff --git a/plugins/config/source/vault/go.mod b/plugins/config/source/vault/go.mod index 99c92ada..9640acb9 100644 --- a/plugins/config/source/vault/go.mod +++ b/plugins/config/source/vault/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/config/source/vault/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/hashicorp/vault/api v1.0.4 ) diff --git a/plugins/config/source/vault/options.go b/plugins/config/source/vault/options.go index abf597d1..1bf6f77f 100644 --- a/plugins/config/source/vault/options.go +++ b/plugins/config/source/vault/options.go @@ -3,7 +3,7 @@ package vault import ( "context" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type addressKey struct{} diff --git a/plugins/config/source/vault/util.go b/plugins/config/source/vault/util.go index 8e5ddb05..a1b0b3b2 100644 --- a/plugins/config/source/vault/util.go +++ b/plugins/config/source/vault/util.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) func makeMap(kv map[string]interface{}, secretName string) (map[string]interface{}, error) { diff --git a/plugins/config/source/vault/vault.go b/plugins/config/source/vault/vault.go index 802c2243..fb56b5b0 100644 --- a/plugins/config/source/vault/vault.go +++ b/plugins/config/source/vault/vault.go @@ -5,7 +5,7 @@ import ( "time" "github.com/hashicorp/vault/api" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) // Currently a single vault reader diff --git a/plugins/config/source/vault/vault_test.go b/plugins/config/source/vault/vault_test.go index a5741522..2c448ff5 100644 --- a/plugins/config/source/vault/vault_test.go +++ b/plugins/config/source/vault/vault_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/asim/go-micro/v3/config" + "go-micro.dev/v4/config" ) func TestVaultMakeMap(t *testing.T) { diff --git a/plugins/config/source/vault/watcher.go b/plugins/config/source/vault/watcher.go index 514fce90..8813e32e 100644 --- a/plugins/config/source/vault/watcher.go +++ b/plugins/config/source/vault/watcher.go @@ -3,7 +3,7 @@ package vault import ( "errors" "github.com/hashicorp/vault/api" - "github.com/asim/go-micro/v3/config/source" + "go-micro.dev/v4/config/source" ) type watcher struct { diff --git a/plugins/logger/apex/apex.go b/plugins/logger/apex/apex.go index 0653eddc..d95c175e 100644 --- a/plugins/logger/apex/apex.go +++ b/plugins/logger/apex/apex.go @@ -2,7 +2,7 @@ package apex import ( apexLog "github.com/apex/log" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" ) var ( diff --git a/plugins/logger/apex/apex_test.go b/plugins/logger/apex/apex_test.go index 418200c7..3dbe2b71 100644 --- a/plugins/logger/apex/apex_test.go +++ b/plugins/logger/apex/apex_test.go @@ -3,7 +3,7 @@ package apex import ( "testing" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" ) var ( diff --git a/plugins/logger/apex/go.mod b/plugins/logger/apex/go.mod index f6eb26b5..d98017e3 100644 --- a/plugins/logger/apex/go.mod +++ b/plugins/logger/apex/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/apex/log v1.9.0 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/logger/apex/options.go b/plugins/logger/apex/options.go index b0018313..811699ec 100644 --- a/plugins/logger/apex/options.go +++ b/plugins/logger/apex/options.go @@ -7,7 +7,7 @@ import ( "github.com/apex/log/handlers/cli" "github.com/apex/log/handlers/json" "github.com/apex/log/handlers/text" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" ) type handlerKey struct{} diff --git a/plugins/logger/logrus/README.md b/plugins/logger/logrus/README.md index c6745fd4..737c468c 100644 --- a/plugins/logger/logrus/README.md +++ b/plugins/logger/logrus/README.md @@ -8,7 +8,7 @@ import ( "os" "github.com/sirupsen/logrus" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) func ExampleWithOutput() { diff --git a/plugins/logger/logrus/go.mod b/plugins/logger/logrus/go.mod index a314c5a7..d042be2e 100644 --- a/plugins/logger/logrus/go.mod +++ b/plugins/logger/logrus/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/logger/logrus/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/sirupsen/logrus v1.8.1 ) diff --git a/plugins/logger/logrus/logrus.go b/plugins/logger/logrus/logrus.go index a622f7b5..c6cf2a9b 100644 --- a/plugins/logger/logrus/logrus.go +++ b/plugins/logger/logrus/logrus.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) type entryLogger interface { diff --git a/plugins/logger/logrus/logrus_test.go b/plugins/logger/logrus/logrus_test.go index a6e650e4..6250dee6 100644 --- a/plugins/logger/logrus/logrus_test.go +++ b/plugins/logger/logrus/logrus_test.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) func TestName(t *testing.T) { diff --git a/plugins/logger/logrus/options.go b/plugins/logger/logrus/options.go index 0dd71906..39150d02 100644 --- a/plugins/logger/logrus/options.go +++ b/plugins/logger/logrus/options.go @@ -3,7 +3,7 @@ package logrus import ( "github.com/sirupsen/logrus" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) type Options struct { diff --git a/plugins/logger/windowseventlog/go.mod b/plugins/logger/windowseventlog/go.mod index 18563f1c..5498082e 100644 --- a/plugins/logger/windowseventlog/go.mod +++ b/plugins/logger/windowseventlog/go.mod @@ -3,7 +3,7 @@ module github.com/korableg/go-micro/plugins/logger/windowseventlog go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 ) diff --git a/plugins/logger/windowseventlog/options.go b/plugins/logger/windowseventlog/options.go index 6d50d5dc..875ae4f5 100644 --- a/plugins/logger/windowseventlog/options.go +++ b/plugins/logger/windowseventlog/options.go @@ -2,7 +2,7 @@ package windowseventlog -import "github.com/asim/go-micro/v3/logger" +import "go-micro.dev/v4/logger" type src struct{} type eid struct{} diff --git a/plugins/logger/windowseventlog/windowseventlog.go b/plugins/logger/windowseventlog/windowseventlog.go index 3ba58da3..9a16b6fa 100644 --- a/plugins/logger/windowseventlog/windowseventlog.go +++ b/plugins/logger/windowseventlog/windowseventlog.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" "golang.org/x/sys/windows/svc/eventlog" ) diff --git a/plugins/logger/windowseventlog/windowseventlog_test.go b/plugins/logger/windowseventlog/windowseventlog_test.go index a937cbec..7c4dcfea 100644 --- a/plugins/logger/windowseventlog/windowseventlog_test.go +++ b/plugins/logger/windowseventlog/windowseventlog_test.go @@ -5,7 +5,7 @@ package windowseventlog import ( "testing" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" "github.com/stretchr/testify/assert" ) diff --git a/plugins/logger/zap/go.mod b/plugins/logger/zap/go.mod index f3790078..4edf501c 100644 --- a/plugins/logger/zap/go.mod +++ b/plugins/logger/zap/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/logger/zap/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 go.uber.org/zap v1.17.0 ) diff --git a/plugins/logger/zap/options.go b/plugins/logger/zap/options.go index 9f4232ca..625782cc 100644 --- a/plugins/logger/zap/options.go +++ b/plugins/logger/zap/options.go @@ -4,7 +4,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) type Options struct { diff --git a/plugins/logger/zap/zap.go b/plugins/logger/zap/zap.go index b47337f9..18dbceb1 100644 --- a/plugins/logger/zap/zap.go +++ b/plugins/logger/zap/zap.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) type zaplog struct { diff --git a/plugins/logger/zap/zap_test.go b/plugins/logger/zap/zap_test.go index a6e084a6..de2daea8 100644 --- a/plugins/logger/zap/zap_test.go +++ b/plugins/logger/zap/zap_test.go @@ -3,7 +3,7 @@ package zap import ( "testing" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) func TestName(t *testing.T) { diff --git a/plugins/logger/zerolog/go.mod b/plugins/logger/zerolog/go.mod index b8795b81..53a51acf 100644 --- a/plugins/logger/zerolog/go.mod +++ b/plugins/logger/zerolog/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/logger/zerolog/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/rs/zerolog v1.23.0 ) diff --git a/plugins/logger/zerolog/options.go b/plugins/logger/zerolog/options.go index e3ef25ca..af351bb1 100644 --- a/plugins/logger/zerolog/options.go +++ b/plugins/logger/zerolog/options.go @@ -3,7 +3,7 @@ package zerolog import ( "github.com/rs/zerolog" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) type Options struct { diff --git a/plugins/logger/zerolog/zerolog.go b/plugins/logger/zerolog/zerolog.go index 4bef803d..d548f4ef 100644 --- a/plugins/logger/zerolog/zerolog.go +++ b/plugins/logger/zerolog/zerolog.go @@ -11,7 +11,7 @@ import ( zlog "github.com/rs/zerolog/log" "github.com/rs/zerolog/pkgerrors" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) type Mode uint8 diff --git a/plugins/logger/zerolog/zerolog_test.go b/plugins/logger/zerolog/zerolog_test.go index 941e43e4..944c0e9d 100644 --- a/plugins/logger/zerolog/zerolog_test.go +++ b/plugins/logger/zerolog/zerolog_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" "github.com/rs/zerolog" ) diff --git a/plugins/plugin.go b/plugins/plugin.go index 246a14aa..ae107c1d 100644 --- a/plugins/plugin.go +++ b/plugins/plugin.go @@ -11,13 +11,13 @@ import ( "strings" "text/template" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/client" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/server" + "go-micro.dev/v4/transport" ) // Plugin is a plugin loaded from a file diff --git a/plugins/proxy/http/go.mod b/plugins/proxy/http/go.mod index cb530da9..841a9e3c 100644 --- a/plugins/proxy/http/go.mod +++ b/plugins/proxy/http/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace ( diff --git a/plugins/proxy/http/http.go b/plugins/proxy/http/http.go index af5cf877..ce056e20 100644 --- a/plugins/proxy/http/http.go +++ b/plugins/proxy/http/http.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/server" ) // Router will proxy rpc requests as http POST requests. It is a server.Router diff --git a/plugins/proxy/http/http_test.go b/plugins/proxy/http/http_test.go index 76c08399..a7b99ab7 100644 --- a/plugins/proxy/http/http_test.go +++ b/plugins/proxy/http/http_test.go @@ -8,10 +8,10 @@ import ( "sync" "testing" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4" + "go-micro.dev/v4/client" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" ) type testHandler struct{} diff --git a/plugins/proxy/http/options.go b/plugins/proxy/http/options.go index 50cba424..dabc7e2e 100644 --- a/plugins/proxy/http/options.go +++ b/plugins/proxy/http/options.go @@ -1,8 +1,8 @@ package http import ( - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4" + "go-micro.dev/v4/server" ) // WithBackend provides an option to set the http backend url diff --git a/plugins/registry/cache/cache.go b/plugins/registry/cache/cache.go index bff725b5..92491734 100644 --- a/plugins/registry/cache/cache.go +++ b/plugins/registry/cache/cache.go @@ -2,8 +2,8 @@ package cache import ( - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/registry/cache" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/registry/cache" ) // New returns a new cache diff --git a/plugins/registry/cache/go.mod b/plugins/registry/cache/go.mod index 457faab3..cc62acc3 100644 --- a/plugins/registry/cache/go.mod +++ b/plugins/registry/cache/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/registry/cache/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/registry/cache/options.go b/plugins/registry/cache/options.go index d5b2b9e8..843a5ad6 100644 --- a/plugins/registry/cache/options.go +++ b/plugins/registry/cache/options.go @@ -3,7 +3,7 @@ package cache import ( "time" - "github.com/asim/go-micro/v3/registry/cache" + "go-micro.dev/v4/registry/cache" ) // WithTTL sets the cache TTL diff --git a/plugins/registry/consul/consul.go b/plugins/registry/consul/consul.go index b30c54e2..e901bedc 100644 --- a/plugins/registry/consul/consul.go +++ b/plugins/registry/consul/consul.go @@ -12,9 +12,9 @@ import ( "time" consul "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" - mnet "github.com/asim/go-micro/v3/util/net" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" + mnet "go-micro.dev/v4/util/net" hash "github.com/mitchellh/hashstructure" ) diff --git a/plugins/registry/consul/encoding.go b/plugins/registry/consul/encoding.go index f1505b2a..92993a20 100644 --- a/plugins/registry/consul/encoding.go +++ b/plugins/registry/consul/encoding.go @@ -7,7 +7,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func encode(buf []byte) string { diff --git a/plugins/registry/consul/encoding_test.go b/plugins/registry/consul/encoding_test.go index 2159fe46..1c841521 100644 --- a/plugins/registry/consul/encoding_test.go +++ b/plugins/registry/consul/encoding_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestEncodingEndpoints(t *testing.T) { diff --git a/plugins/registry/consul/go.mod b/plugins/registry/consul/go.mod index 42fe1daa..7099833a 100644 --- a/plugins/registry/consul/go.mod +++ b/plugins/registry/consul/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/consul/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/hashicorp/consul/api v1.9.0 github.com/mitchellh/hashstructure v1.1.0 ) diff --git a/plugins/registry/consul/options.go b/plugins/registry/consul/options.go index 5386cb1b..b5fa0f29 100644 --- a/plugins/registry/consul/options.go +++ b/plugins/registry/consul/options.go @@ -5,7 +5,7 @@ import ( "time" consul "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) // Connect specifies services should be registered as Consul Connect services diff --git a/plugins/registry/consul/registry_test.go b/plugins/registry/consul/registry_test.go index 20e24130..d18add4d 100644 --- a/plugins/registry/consul/registry_test.go +++ b/plugins/registry/consul/registry_test.go @@ -10,7 +10,7 @@ import ( "time" consul "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type mockRegistry struct { diff --git a/plugins/registry/consul/watcher.go b/plugins/registry/consul/watcher.go index cecbbc09..15c500fe 100644 --- a/plugins/registry/consul/watcher.go +++ b/plugins/registry/consul/watcher.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/asim/go-micro/v3/registry" - regutil "github.com/asim/go-micro/v3/util/registry" + "go-micro.dev/v4/registry" + regutil "go-micro.dev/v4/util/registry" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api/watch" ) diff --git a/plugins/registry/consul/watcher_test.go b/plugins/registry/consul/watcher_test.go index f1bed1a1..95dfbed7 100644 --- a/plugins/registry/consul/watcher_test.go +++ b/plugins/registry/consul/watcher_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestHealthyServiceHandler(t *testing.T) { diff --git a/plugins/registry/etcd/etcd.go b/plugins/registry/etcd/etcd.go index 27009b7b..fbe8f57c 100644 --- a/plugins/registry/etcd/etcd.go +++ b/plugins/registry/etcd/etcd.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" hash "github.com/mitchellh/hashstructure" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/v3" diff --git a/plugins/registry/etcd/go.mod b/plugins/registry/etcd/go.mod index f701958b..4ea215b4 100644 --- a/plugins/registry/etcd/go.mod +++ b/plugins/registry/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/etcd/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/mitchellh/hashstructure v1.1.0 go.etcd.io/etcd/api/v3 v3.5.0 go.etcd.io/etcd/client/v3 v3.5.0 diff --git a/plugins/registry/etcd/options.go b/plugins/registry/etcd/options.go index 8dee4195..8f8605b8 100644 --- a/plugins/registry/etcd/options.go +++ b/plugins/registry/etcd/options.go @@ -3,7 +3,7 @@ package etcd import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "go.uber.org/zap" ) diff --git a/plugins/registry/etcd/watcher.go b/plugins/registry/etcd/watcher.go index e909e8f8..47db8e2f 100644 --- a/plugins/registry/etcd/watcher.go +++ b/plugins/registry/etcd/watcher.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "go.etcd.io/etcd/client/v3" ) diff --git a/plugins/registry/eureka/eureka.go b/plugins/registry/eureka/eureka.go index 7d11c85d..53942659 100644 --- a/plugins/registry/eureka/eureka.go +++ b/plugins/registry/eureka/eureka.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hudl/fargo" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" "github.com/op/go-logging" ) diff --git a/plugins/registry/eureka/eureka_test.go b/plugins/registry/eureka/eureka_test.go index e45715fb..426c7fc6 100644 --- a/plugins/registry/eureka/eureka_test.go +++ b/plugins/registry/eureka/eureka_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hudl/fargo" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/registry/eureka/v3/mock" ) diff --git a/plugins/registry/eureka/go.mod b/plugins/registry/eureka/go.mod index 6f15ffc0..19befc4c 100644 --- a/plugins/registry/eureka/go.mod +++ b/plugins/registry/eureka/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/eureka/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec // indirect github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2 // indirect diff --git a/plugins/registry/eureka/marshalling.go b/plugins/registry/eureka/marshalling.go index 6536dbd3..dfe88106 100644 --- a/plugins/registry/eureka/marshalling.go +++ b/plugins/registry/eureka/marshalling.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/hudl/fargo" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func appToService(app *fargo.Application) []*registry.Service { diff --git a/plugins/registry/eureka/marshalling_test.go b/plugins/registry/eureka/marshalling_test.go index d47ca8b9..8e9c3b3c 100644 --- a/plugins/registry/eureka/marshalling_test.go +++ b/plugins/registry/eureka/marshalling_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hudl/fargo" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestServiceToInstance(t *testing.T) { diff --git a/plugins/registry/eureka/options.go b/plugins/registry/eureka/options.go index b927b381..3289590b 100644 --- a/plugins/registry/eureka/options.go +++ b/plugins/registry/eureka/options.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "golang.org/x/oauth2" "golang.org/x/oauth2/clientcredentials" ) diff --git a/plugins/registry/eureka/options_test.go b/plugins/registry/eureka/options_test.go index 43202ee4..0a2f2a1c 100644 --- a/plugins/registry/eureka/options_test.go +++ b/plugins/registry/eureka/options_test.go @@ -7,7 +7,7 @@ import ( "golang.org/x/oauth2/clientcredentials" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestOAuth2ClientCredentials(t *testing.T) { diff --git a/plugins/registry/eureka/watcher.go b/plugins/registry/eureka/watcher.go index 5f9aac2a..6a7a77d7 100644 --- a/plugins/registry/eureka/watcher.go +++ b/plugins/registry/eureka/watcher.go @@ -5,7 +5,7 @@ import ( "time" "github.com/hudl/fargo" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type eurekaWatcher struct { diff --git a/plugins/registry/gossip/go.mod b/plugins/registry/gossip/go.mod index 11259571..069b8ac6 100644 --- a/plugins/registry/gossip/go.mod +++ b/plugins/registry/gossip/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/gossip/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.2.0 github.com/hashicorp/memberlist v0.1.5 diff --git a/plugins/registry/gossip/gossip.go b/plugins/registry/gossip/gossip.go index 0cc0ec78..ede46aa5 100644 --- a/plugins/registry/gossip/gossip.go +++ b/plugins/registry/gossip/gossip.go @@ -16,10 +16,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/google/uuid" "github.com/hashicorp/memberlist" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - regutil "github.com/asim/go-micro/v3/util/registry" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + regutil "go-micro.dev/v4/util/registry" pb "github.com/asim/go-micro/plugins/registry/gossip/v3/proto" "github.com/mitchellh/hashstructure" ) diff --git a/plugins/registry/gossip/gossip_test.go b/plugins/registry/gossip/gossip_test.go index 4032d7ca..1df56c75 100644 --- a/plugins/registry/gossip/gossip_test.go +++ b/plugins/registry/gossip/gossip_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/memberlist" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func newMemberlistConfig() *memberlist.Config { diff --git a/plugins/registry/gossip/options.go b/plugins/registry/gossip/options.go index e0210b33..b82f9fe0 100644 --- a/plugins/registry/gossip/options.go +++ b/plugins/registry/gossip/options.go @@ -5,7 +5,7 @@ import ( "time" "github.com/hashicorp/memberlist" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type secretKey struct{} diff --git a/plugins/registry/gossip/watcher.go b/plugins/registry/gossip/watcher.go index 0500b3a0..5ddedf09 100644 --- a/plugins/registry/gossip/watcher.go +++ b/plugins/registry/gossip/watcher.go @@ -1,7 +1,7 @@ package gossip import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type gossipWatcher struct { diff --git a/plugins/registry/kubernetes/client/api/response.go b/plugins/registry/kubernetes/client/api/response.go index 857a7706..fdb51de3 100644 --- a/plugins/registry/kubernetes/client/api/response.go +++ b/plugins/registry/kubernetes/client/api/response.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "net/http" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" ) // Errors ... diff --git a/plugins/registry/kubernetes/client/client.go b/plugins/registry/kubernetes/client/client.go index c1cdd05d..f4d8017a 100644 --- a/plugins/registry/kubernetes/client/client.go +++ b/plugins/registry/kubernetes/client/client.go @@ -8,7 +8,7 @@ import ( "os" "path" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client/api" "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client/watch" ) diff --git a/plugins/registry/kubernetes/go.mod b/plugins/registry/kubernetes/go.mod index 96d1ce5a..374bbae7 100644 --- a/plugins/registry/kubernetes/go.mod +++ b/plugins/registry/kubernetes/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/registry/kubernetes/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/registry/kubernetes/kubernetes.go b/plugins/registry/kubernetes/kubernetes.go index 943de7b6..886d56c9 100644 --- a/plugins/registry/kubernetes/kubernetes.go +++ b/plugins/registry/kubernetes/kubernetes.go @@ -12,8 +12,8 @@ import ( "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" ) type kregistry struct { diff --git a/plugins/registry/kubernetes/kubernetes_test.go b/plugins/registry/kubernetes/kubernetes_test.go index ab13f021..856f9e95 100644 --- a/plugins/registry/kubernetes/kubernetes_test.go +++ b/plugins/registry/kubernetes/kubernetes_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client" "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client/mock" ) diff --git a/plugins/registry/kubernetes/watcher.go b/plugins/registry/kubernetes/watcher.go index 51b4ab67..cb55e4bd 100644 --- a/plugins/registry/kubernetes/watcher.go +++ b/plugins/registry/kubernetes/watcher.go @@ -6,8 +6,8 @@ import ( "strings" "sync" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client" "github.com/asim/go-micro/plugins/registry/kubernetes/v3/client/watch" ) diff --git a/plugins/registry/mdns/go.mod b/plugins/registry/mdns/go.mod index be449739..04c0e4a6 100644 --- a/plugins/registry/mdns/go.mod +++ b/plugins/registry/mdns/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/registry/mdns/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/registry/mdns/mdns.go b/plugins/registry/mdns/mdns.go index ca975141..63567450 100644 --- a/plugins/registry/mdns/mdns.go +++ b/plugins/registry/mdns/mdns.go @@ -2,8 +2,8 @@ package mdns import ( - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" ) func init() { diff --git a/plugins/registry/memory/go.mod b/plugins/registry/memory/go.mod index 63efd818..24672952 100644 --- a/plugins/registry/memory/go.mod +++ b/plugins/registry/memory/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/memory/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 ) diff --git a/plugins/registry/memory/memory.go b/plugins/registry/memory/memory.go index 6f0e2a88..21c45a2f 100644 --- a/plugins/registry/memory/memory.go +++ b/plugins/registry/memory/memory.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" "github.com/google/uuid" ) diff --git a/plugins/registry/memory/memory_test.go b/plugins/registry/memory/memory_test.go index 0b5d4f06..af8110ac 100644 --- a/plugins/registry/memory/memory_test.go +++ b/plugins/registry/memory/memory_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) var ( diff --git a/plugins/registry/memory/memory_watcher.go b/plugins/registry/memory/memory_watcher.go index b244c633..fd574d7f 100644 --- a/plugins/registry/memory/memory_watcher.go +++ b/plugins/registry/memory/memory_watcher.go @@ -3,7 +3,7 @@ package memory import ( "errors" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type memoryWatcher struct { diff --git a/plugins/registry/memory/options.go b/plugins/registry/memory/options.go index 044ebcf0..ef0fe461 100644 --- a/plugins/registry/memory/options.go +++ b/plugins/registry/memory/options.go @@ -3,7 +3,7 @@ package memory import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type servicesKey struct{} diff --git a/plugins/registry/memory/util.go b/plugins/registry/memory/util.go index b7bc4e74..b423a1eb 100644 --- a/plugins/registry/memory/util.go +++ b/plugins/registry/memory/util.go @@ -3,7 +3,7 @@ package memory import ( "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func serviceToRecord(s *registry.Service, ttl time.Duration) *record { diff --git a/plugins/registry/memory/watcher.go b/plugins/registry/memory/watcher.go index 1ab9fa42..eae2c183 100644 --- a/plugins/registry/memory/watcher.go +++ b/plugins/registry/memory/watcher.go @@ -3,7 +3,7 @@ package memory import ( "errors" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type Watcher struct { diff --git a/plugins/registry/memory/watcher_test.go b/plugins/registry/memory/watcher_test.go index 45f7d8da..7a803536 100644 --- a/plugins/registry/memory/watcher_test.go +++ b/plugins/registry/memory/watcher_test.go @@ -3,7 +3,7 @@ package memory import ( "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestWatcher(t *testing.T) { diff --git a/plugins/registry/multi/go.mod b/plugins/registry/multi/go.mod index 62ed7d56..7f773d4c 100644 --- a/plugins/registry/multi/go.mod +++ b/plugins/registry/multi/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/registry/multi/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/registry/multi/multi.go b/plugins/registry/multi/multi.go index 7d7a8717..8012b3c1 100644 --- a/plugins/registry/multi/multi.go +++ b/plugins/registry/multi/multi.go @@ -4,8 +4,8 @@ import ( "context" "sync" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" ) type multiRegistry struct { diff --git a/plugins/registry/multi/options.go b/plugins/registry/multi/options.go index c4c28e11..684e0be1 100644 --- a/plugins/registry/multi/options.go +++ b/plugins/registry/multi/options.go @@ -3,7 +3,7 @@ package multi import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type writeKey struct{} diff --git a/plugins/registry/multi/watcher.go b/plugins/registry/multi/watcher.go index 4a37df48..7a56208a 100644 --- a/plugins/registry/multi/watcher.go +++ b/plugins/registry/multi/watcher.go @@ -3,7 +3,7 @@ package multi import ( "sync" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type multiWatcher struct { diff --git a/plugins/registry/nacos/go.mod b/plugins/registry/nacos/go.mod index 3f1fef1d..a6412f3d 100644 --- a/plugins/registry/nacos/go.mod +++ b/plugins/registry/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/nacos/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/nacos-group/nacos-sdk-go/v2 v2.0.0-Beta.1 ) diff --git a/plugins/registry/nacos/nacos.go b/plugins/registry/nacos/nacos.go index 270a44aa..27b83909 100644 --- a/plugins/registry/nacos/nacos.go +++ b/plugins/registry/nacos/nacos.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" "github.com/nacos-group/nacos-sdk-go/v2/clients" "github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client" "github.com/nacos-group/nacos-sdk-go/v2/common/constant" diff --git a/plugins/registry/nacos/options.go b/plugins/registry/nacos/options.go index a71affc4..508ae064 100644 --- a/plugins/registry/nacos/options.go +++ b/plugins/registry/nacos/options.go @@ -4,7 +4,7 @@ package nacos import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/nacos-group/nacos-sdk-go/v2/common/constant" ) diff --git a/plugins/registry/nacos/watcher.go b/plugins/registry/nacos/watcher.go index 877b4123..ba1313a4 100644 --- a/plugins/registry/nacos/watcher.go +++ b/plugins/registry/nacos/watcher.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" "github.com/nacos-group/nacos-sdk-go/v2/model" "github.com/nacos-group/nacos-sdk-go/v2/vo" ) diff --git a/plugins/registry/nats/environment_test.go b/plugins/registry/nats/environment_test.go index 7d3f22c8..e011de10 100644 --- a/plugins/registry/nats/environment_test.go +++ b/plugins/registry/nats/environment_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/registry/nats/v3" ) diff --git a/plugins/registry/nats/go.mod b/plugins/registry/nats/go.mod index e64e9c93..667020cb 100644 --- a/plugins/registry/nats/go.mod +++ b/plugins/registry/nats/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/nats/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/nats-io/nats-server/v2 v2.1.9 // indirect github.com/nats-io/nats.go v1.10.0 ) diff --git a/plugins/registry/nats/nats.go b/plugins/registry/nats/nats.go index dce8ca58..86b28fbb 100644 --- a/plugins/registry/nats/nats.go +++ b/plugins/registry/nats/nats.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" "github.com/nats-io/nats.go" ) diff --git a/plugins/registry/nats/nats_test.go b/plugins/registry/nats/nats_test.go index 853893aa..344c1411 100644 --- a/plugins/registry/nats/nats_test.go +++ b/plugins/registry/nats/nats_test.go @@ -3,7 +3,7 @@ package nats_test import ( "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestRegister(t *testing.T) { diff --git a/plugins/registry/nats/options.go b/plugins/registry/nats/options.go index 1d5b0c24..7c6fdf4f 100644 --- a/plugins/registry/nats/options.go +++ b/plugins/registry/nats/options.go @@ -3,7 +3,7 @@ package nats import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/nats-io/nats.go" ) diff --git a/plugins/registry/nats/options_test.go b/plugins/registry/nats/options_test.go index 5d73d0c7..468900d2 100644 --- a/plugins/registry/nats/options_test.go +++ b/plugins/registry/nats/options_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/nats-io/nats.go" ) diff --git a/plugins/registry/nats/util.go b/plugins/registry/nats/util.go index 3e376d29..002cba52 100644 --- a/plugins/registry/nats/util.go +++ b/plugins/registry/nats/util.go @@ -1,7 +1,7 @@ package nats import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func cp(current []*registry.Service) []*registry.Service { diff --git a/plugins/registry/nats/watcher.go b/plugins/registry/nats/watcher.go index fea951c8..c78d2468 100644 --- a/plugins/registry/nats/watcher.go +++ b/plugins/registry/nats/watcher.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/nats-io/nats.go" ) diff --git a/plugins/registry/proxy/go.mod b/plugins/registry/proxy/go.mod index 89690d10..29bcdc76 100644 --- a/plugins/registry/proxy/go.mod +++ b/plugins/registry/proxy/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/proxy/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/gorilla/websocket v1.4.2 ) diff --git a/plugins/registry/proxy/proxy.go b/plugins/registry/proxy/proxy.go index 31ec1296..84c6507f 100644 --- a/plugins/registry/proxy/proxy.go +++ b/plugins/registry/proxy/proxy.go @@ -11,8 +11,8 @@ import ( "net/http" "net/url" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" ) type proxy struct { diff --git a/plugins/registry/proxy/watcher.go b/plugins/registry/proxy/watcher.go index fbcde816..9c3e16c8 100644 --- a/plugins/registry/proxy/watcher.go +++ b/plugins/registry/proxy/watcher.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gorilla/websocket" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" ) const ( diff --git a/plugins/registry/zookeeper/go.mod b/plugins/registry/zookeeper/go.mod index 858f26f6..de4ee620 100644 --- a/plugins/registry/zookeeper/go.mod +++ b/plugins/registry/zookeeper/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/registry/zookeeper/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/go-zookeeper/zk v1.0.2 github.com/mitchellh/hashstructure v1.1.0 ) diff --git a/plugins/registry/zookeeper/util.go b/plugins/registry/zookeeper/util.go index 444bc04d..a4e2c6ce 100644 --- a/plugins/registry/zookeeper/util.go +++ b/plugins/registry/zookeeper/util.go @@ -5,7 +5,7 @@ import ( "path" "strings" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/go-zookeeper/zk" ) diff --git a/plugins/registry/zookeeper/watcher.go b/plugins/registry/zookeeper/watcher.go index c0b7abd3..900fa09f 100644 --- a/plugins/registry/zookeeper/watcher.go +++ b/plugins/registry/zookeeper/watcher.go @@ -4,7 +4,7 @@ import ( "errors" "path" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "github.com/go-zookeeper/zk" ) diff --git a/plugins/registry/zookeeper/zookeeper.go b/plugins/registry/zookeeper/zookeeper.go index 47cf05da..fca1ba0c 100644 --- a/plugins/registry/zookeeper/zookeeper.go +++ b/plugins/registry/zookeeper/zookeeper.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" "github.com/go-zookeeper/zk" hash "github.com/mitchellh/hashstructure" ) diff --git a/plugins/selector/dns/dns.go b/plugins/selector/dns/dns.go index 70f1999d..c4be82aa 100644 --- a/plugins/selector/dns/dns.go +++ b/plugins/selector/dns/dns.go @@ -6,8 +6,8 @@ import ( "net" "strconv" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" ) type dnsSelector struct { diff --git a/plugins/selector/dns/go.mod b/plugins/selector/dns/go.mod index 8966a20d..acc269a4 100644 --- a/plugins/selector/dns/go.mod +++ b/plugins/selector/dns/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/selector/dns/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/selector/label/go.mod b/plugins/selector/label/go.mod index f34f4684..59374d1f 100644 --- a/plugins/selector/label/go.mod +++ b/plugins/selector/label/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace ( diff --git a/plugins/selector/label/label.go b/plugins/selector/label/label.go index 5b0c119d..a00c1199 100644 --- a/plugins/selector/label/label.go +++ b/plugins/selector/label/label.go @@ -5,9 +5,9 @@ import ( "context" "sync" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" ) /* diff --git a/plugins/selector/label/label_test.go b/plugins/selector/label/label_test.go index 76c30716..886fc2a4 100644 --- a/plugins/selector/label/label_test.go +++ b/plugins/selector/label/label_test.go @@ -3,8 +3,8 @@ package label import ( "testing" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/registry/memory/v3" ) diff --git a/plugins/selector/label/options.go b/plugins/selector/label/options.go index 8fcd7b4f..58907935 100644 --- a/plugins/selector/label/options.go +++ b/plugins/selector/label/options.go @@ -3,7 +3,7 @@ package label import ( "context" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/selector" ) type labelKey struct{} diff --git a/plugins/selector/registry/go.mod b/plugins/selector/registry/go.mod index 1814baf3..e0542460 100644 --- a/plugins/selector/registry/go.mod +++ b/plugins/selector/registry/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/selector/registry go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/selector/registry/options.go b/plugins/selector/registry/options.go index 5630ad1d..1cd1413c 100644 --- a/plugins/selector/registry/options.go +++ b/plugins/selector/registry/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/selector" ) // Set the registry cache ttl diff --git a/plugins/selector/registry/registry.go b/plugins/selector/registry/registry.go index c8b2f35d..35270fec 100644 --- a/plugins/selector/registry/registry.go +++ b/plugins/selector/registry/registry.go @@ -2,8 +2,8 @@ package registry import ( - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/selector" ) func init() { diff --git a/plugins/selector/shard/go.mod b/plugins/selector/shard/go.mod index a16056dc..68ad61a6 100644 --- a/plugins/selector/shard/go.mod +++ b/plugins/selector/shard/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/selector/shard/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/minio/highwayhash v1.0.2 ) diff --git a/plugins/selector/shard/shard.go b/plugins/selector/shard/shard.go index 15525d28..08fa531a 100644 --- a/plugins/selector/shard/shard.go +++ b/plugins/selector/shard/shard.go @@ -3,9 +3,9 @@ package shard import ( "strings" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/registry" "github.com/minio/highwayhash" ) diff --git a/plugins/selector/shard/shard_test.go b/plugins/selector/shard/shard_test.go index a0bc7329..599f75a4 100644 --- a/plugins/selector/shard/shard_test.go +++ b/plugins/selector/shard/shard_test.go @@ -3,9 +3,9 @@ package shard_test import ( "testing" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/registry" "github.com/asim/go-micro/plugins/selector/shard/v3" ) diff --git a/plugins/selector/static/go.mod b/plugins/selector/static/go.mod index 5c5cb478..9457543d 100644 --- a/plugins/selector/static/go.mod +++ b/plugins/selector/static/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/selector/static/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/selector/static/static.go b/plugins/selector/static/static.go index d9156471..1ecd338e 100644 --- a/plugins/selector/static/static.go +++ b/plugins/selector/static/static.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/registry" ) const ( diff --git a/plugins/server/grpc/README.md b/plugins/server/grpc/README.md index 2142b4fe..5880f1db 100644 --- a/plugins/server/grpc/README.md +++ b/plugins/server/grpc/README.md @@ -13,7 +13,7 @@ Specify the server to your micro service ```go import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/asim/go-micro/plugins/server/grpc/v3" ) diff --git a/plugins/server/grpc/codec.go b/plugins/server/grpc/codec.go index 43bc4512..ff769085 100644 --- a/plugins/server/grpc/codec.go +++ b/plugins/server/grpc/codec.go @@ -8,8 +8,8 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/bytes" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/bytes" "google.golang.org/grpc" "google.golang.org/grpc/encoding" "google.golang.org/grpc/metadata" diff --git a/plugins/server/grpc/context.go b/plugins/server/grpc/context.go index 00b9bbdc..cb7f9d92 100644 --- a/plugins/server/grpc/context.go +++ b/plugins/server/grpc/context.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" ) func setServerOption(k, v interface{}) server.Option { diff --git a/plugins/server/grpc/error.go b/plugins/server/grpc/error.go index 243b7390..08db47ab 100644 --- a/plugins/server/grpc/error.go +++ b/plugins/server/grpc/error.go @@ -3,7 +3,7 @@ package grpc import ( "net/http" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/errors" "google.golang.org/grpc/codes" ) diff --git a/plugins/server/grpc/extractor.go b/plugins/server/grpc/extractor.go index 6ab7b7de..5c260a59 100644 --- a/plugins/server/grpc/extractor.go +++ b/plugins/server/grpc/extractor.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func extractValue(v reflect.Type, d int) *registry.Value { diff --git a/plugins/server/grpc/extractor_test.go b/plugins/server/grpc/extractor_test.go index d82daebf..674831a7 100644 --- a/plugins/server/grpc/extractor_test.go +++ b/plugins/server/grpc/extractor_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type testHandler struct{} diff --git a/plugins/server/grpc/go.mod b/plugins/server/grpc/go.mod index f0ea20e2..c94cf9bf 100644 --- a/plugins/server/grpc/go.mod +++ b/plugins/server/grpc/go.mod @@ -7,7 +7,7 @@ require ( github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210630062103-c13bb07171bc github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 golang.org/x/net v0.0.0-20210614182718-04defd469f4e google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98 diff --git a/plugins/server/grpc/grpc.go b/plugins/server/grpc/grpc.go index 26d90ba8..afddb812 100644 --- a/plugins/server/grpc/grpc.go +++ b/plugins/server/grpc/grpc.go @@ -14,17 +14,17 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/logger" - meta "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/util/addr" - "github.com/asim/go-micro/v3/util/backoff" - mgrpc "github.com/asim/go-micro/v3/util/grpc" - mnet "github.com/asim/go-micro/v3/util/net" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/logger" + meta "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" + "go-micro.dev/v4/util/addr" + "go-micro.dev/v4/util/backoff" + mgrpc "go-micro.dev/v4/util/grpc" + mnet "go-micro.dev/v4/util/net" "github.com/golang/protobuf/proto" "golang.org/x/net/netutil" diff --git a/plugins/server/grpc/grpc_test.go b/plugins/server/grpc/grpc_test.go index 98cafc4e..187181b4 100644 --- a/plugins/server/grpc/grpc_test.go +++ b/plugins/server/grpc/grpc_test.go @@ -8,13 +8,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/status" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/client" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" + "go-micro.dev/v4/transport" bmemory "github.com/asim/go-micro/plugins/broker/memory/v3" gcli "github.com/asim/go-micro/plugins/client/grpc/v3" diff --git a/plugins/server/grpc/handler.go b/plugins/server/grpc/handler.go index 391876ec..0a433cf1 100644 --- a/plugins/server/grpc/handler.go +++ b/plugins/server/grpc/handler.go @@ -3,8 +3,8 @@ package grpc import ( "reflect" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) type rpcHandler struct { diff --git a/plugins/server/grpc/options.go b/plugins/server/grpc/options.go index eed220f2..c4b15ab3 100644 --- a/plugins/server/grpc/options.go +++ b/plugins/server/grpc/options.go @@ -5,11 +5,11 @@ import ( "crypto/tls" "net" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" + "go-micro.dev/v4/transport" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/plugins/server/grpc/proto/test.pb.micro.go b/plugins/server/grpc/proto/test.pb.micro.go index 2654d171..b25b4537 100644 --- a/plugins/server/grpc/proto/test.pb.micro.go +++ b/plugins/server/grpc/proto/test.pb.micro.go @@ -12,9 +12,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/plugins/server/grpc/request.go b/plugins/server/grpc/request.go index 015ecd0b..81fb3a4e 100644 --- a/plugins/server/grpc/request.go +++ b/plugins/server/grpc/request.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/bytes" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/bytes" ) type rpcRequest struct { diff --git a/plugins/server/grpc/response.go b/plugins/server/grpc/response.go index f0a141f0..03262e47 100644 --- a/plugins/server/grpc/response.go +++ b/plugins/server/grpc/response.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type rpcResponse struct { diff --git a/plugins/server/grpc/server.go b/plugins/server/grpc/server.go index 479430b0..c9605006 100644 --- a/plugins/server/grpc/server.go +++ b/plugins/server/grpc/server.go @@ -14,8 +14,8 @@ import ( "unicode" "unicode/utf8" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/server" ) var ( diff --git a/plugins/server/grpc/stream.go b/plugins/server/grpc/stream.go index ff85b84e..ae5e4cba 100644 --- a/plugins/server/grpc/stream.go +++ b/plugins/server/grpc/stream.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" "google.golang.org/grpc" ) diff --git a/plugins/server/grpc/subscriber.go b/plugins/server/grpc/subscriber.go index b4c3b1d6..40d72050 100644 --- a/plugins/server/grpc/subscriber.go +++ b/plugins/server/grpc/subscriber.go @@ -7,12 +7,12 @@ import ( "runtime/debug" "strings" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) const ( diff --git a/plugins/server/http/README.md b/plugins/server/http/README.md index e5e0523d..b8b317de 100644 --- a/plugins/server/http/README.md +++ b/plugins/server/http/README.md @@ -37,7 +37,7 @@ Or as part of a service import ( "net/http" - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" "github.com/micro/go-micro/server" httpServer "github.com/asim/go-micro/plugins/server/http" ) diff --git a/plugins/server/http/extractor.go b/plugins/server/http/extractor.go index 7ffd9c92..385cb293 100644 --- a/plugins/server/http/extractor.go +++ b/plugins/server/http/extractor.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/util/addr" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" + "go-micro.dev/v4/util/addr" ) func serviceDef(opts server.Options) *registry.Service { diff --git a/plugins/server/http/go.mod b/plugins/server/http/go.mod index 673e7db2..3f24a750 100644 --- a/plugins/server/http/go.mod +++ b/plugins/server/http/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace ( diff --git a/plugins/server/http/handler.go b/plugins/server/http/handler.go index 85e73e06..e501bd08 100644 --- a/plugins/server/http/handler.go +++ b/plugins/server/http/handler.go @@ -1,8 +1,8 @@ package http import ( - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) type httpHandler struct { diff --git a/plugins/server/http/http.go b/plugins/server/http/http.go index efe4a8da..9d55a136 100644 --- a/plugins/server/http/http.go +++ b/plugins/server/http/http.go @@ -11,14 +11,14 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/codec/jsonrpc" - "github.com/asim/go-micro/v3/codec/protorpc" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/codec/jsonrpc" + "go-micro.dev/v4/codec/protorpc" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) var ( diff --git a/plugins/server/http/http_test.go b/plugins/server/http/http_test.go index 10fd1a4d..9fa5dd7d 100644 --- a/plugins/server/http/http_test.go +++ b/plugins/server/http/http_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" ) func TestHTTPServer(t *testing.T) { diff --git a/plugins/server/http/message.go b/plugins/server/http/message.go index 3f54c2ca..1f46c998 100644 --- a/plugins/server/http/message.go +++ b/plugins/server/http/message.go @@ -1,6 +1,6 @@ package http -import "github.com/asim/go-micro/v3/codec" +import "go-micro.dev/v4/codec" type httpMessage struct { topic string diff --git a/plugins/server/http/options.go b/plugins/server/http/options.go index 226777e4..42538d3a 100644 --- a/plugins/server/http/options.go +++ b/plugins/server/http/options.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) func newOptions(opt ...server.Option) server.Options { diff --git a/plugins/server/http/subscriber.go b/plugins/server/http/subscriber.go index 30ea66f6..07d7750d 100644 --- a/plugins/server/http/subscriber.go +++ b/plugins/server/http/subscriber.go @@ -9,11 +9,11 @@ import ( "unicode" "unicode/utf8" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) const ( diff --git a/plugins/server/mucp/go.mod b/plugins/server/mucp/go.mod index 3617e97b..696d84f0 100644 --- a/plugins/server/mucp/go.mod +++ b/plugins/server/mucp/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/server/mucp/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/server/mucp/mucp.go b/plugins/server/mucp/mucp.go index bca4ce76..818ce191 100644 --- a/plugins/server/mucp/mucp.go +++ b/plugins/server/mucp/mucp.go @@ -2,8 +2,8 @@ package mucp import ( - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/server" ) func init() { diff --git a/plugins/store/cockroach/cockroach.go b/plugins/store/cockroach/cockroach.go index 035cc491..a27763d8 100644 --- a/plugins/store/cockroach/cockroach.go +++ b/plugins/store/cockroach/cockroach.go @@ -11,8 +11,8 @@ import ( "time" "github.com/lib/pq" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/store" "github.com/pkg/errors" ) diff --git a/plugins/store/cockroach/cockroach_test.go b/plugins/store/cockroach/cockroach_test.go index 7a479b2c..7d50fd46 100644 --- a/plugins/store/cockroach/cockroach_test.go +++ b/plugins/store/cockroach/cockroach_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/kr/pretty" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) func TestSQL(t *testing.T) { diff --git a/plugins/store/cockroach/go.mod b/plugins/store/cockroach/go.mod index fde90857..04789c8b 100644 --- a/plugins/store/cockroach/go.mod +++ b/plugins/store/cockroach/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/cockroach/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/kr/pretty v0.2.1 github.com/lib/pq v1.10.2 github.com/pkg/errors v0.9.1 diff --git a/plugins/store/consul/consul.go b/plugins/store/consul/consul.go index c0ad979b..b28d6551 100644 --- a/plugins/store/consul/consul.go +++ b/plugins/store/consul/consul.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/hashicorp/consul/api" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) type ckv struct { diff --git a/plugins/store/consul/go.mod b/plugins/store/consul/go.mod index f4277c92..c16a9b88 100644 --- a/plugins/store/consul/go.mod +++ b/plugins/store/consul/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/consul/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/hashicorp/consul/api v1.9.0 ) diff --git a/plugins/store/file/file.go b/plugins/store/file/file.go index e61b8fbb..f6560b3e 100644 --- a/plugins/store/file/file.go +++ b/plugins/store/file/file.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" bolt "go.etcd.io/bbolt" ) diff --git a/plugins/store/file/file_test.go b/plugins/store/file/file_test.go index 56998311..3ef36f07 100644 --- a/plugins/store/file/file_test.go +++ b/plugins/store/file/file_test.go @@ -10,7 +10,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/kr/pretty" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) func cleanup(db string, s store.Store) { diff --git a/plugins/store/file/go.mod b/plugins/store/file/go.mod index 0b6e4247..3cc08c5d 100644 --- a/plugins/store/file/go.mod +++ b/plugins/store/file/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/file/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/davecgh/go-spew v1.1.1 github.com/kr/pretty v0.2.1 go.etcd.io/bbolt v1.3.6 diff --git a/plugins/store/memcached/go.mod b/plugins/store/memcached/go.mod index 4f706cc0..da8040d1 100644 --- a/plugins/store/memcached/go.mod +++ b/plugins/store/memcached/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/memcached/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b ) diff --git a/plugins/store/memcached/memcached.go b/plugins/store/memcached/memcached.go index bc81fcec..5259e743 100644 --- a/plugins/store/memcached/memcached.go +++ b/plugins/store/memcached/memcached.go @@ -10,8 +10,8 @@ import ( "time" mc "github.com/bradfitz/gomemcache/memcache" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/store" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/store" ) type mkv struct { diff --git a/plugins/store/memory/go.mod b/plugins/store/memory/go.mod index e22bedb8..50d2631d 100644 --- a/plugins/store/memory/go.mod +++ b/plugins/store/memory/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/memory/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/kr/pretty v0.2.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 diff --git a/plugins/store/memory/memory.go b/plugins/store/memory/memory.go index 8649f097..c29c48c6 100644 --- a/plugins/store/memory/memory.go +++ b/plugins/store/memory/memory.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" "github.com/patrickmn/go-cache" "github.com/pkg/errors" ) diff --git a/plugins/store/memory/memory_test.go b/plugins/store/memory/memory_test.go index c30e143f..861a1672 100644 --- a/plugins/store/memory/memory_test.go +++ b/plugins/store/memory/memory_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/kr/pretty" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) func TestMemoryReInit(t *testing.T) { diff --git a/plugins/store/mysql/go.mod b/plugins/store/mysql/go.mod index 3f95d428..fbfef51c 100644 --- a/plugins/store/mysql/go.mod +++ b/plugins/store/mysql/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/mysql/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/go-sql-driver/mysql v1.6.0 github.com/pkg/errors v0.9.1 ) diff --git a/plugins/store/mysql/mysql.go b/plugins/store/mysql/mysql.go index d59cdf06..01974556 100644 --- a/plugins/store/mysql/mysql.go +++ b/plugins/store/mysql/mysql.go @@ -6,8 +6,8 @@ import ( "time" "unicode" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/store" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/store" "github.com/pkg/errors" ) diff --git a/plugins/store/mysql/mysql_test.go b/plugins/store/mysql/mysql_test.go index a64e3396..1c85af3e 100644 --- a/plugins/store/mysql/mysql_test.go +++ b/plugins/store/mysql/mysql_test.go @@ -7,7 +7,7 @@ import ( "time" _ "github.com/go-sql-driver/mysql" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) var ( diff --git a/plugins/store/redis/go.mod b/plugins/store/redis/go.mod index a5ff5856..3fc79da8 100644 --- a/plugins/store/redis/go.mod +++ b/plugins/store/redis/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/store/redis/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/go-redis/redis/v8 v8.10.0 ) diff --git a/plugins/store/redis/redis.go b/plugins/store/redis/redis.go index ec6674d5..d194b6ce 100644 --- a/plugins/store/redis/redis.go +++ b/plugins/store/redis/redis.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/store" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/store" "github.com/go-redis/redis/v8" ) diff --git a/plugins/store/redis/redis_test.go b/plugins/store/redis/redis_test.go index 208377de..84d374c3 100644 --- a/plugins/store/redis/redis_test.go +++ b/plugins/store/redis/redis_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" "github.com/go-redis/redis/v8" ) diff --git a/plugins/sync/consul/consul.go b/plugins/sync/consul/consul.go index 288ba337..4e738dd5 100644 --- a/plugins/sync/consul/consul.go +++ b/plugins/sync/consul/consul.go @@ -11,7 +11,7 @@ import ( gosync "sync" "time" - "github.com/asim/go-micro/v3/sync" + "go-micro.dev/v4/sync" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api/watch" hclog "github.com/hashicorp/go-hclog" diff --git a/plugins/sync/consul/consul_test.go b/plugins/sync/consul/consul_test.go index 02341782..c8c92f78 100644 --- a/plugins/sync/consul/consul_test.go +++ b/plugins/sync/consul/consul_test.go @@ -6,7 +6,7 @@ import ( gosync "sync" "testing" - "github.com/asim/go-micro/v3/sync" + "go-micro.dev/v4/sync" ) const ( diff --git a/plugins/sync/consul/go.mod b/plugins/sync/consul/go.mod index 727d9a01..2d404e06 100644 --- a/plugins/sync/consul/go.mod +++ b/plugins/sync/consul/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/sync/consul/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/hashicorp/consul/api v1.9.0 github.com/hashicorp/go-hclog v0.16.2 ) diff --git a/plugins/sync/etcd/etcd.go b/plugins/sync/etcd/etcd.go index 7ee522d8..00be0169 100644 --- a/plugins/sync/etcd/etcd.go +++ b/plugins/sync/etcd/etcd.go @@ -9,7 +9,7 @@ import ( "strings" gosync "sync" - "github.com/asim/go-micro/v3/sync" + "go-micro.dev/v4/sync" "go.etcd.io/etcd/client/v3" cc "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/plugins/sync/etcd/go.mod b/plugins/sync/etcd/go.mod index da302017..a0473c9f 100644 --- a/plugins/sync/etcd/go.mod +++ b/plugins/sync/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/sync/etcd/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 go.etcd.io/etcd/client/v3 v3.5.0 ) diff --git a/plugins/sync/memory/go.mod b/plugins/sync/memory/go.mod index 1c3ab4c4..35e99230 100644 --- a/plugins/sync/memory/go.mod +++ b/plugins/sync/memory/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/sync/memory/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/sync/memory/memory.go b/plugins/sync/memory/memory.go index aa6ab2fc..180c3804 100644 --- a/plugins/sync/memory/memory.go +++ b/plugins/sync/memory/memory.go @@ -5,7 +5,7 @@ import ( gosync "sync" "time" - "github.com/asim/go-micro/v3/sync" + "go-micro.dev/v4/sync" ) type memorySync struct { diff --git a/plugins/transport/grpc/go.mod b/plugins/transport/grpc/go.mod index de441808..8d233048 100644 --- a/plugins/transport/grpc/go.mod +++ b/plugins/transport/grpc/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/transport/grpc/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/golang/protobuf v1.5.2 google.golang.org/grpc v1.38.0 ) diff --git a/plugins/transport/grpc/grpc.go b/plugins/transport/grpc/grpc.go index 47d6c914..21927bb9 100644 --- a/plugins/transport/grpc/grpc.go +++ b/plugins/transport/grpc/grpc.go @@ -6,11 +6,11 @@ import ( "crypto/tls" "net" - "github.com/asim/go-micro/v3/transport" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/transport" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" + "go-micro.dev/v4/cmd" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/plugins/transport/grpc/grpc_test.go b/plugins/transport/grpc/grpc_test.go index 66a9cefb..37ca4e6c 100644 --- a/plugins/transport/grpc/grpc_test.go +++ b/plugins/transport/grpc/grpc_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func expectedPort(t *testing.T, expected string, lsn transport.Listener) { diff --git a/plugins/transport/grpc/handler.go b/plugins/transport/grpc/handler.go index 817d2e09..ee52dfe4 100644 --- a/plugins/transport/grpc/handler.go +++ b/plugins/transport/grpc/handler.go @@ -3,9 +3,9 @@ package grpc import ( "runtime/debug" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/transport" pb "github.com/asim/go-micro/plugins/transport/grpc/v3/proto" "google.golang.org/grpc/peer" ) diff --git a/plugins/transport/grpc/proto/transport.pb.micro.go b/plugins/transport/grpc/proto/transport.pb.micro.go index 08aeb24a..4b1dff95 100644 --- a/plugins/transport/grpc/proto/transport.pb.micro.go +++ b/plugins/transport/grpc/proto/transport.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/plugins/transport/grpc/socket.go b/plugins/transport/grpc/socket.go index 805b914e..9c617c32 100644 --- a/plugins/transport/grpc/socket.go +++ b/plugins/transport/grpc/socket.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" pb "github.com/asim/go-micro/plugins/transport/grpc/v3/proto" "google.golang.org/grpc" ) diff --git a/plugins/transport/http/go.mod b/plugins/transport/http/go.mod index 43e54b70..1f98e515 100644 --- a/plugins/transport/http/go.mod +++ b/plugins/transport/http/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/transport/http/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/transport/http/http.go b/plugins/transport/http/http.go index 5f8c5566..9cba4ee8 100644 --- a/plugins/transport/http/http.go +++ b/plugins/transport/http/http.go @@ -2,7 +2,7 @@ package http import ( - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) // NewTransport returns a new http transport using net/http and supporting http2 diff --git a/plugins/transport/http/http_test.go b/plugins/transport/http/http_test.go index 53a35352..de64f70b 100644 --- a/plugins/transport/http/http_test.go +++ b/plugins/transport/http/http_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func call(b *testing.B, c int) { diff --git a/plugins/transport/http/options.go b/plugins/transport/http/options.go index 87b9e9fb..3104fe7d 100644 --- a/plugins/transport/http/options.go +++ b/plugins/transport/http/options.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) // Handle registers the handler for the given pattern. diff --git a/plugins/transport/memory/go.mod b/plugins/transport/memory/go.mod index 0bb6bed0..330a136f 100644 --- a/plugins/transport/memory/go.mod +++ b/plugins/transport/memory/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/transport/memory/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/transport/memory/memory.go b/plugins/transport/memory/memory.go index d0ba4f96..1cb4bdd4 100644 --- a/plugins/transport/memory/memory.go +++ b/plugins/transport/memory/memory.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/transport" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/transport" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + "go-micro.dev/v4/cmd" ) type memorySocket struct { diff --git a/plugins/transport/memory/memory_test.go b/plugins/transport/memory/memory_test.go index 423d4d56..a0f09632 100644 --- a/plugins/transport/memory/memory_test.go +++ b/plugins/transport/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func TestMemoryTransport(t *testing.T) { diff --git a/plugins/transport/nats/go.mod b/plugins/transport/nats/go.mod index 7691f5f0..48b220a0 100644 --- a/plugins/transport/nats/go.mod +++ b/plugins/transport/nats/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/transport/nats/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/go-log/log v0.2.0 github.com/nats-io/nats-server/v2 v2.3.0 // indirect github.com/nats-io/nats.go v1.11.0 diff --git a/plugins/transport/nats/nats.go b/plugins/transport/nats/nats.go index 7eaf58eb..d71a667b 100644 --- a/plugins/transport/nats/nats.go +++ b/plugins/transport/nats/nats.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/server" + "go-micro.dev/v4/transport" "github.com/nats-io/nats.go" ) diff --git a/plugins/transport/nats/nats_test.go b/plugins/transport/nats/nats_test.go index 914c9982..e264c018 100644 --- a/plugins/transport/nats/nats_test.go +++ b/plugins/transport/nats/nats_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/go-log/log" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/server" + "go-micro.dev/v4/transport" "github.com/nats-io/nats.go" ) diff --git a/plugins/transport/nats/options.go b/plugins/transport/nats/options.go index 305cea06..21cc0983 100644 --- a/plugins/transport/nats/options.go +++ b/plugins/transport/nats/options.go @@ -3,7 +3,7 @@ package nats import ( "context" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" "github.com/nats-io/nats.go" ) diff --git a/plugins/transport/quic/go.mod b/plugins/transport/quic/go.mod index 61b72425..3ef6fdfe 100644 --- a/plugins/transport/quic/go.mod +++ b/plugins/transport/quic/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/transport/quic/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/lucas-clemente/quic-go v0.21.1 ) diff --git a/plugins/transport/quic/quic.go b/plugins/transport/quic/quic.go index 1230b1fe..2fab2bc2 100644 --- a/plugins/transport/quic/quic.go +++ b/plugins/transport/quic/quic.go @@ -4,11 +4,11 @@ import ( "context" "crypto/tls" "encoding/gob" - "github.com/asim/go-micro/v3/cmd" + "go-micro.dev/v4/cmd" "time" - "github.com/asim/go-micro/v3/transport" - utls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4/transport" + utls "go-micro.dev/v4/util/tls" quic "github.com/lucas-clemente/quic-go" ) diff --git a/plugins/transport/rabbitmq/go.mod b/plugins/transport/rabbitmq/go.mod index aee74611..68cba099 100644 --- a/plugins/transport/rabbitmq/go.mod +++ b/plugins/transport/rabbitmq/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/transport/rabbitmq/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/google/uuid v1.2.0 github.com/streadway/amqp v1.0.0 ) diff --git a/plugins/transport/rabbitmq/rabbitmq.go b/plugins/transport/rabbitmq/rabbitmq.go index 00bd329e..90e3704e 100644 --- a/plugins/transport/rabbitmq/rabbitmq.go +++ b/plugins/transport/rabbitmq/rabbitmq.go @@ -11,8 +11,8 @@ import ( "github.com/google/uuid" "github.com/streadway/amqp" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/transport" ) const ( diff --git a/plugins/transport/tcp/go.mod b/plugins/transport/tcp/go.mod index 40f75967..e8fa955e 100644 --- a/plugins/transport/tcp/go.mod +++ b/plugins/transport/tcp/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/transport/tcp/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/transport/tcp/tcp.go b/plugins/transport/tcp/tcp.go index 3d6ce3a6..ffccd1e0 100644 --- a/plugins/transport/tcp/tcp.go +++ b/plugins/transport/tcp/tcp.go @@ -9,12 +9,12 @@ import ( "net" "time" - "github.com/asim/go-micro/v3/cmd" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/transport" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4/cmd" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/transport" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" ) type tcpTransport struct { diff --git a/plugins/transport/tcp/tcp_test.go b/plugins/transport/tcp/tcp_test.go index 294f1267..e2c11d20 100644 --- a/plugins/transport/tcp/tcp_test.go +++ b/plugins/transport/tcp/tcp_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func expectedPort(t *testing.T, expected string, lsn transport.Listener) { diff --git a/plugins/transport/utp/client.go b/plugins/transport/utp/client.go index 9f8652fc..b7187cec 100644 --- a/plugins/transport/utp/client.go +++ b/plugins/transport/utp/client.go @@ -3,7 +3,7 @@ package utp import ( "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func (u *utpClient) Local() string { diff --git a/plugins/transport/utp/go.mod b/plugins/transport/utp/go.mod index 189a9bdb..1ba85332 100644 --- a/plugins/transport/utp/go.mod +++ b/plugins/transport/utp/go.mod @@ -7,7 +7,7 @@ require ( github.com/anacrolix/missinggo v1.3.0 // indirect github.com/anacrolix/sync v0.4.0 // indirect github.com/anacrolix/utp v0.1.0 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 ) replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/transport/utp/listener.go b/plugins/transport/utp/listener.go index c770fc22..e51011c3 100644 --- a/plugins/transport/utp/listener.go +++ b/plugins/transport/utp/listener.go @@ -6,8 +6,8 @@ import ( "net" "time" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/transport" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/transport" ) func (u *utpListener) Addr() string { diff --git a/plugins/transport/utp/socket.go b/plugins/transport/utp/socket.go index f6fe708f..ef997c25 100644 --- a/plugins/transport/utp/socket.go +++ b/plugins/transport/utp/socket.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func (u *utpSocket) Local() string { diff --git a/plugins/transport/utp/transport.go b/plugins/transport/utp/transport.go index d433255e..677b9183 100644 --- a/plugins/transport/utp/transport.go +++ b/plugins/transport/utp/transport.go @@ -8,10 +8,10 @@ import ( "net" "github.com/anacrolix/utp" - "github.com/asim/go-micro/v3/transport" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4/transport" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" ) func (u *utpTransport) Dial(addr string, opts ...transport.DialOption) (transport.Client, error) { diff --git a/plugins/transport/utp/utp.go b/plugins/transport/utp/utp.go index 9ae66f4d..79de0a0d 100644 --- a/plugins/transport/utp/utp.go +++ b/plugins/transport/utp/utp.go @@ -7,8 +7,8 @@ import ( "net" "time" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/transport" ) type utpTransport struct { diff --git a/plugins/transport/utp/utp_test.go b/plugins/transport/utp/utp_test.go index 0a62f874..ce0b5a61 100644 --- a/plugins/transport/utp/utp_test.go +++ b/plugins/transport/utp/utp_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func expectedPort(t *testing.T, expected string, lsn transport.Listener) { diff --git a/plugins/wrapper/breaker/gobreaker/go.mod b/plugins/wrapper/breaker/gobreaker/go.mod index e0cfe162..6d9a64e8 100644 --- a/plugins/wrapper/breaker/gobreaker/go.mod +++ b/plugins/wrapper/breaker/gobreaker/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/sony/gobreaker v0.4.1 ) diff --git a/plugins/wrapper/breaker/gobreaker/gobreaker.go b/plugins/wrapper/breaker/gobreaker/gobreaker.go index 1911d507..75a7c6d4 100644 --- a/plugins/wrapper/breaker/gobreaker/gobreaker.go +++ b/plugins/wrapper/breaker/gobreaker/gobreaker.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/client" + "go-micro.dev/v4/errors" "github.com/sony/gobreaker" ) diff --git a/plugins/wrapper/breaker/gobreaker/gobreaker_test.go b/plugins/wrapper/breaker/gobreaker/gobreaker_test.go index 02a1204c..45857638 100644 --- a/plugins/wrapper/breaker/gobreaker/gobreaker_test.go +++ b/plugins/wrapper/breaker/gobreaker/gobreaker_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/errors" "github.com/asim/go-micro/plugins/registry/memory/v3" "github.com/sony/gobreaker" ) diff --git a/plugins/wrapper/breaker/hystrix/README.md b/plugins/wrapper/breaker/hystrix/README.md index 7d504cc9..f708d5e1 100644 --- a/plugins/wrapper/breaker/hystrix/README.md +++ b/plugins/wrapper/breaker/hystrix/README.md @@ -6,7 +6,7 @@ A go-micro plugin for go-hystrix. package main import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" hystrix "github.com/asim/go-micro/plugins/wrapper/breaker/hystrix/v3" ) @@ -24,7 +24,7 @@ func main() { package main import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" hystrix "github.com/asim/go-micro/plugins/wrapper/breaker/hystrix/v3" ) @@ -63,7 +63,7 @@ var ( package main import ( - "github.com/asim/go-micro/v3" + "go-micro.dev/v4" hystrix "github.com/asim/go-micro/plugins/wrapper/breaker/hystrix/v3" ) diff --git a/plugins/wrapper/breaker/hystrix/go.mod b/plugins/wrapper/breaker/hystrix/go.mod index bba3056b..7eb6396c 100644 --- a/plugins/wrapper/breaker/hystrix/go.mod +++ b/plugins/wrapper/breaker/hystrix/go.mod @@ -4,5 +4,5 @@ go 1.16 require ( github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 - github.com/asim/go-micro/v3 v3.6.0 + go-micro.dev/v4 v4.0.0 ) diff --git a/plugins/wrapper/breaker/hystrix/go.sum b/plugins/wrapper/breaker/hystrix/go.sum index 6d378f46..cf21a950 100644 --- a/plugins/wrapper/breaker/hystrix/go.sum +++ b/plugins/wrapper/breaker/hystrix/go.sum @@ -65,8 +65,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC 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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asim/go-micro/v3 v3.6.0 h1:I6UVJBpBtWNKCjWf0dRpZznRCW9TR4DXjV4wieyGhK0= -github.com/asim/go-micro/v3 v3.6.0/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8= +go-micro.dev/v4 v4.0.0 +go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/plugins/wrapper/breaker/hystrix/hystrix.go b/plugins/wrapper/breaker/hystrix/hystrix.go index 5edc16ea..d65d1284 100644 --- a/plugins/wrapper/breaker/hystrix/hystrix.go +++ b/plugins/wrapper/breaker/hystrix/hystrix.go @@ -4,7 +4,7 @@ import ( "context" "github.com/afex/hystrix-go/hystrix" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) type clientWrapper struct { diff --git a/plugins/wrapper/breaker/hystrix/hystrix_test.go b/plugins/wrapper/breaker/hystrix/hystrix_test.go index 06944e68..7f650483 100644 --- a/plugins/wrapper/breaker/hystrix/hystrix_test.go +++ b/plugins/wrapper/breaker/hystrix/hystrix_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/afex/hystrix-go/hystrix" - "github.com/asim/go-micro/v3/client" - merrors "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/client" + merrors "go-micro.dev/v4/errors" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" ) func TestBreaker(t *testing.T) { diff --git a/plugins/wrapper/endpoint/endpoint.go b/plugins/wrapper/endpoint/endpoint.go index 16d7fb03..0de59df3 100644 --- a/plugins/wrapper/endpoint/endpoint.go +++ b/plugins/wrapper/endpoint/endpoint.go @@ -2,8 +2,8 @@ package endpoint import ( - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/server" "context" ) diff --git a/plugins/wrapper/endpoint/go.mod b/plugins/wrapper/endpoint/go.mod index 98ae50f7..98636deb 100644 --- a/plugins/wrapper/endpoint/go.mod +++ b/plugins/wrapper/endpoint/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/wrapper/endpoint/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/wrapper/monitoring/prometheus/go.mod b/plugins/wrapper/monitoring/prometheus/go.mod index baea210e..b040a445 100644 --- a/plugins/wrapper/monitoring/prometheus/go.mod +++ b/plugins/wrapper/monitoring/prometheus/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/broker/memory/v3 v3.0.0-20210630062103-c13bb07171bc github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/prometheus/client_golang v1.11.0 github.com/prometheus/client_model v0.2.0 github.com/stretchr/testify v1.7.0 diff --git a/plugins/wrapper/monitoring/prometheus/prometheus.go b/plugins/wrapper/monitoring/prometheus/prometheus.go index 8113e08a..14f35d4b 100644 --- a/plugins/wrapper/monitoring/prometheus/prometheus.go +++ b/plugins/wrapper/monitoring/prometheus/prometheus.go @@ -3,10 +3,10 @@ package prometheus import ( "context" "fmt" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" "github.com/prometheus/client_golang/prometheus" ) diff --git a/plugins/wrapper/monitoring/prometheus/prometheus_test.go b/plugins/wrapper/monitoring/prometheus/prometheus_test.go index 3bc90ee3..8799397e 100644 --- a/plugins/wrapper/monitoring/prometheus/prometheus_test.go +++ b/plugins/wrapper/monitoring/prometheus/prometheus_test.go @@ -5,12 +5,12 @@ import ( "fmt" "testing" - "github.com/asim/go-micro/v3/broker" + "go-micro.dev/v4/broker" bmemory "github.com/asim/go-micro/plugins/broker/memory/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" promwrapper "github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/plugins/wrapper/monitoring/victoriametrics/go.mod b/plugins/wrapper/monitoring/victoriametrics/go.mod index b098c828..76fbdc56 100644 --- a/plugins/wrapper/monitoring/victoriametrics/go.mod +++ b/plugins/wrapper/monitoring/victoriametrics/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/VictoriaMetrics/metrics v1.17.2 github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/stretchr/testify v1.7.0 ) diff --git a/plugins/wrapper/monitoring/victoriametrics/victoriametrics.go b/plugins/wrapper/monitoring/victoriametrics/victoriametrics.go index be61c4ee..4300f6d4 100644 --- a/plugins/wrapper/monitoring/victoriametrics/victoriametrics.go +++ b/plugins/wrapper/monitoring/victoriametrics/victoriametrics.go @@ -7,9 +7,9 @@ import ( "time" metrics "github.com/VictoriaMetrics/metrics" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) var ( diff --git a/plugins/wrapper/monitoring/victoriametrics/victoriametrics_test.go b/plugins/wrapper/monitoring/victoriametrics/victoriametrics_test.go index e45e9e8b..cf64a760 100644 --- a/plugins/wrapper/monitoring/victoriametrics/victoriametrics_test.go +++ b/plugins/wrapper/monitoring/victoriametrics/victoriametrics_test.go @@ -10,10 +10,10 @@ import ( "testing" metrics "github.com/VictoriaMetrics/metrics" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" "github.com/stretchr/testify/assert" ) diff --git a/plugins/wrapper/ratelimiter/ratelimit/go.mod b/plugins/wrapper/ratelimiter/ratelimit/go.mod index f90b5c82..d9e5247e 100644 --- a/plugins/wrapper/ratelimiter/ratelimit/go.mod +++ b/plugins/wrapper/ratelimiter/ratelimit/go.mod @@ -6,7 +6,7 @@ require ( github.com/asim/go-micro/plugins/broker/memory/v3 v3.0.0-20210630062103-c13bb07171bc github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc github.com/asim/go-micro/plugins/transport/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/juju/ratelimit v1.0.1 ) diff --git a/plugins/wrapper/ratelimiter/ratelimit/ratelimit.go b/plugins/wrapper/ratelimiter/ratelimit/ratelimit.go index 8e59fb41..535eaa6c 100644 --- a/plugins/wrapper/ratelimiter/ratelimit/ratelimit.go +++ b/plugins/wrapper/ratelimiter/ratelimit/ratelimit.go @@ -4,9 +4,9 @@ import ( "time" "github.com/juju/ratelimit" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/server" "context" ) diff --git a/plugins/wrapper/ratelimiter/ratelimit/ratelimit_test.go b/plugins/wrapper/ratelimiter/ratelimit/ratelimit_test.go index 2f5560e2..1d37b908 100644 --- a/plugins/wrapper/ratelimiter/ratelimit/ratelimit_test.go +++ b/plugins/wrapper/ratelimiter/ratelimit/ratelimit_test.go @@ -9,11 +9,11 @@ import ( "github.com/juju/ratelimit" bmemory "github.com/asim/go-micro/plugins/broker/memory/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/errors" rmemory "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" tmemory "github.com/asim/go-micro/plugins/transport/memory/v3" ) diff --git a/plugins/wrapper/ratelimiter/uber/go.mod b/plugins/wrapper/ratelimiter/uber/go.mod index 54532bbb..ca419b06 100644 --- a/plugins/wrapper/ratelimiter/uber/go.mod +++ b/plugins/wrapper/ratelimiter/uber/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/wrapper/ratelimiter/uber/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 go.uber.org/ratelimit v0.2.0 ) diff --git a/plugins/wrapper/ratelimiter/uber/uber.go b/plugins/wrapper/ratelimiter/uber/uber.go index 1e6b78b0..6778d0b6 100644 --- a/plugins/wrapper/ratelimiter/uber/uber.go +++ b/plugins/wrapper/ratelimiter/uber/uber.go @@ -1,8 +1,8 @@ package ratelimit import ( - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/server" "go.uber.org/ratelimit" "context" diff --git a/plugins/wrapper/select/roundrobin/go.mod b/plugins/wrapper/select/roundrobin/go.mod index f5f012d1..86d949f0 100644 --- a/plugins/wrapper/select/roundrobin/go.mod +++ b/plugins/wrapper/select/roundrobin/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../../go-micro diff --git a/plugins/wrapper/select/roundrobin/roundrobin.go b/plugins/wrapper/select/roundrobin/roundrobin.go index bd0253b3..767488b3 100644 --- a/plugins/wrapper/select/roundrobin/roundrobin.go +++ b/plugins/wrapper/select/roundrobin/roundrobin.go @@ -4,9 +4,9 @@ package roundrobin import ( "sync" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/registry" "context" ) diff --git a/plugins/wrapper/select/shard/go.mod b/plugins/wrapper/select/shard/go.mod index 4b06acdc..d5024c12 100644 --- a/plugins/wrapper/select/shard/go.mod +++ b/plugins/wrapper/select/shard/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/wrapper/select/shard/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../../go-micro diff --git a/plugins/wrapper/select/shard/shard.go b/plugins/wrapper/select/shard/shard.go index 89f711eb..64d74233 100644 --- a/plugins/wrapper/select/shard/shard.go +++ b/plugins/wrapper/select/shard/shard.go @@ -4,10 +4,10 @@ package shard import ( "hash/crc32" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" "context" ) diff --git a/plugins/wrapper/select/version/go.mod b/plugins/wrapper/select/version/go.mod index 0193b9ed..4b723de7 100644 --- a/plugins/wrapper/select/version/go.mod +++ b/plugins/wrapper/select/version/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/wrapper/select/version/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../../go-micro diff --git a/plugins/wrapper/select/version/version.go b/plugins/wrapper/select/version/version.go index c4fc89c3..5c06d39e 100644 --- a/plugins/wrapper/select/version/version.go +++ b/plugins/wrapper/select/version/version.go @@ -4,9 +4,9 @@ import ( "context" "sort" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + "go-micro.dev/v4/registry" ) // NewClientWrapper is a wrapper which selects only latest versions of services diff --git a/plugins/wrapper/service/go.mod b/plugins/wrapper/service/go.mod index c2810d49..9978da79 100644 --- a/plugins/wrapper/service/go.mod +++ b/plugins/wrapper/service/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/wrapper/service/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/wrapper/service/service.go b/plugins/wrapper/service/service.go index 0d8c7424..e6588798 100644 --- a/plugins/wrapper/service/service.go +++ b/plugins/wrapper/service/service.go @@ -2,9 +2,9 @@ package service import ( - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4" + "go-micro.dev/v4/client" + "go-micro.dev/v4/server" "context" ) diff --git a/plugins/wrapper/trace/awsxray/awsxray.go b/plugins/wrapper/trace/awsxray/awsxray.go index 1a50711d..555d0847 100644 --- a/plugins/wrapper/trace/awsxray/awsxray.go +++ b/plugins/wrapper/trace/awsxray/awsxray.go @@ -4,9 +4,9 @@ package awsxray import ( "context" "github.com/asim/go-awsxray" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) type xrayWrapper struct { diff --git a/plugins/wrapper/trace/awsxray/go.mod b/plugins/wrapper/trace/awsxray/go.mod index f2a25323..d0178781 100644 --- a/plugins/wrapper/trace/awsxray/go.mod +++ b/plugins/wrapper/trace/awsxray/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-awsxray v0.0.0-20161209120537-0d8a60b6e205 - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/aws/aws-sdk-go v1.38.69 ) diff --git a/plugins/wrapper/trace/awsxray/util.go b/plugins/wrapper/trace/awsxray/util.go index 4d37cb70..449e8d8e 100644 --- a/plugins/wrapper/trace/awsxray/util.go +++ b/plugins/wrapper/trace/awsxray/util.go @@ -9,8 +9,8 @@ import ( "context" "github.com/asim/go-awsxray" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/metadata" ) // getHTTP returns a http struct diff --git a/plugins/wrapper/trace/datadog/datadog.go b/plugins/wrapper/trace/datadog/datadog.go index e41f1496..55b01090 100644 --- a/plugins/wrapper/trace/datadog/datadog.go +++ b/plugins/wrapper/trace/datadog/datadog.go @@ -2,12 +2,12 @@ package datadog import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" "context" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/server" ) var noDebugStack = true diff --git a/plugins/wrapper/trace/datadog/datadog_test.go b/plugins/wrapper/trace/datadog/datadog_test.go index 37bfe7d1..95fb344a 100644 --- a/plugins/wrapper/trace/datadog/datadog_test.go +++ b/plugins/wrapper/trace/datadog/datadog_test.go @@ -9,16 +9,16 @@ import ( "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - microerr "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + microerr "go-micro.dev/v4/errors" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" "github.com/stretchr/testify/assert" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer" - cli "github.com/asim/go-micro/v3/client" - srv "github.com/asim/go-micro/v3/server" + cli "go-micro.dev/v4/client" + srv "go-micro.dev/v4/server" ) type Test interface { diff --git a/plugins/wrapper/trace/datadog/go.mod b/plugins/wrapper/trace/datadog/go.mod index e2202400..6c5f72e3 100644 --- a/plugins/wrapper/trace/datadog/go.mod +++ b/plugins/wrapper/trace/datadog/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/stretchr/testify v1.7.0 diff --git a/plugins/wrapper/trace/datadog/helper.go b/plugins/wrapper/trace/datadog/helper.go index 60e49b0a..c0f06cca 100644 --- a/plugins/wrapper/trace/datadog/helper.go +++ b/plugins/wrapper/trace/datadog/helper.go @@ -3,8 +3,8 @@ package datadog import ( "context" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" ) diff --git a/plugins/wrapper/trace/datadog/tracker.go b/plugins/wrapper/trace/datadog/tracker.go index 75f56ba9..1263fae5 100644 --- a/plugins/wrapper/trace/datadog/tracker.go +++ b/plugins/wrapper/trace/datadog/tracker.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" - microerr "github.com/asim/go-micro/v3/errors" + microerr "go-micro.dev/v4/errors" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" diff --git a/plugins/wrapper/trace/opencensus/go.mod b/plugins/wrapper/trace/opencensus/go.mod index 8155a447..7f656bfc 100644 --- a/plugins/wrapper/trace/opencensus/go.mod +++ b/plugins/wrapper/trace/opencensus/go.mod @@ -3,7 +3,7 @@ module github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 go 1.16 require ( - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 go.opencensus.io v0.23.0 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 ) diff --git a/plugins/wrapper/trace/opencensus/opencensus.go b/plugins/wrapper/trace/opencensus/opencensus.go index 155800eb..e4337298 100644 --- a/plugins/wrapper/trace/opencensus/opencensus.go +++ b/plugins/wrapper/trace/opencensus/opencensus.go @@ -6,10 +6,10 @@ import ( "encoding/base64" "fmt" - "github.com/asim/go-micro/v3/client" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/server" "go.opencensus.io/trace" "go.opencensus.io/trace/propagation" ) diff --git a/plugins/wrapper/trace/opencensus/status.go b/plugins/wrapper/trace/opencensus/status.go index e49ff5a5..bb7bdceb 100644 --- a/plugins/wrapper/trace/opencensus/status.go +++ b/plugins/wrapper/trace/opencensus/status.go @@ -3,7 +3,7 @@ package opencensus import ( "fmt" - microerr "github.com/asim/go-micro/v3/errors" + microerr "go-micro.dev/v4/errors" "go.opencensus.io/trace" diff --git a/plugins/wrapper/trace/opentracing/go.mod b/plugins/wrapper/trace/opentracing/go.mod index 64b13080..d52ca75e 100644 --- a/plugins/wrapper/trace/opentracing/go.mod +++ b/plugins/wrapper/trace/opentracing/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc - github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc + go-micro.dev/v4 v4.0.0 github.com/opentracing/opentracing-go v1.2.0 github.com/stretchr/testify v1.7.0 ) diff --git a/plugins/wrapper/trace/opentracing/opentracing.go b/plugins/wrapper/trace/opentracing/opentracing.go index b5de2902..0d90eb08 100644 --- a/plugins/wrapper/trace/opentracing/opentracing.go +++ b/plugins/wrapper/trace/opentracing/opentracing.go @@ -7,10 +7,10 @@ import ( "context" "strings" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" opentracing "github.com/opentracing/opentracing-go" opentracinglog "github.com/opentracing/opentracing-go/log" ) diff --git a/plugins/wrapper/trace/opentracing/opentracing_test.go b/plugins/wrapper/trace/opentracing/opentracing_test.go index 0df7b5e3..df4ff300 100644 --- a/plugins/wrapper/trace/opentracing/opentracing_test.go +++ b/plugins/wrapper/trace/opentracing/opentracing_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/selector" - microerr "github.com/asim/go-micro/v3/errors" + "go-micro.dev/v4/client" + "go-micro.dev/v4/selector" + microerr "go-micro.dev/v4/errors" "github.com/asim/go-micro/plugins/registry/memory/v3" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/mocktracer" "github.com/stretchr/testify/assert" - cli "github.com/asim/go-micro/v3/client" - srv "github.com/asim/go-micro/v3/server" + cli "go-micro.dev/v4/client" + srv "go-micro.dev/v4/server" ) type Test interface { diff --git a/plugins/wrapper/validator/go.mod b/plugins/wrapper/validator/go.mod index d59c52cf..bd4534c9 100644 --- a/plugins/wrapper/validator/go.mod +++ b/plugins/wrapper/validator/go.mod @@ -2,6 +2,6 @@ module github.com/asim/go-micro/plugins/wrapper/validator/v3 go 1.16 -require github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc +require go-micro.dev/v4 v4.0.0 replace github.com/asim/go-micro/v3 => ../../../../go-micro diff --git a/plugins/wrapper/validator/validator.go b/plugins/wrapper/validator/validator.go index fa5b845a..f1903068 100644 --- a/plugins/wrapper/validator/validator.go +++ b/plugins/wrapper/validator/validator.go @@ -3,8 +3,8 @@ package validator import ( "context" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/server" ) type Validator interface { diff --git a/registry/cache/cache.go b/registry/cache/cache.go index 378505f8..e2d259ad 100644 --- a/registry/cache/cache.go +++ b/registry/cache/cache.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - util "github.com/asim/go-micro/v3/util/registry" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + util "go-micro.dev/v4/util/registry" "golang.org/x/sync/singleflight" ) diff --git a/registry/mdns_registry.go b/registry/mdns_registry.go index c59fdaf6..2466bc23 100644 --- a/registry/mdns_registry.go +++ b/registry/mdns_registry.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/util/mdns" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/util/mdns" "github.com/google/uuid" ) diff --git a/registry/memory.go b/registry/memory.go index 3e747592..bb06391e 100644 --- a/registry/memory.go +++ b/registry/memory.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" "github.com/google/uuid" ) diff --git a/runtime/default.go b/runtime/default.go index 5775a966..447116f8 100644 --- a/runtime/default.go +++ b/runtime/default.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/runtime/local/git" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/runtime/local/git" "github.com/nxadm/tail" ) diff --git a/runtime/kubernetes/kubernetes.go b/runtime/kubernetes/kubernetes.go index 5606ed89..c72ca04a 100644 --- a/runtime/kubernetes/kubernetes.go +++ b/runtime/kubernetes/kubernetes.go @@ -6,9 +6,9 @@ import ( "sync" "time" - log "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/util/kubernetes/client" + log "go-micro.dev/v4/logger" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/util/kubernetes/client" ) // action to take on runtime service diff --git a/runtime/kubernetes/logs.go b/runtime/kubernetes/logs.go index ab80d574..b1cb471a 100644 --- a/runtime/kubernetes/logs.go +++ b/runtime/kubernetes/logs.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/util/kubernetes/client" - "github.com/asim/go-micro/v3/util/log" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/util/kubernetes/client" + "go-micro.dev/v4/util/log" ) type klog struct { diff --git a/runtime/kubernetes/service.go b/runtime/kubernetes/service.go index da7d8e55..812635dd 100644 --- a/runtime/kubernetes/service.go +++ b/runtime/kubernetes/service.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/runtime" - "github.com/asim/go-micro/v3/util/kubernetes/api" - "github.com/asim/go-micro/v3/util/kubernetes/client" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/runtime" + "go-micro.dev/v4/util/kubernetes/api" + "go-micro.dev/v4/util/kubernetes/client" ) type service struct { diff --git a/runtime/local/build/build.go b/runtime/local/build/build.go index f2c27c02..8241c276 100644 --- a/runtime/local/build/build.go +++ b/runtime/local/build/build.go @@ -2,7 +2,7 @@ package build import ( - "github.com/asim/go-micro/v3/runtime/local/source" + "go-micro.dev/v4/runtime/local/source" ) // Builder builds binaries diff --git a/runtime/local/build/docker/docker.go b/runtime/local/build/docker/docker.go index f95eccdd..32a0c998 100644 --- a/runtime/local/build/docker/docker.go +++ b/runtime/local/build/docker/docker.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/runtime/local/build" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/runtime/local/build" docker "github.com/fsouza/go-dockerclient" ) diff --git a/runtime/local/build/go/golang.go b/runtime/local/build/go/golang.go index 3a3b0e50..7b3337c6 100644 --- a/runtime/local/build/go/golang.go +++ b/runtime/local/build/go/golang.go @@ -6,7 +6,7 @@ import ( "os/exec" "path/filepath" - "github.com/asim/go-micro/v3/runtime/local/build" + "go-micro.dev/v4/runtime/local/build" ) type Builder struct { diff --git a/runtime/local/local.go b/runtime/local/local.go index 317cbf42..ce9f535d 100644 --- a/runtime/local/local.go +++ b/runtime/local/local.go @@ -2,7 +2,7 @@ package local import ( - "github.com/asim/go-micro/v3/runtime" + "go-micro.dev/v4/runtime" ) // NewRuntime returns a new local runtime diff --git a/runtime/local/process/os/os.go b/runtime/local/process/os/os.go index 8a1c88a7..ff08b740 100644 --- a/runtime/local/process/os/os.go +++ b/runtime/local/process/os/os.go @@ -10,7 +10,7 @@ import ( "strconv" "syscall" - "github.com/asim/go-micro/v3/runtime/local/process" + "go-micro.dev/v4/runtime/local/process" ) func (p *Process) Exec(exe *process.Executable) error { diff --git a/runtime/local/process/os/os_windows.go b/runtime/local/process/os/os_windows.go index 3cf8f95b..c94f9517 100644 --- a/runtime/local/process/os/os_windows.go +++ b/runtime/local/process/os/os_windows.go @@ -7,7 +7,7 @@ import ( "os/exec" "strconv" - "github.com/asim/go-micro/v3/runtime/local/process" + "go-micro.dev/v4/runtime/local/process" ) func (p *Process) Exec(exe *process.Executable) error { diff --git a/runtime/local/process/os/process.go b/runtime/local/process/os/process.go index 614b5ae2..520756d8 100644 --- a/runtime/local/process/os/process.go +++ b/runtime/local/process/os/process.go @@ -2,7 +2,7 @@ package os import ( - "github.com/asim/go-micro/v3/runtime/local/process" + "go-micro.dev/v4/runtime/local/process" ) type Process struct{} diff --git a/runtime/local/process/process.go b/runtime/local/process/process.go index 65e3df21..fb718c98 100644 --- a/runtime/local/process/process.go +++ b/runtime/local/process/process.go @@ -4,7 +4,7 @@ package process import ( "io" - "github.com/asim/go-micro/v3/runtime/local/build" + "go-micro.dev/v4/runtime/local/build" ) // Process manages a running process diff --git a/runtime/local/source/git/git.go b/runtime/local/source/git/git.go index aef7daf3..67b90fec 100644 --- a/runtime/local/source/git/git.go +++ b/runtime/local/source/git/git.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/asim/go-micro/v3/runtime/local/source" + "go-micro.dev/v4/runtime/local/source" "github.com/go-git/go-git/v5" ) diff --git a/runtime/local/source/go/golang.go b/runtime/local/source/go/golang.go index 0e34b50b..e01c8006 100644 --- a/runtime/local/source/go/golang.go +++ b/runtime/local/source/go/golang.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/asim/go-micro/v3/runtime/local/source" + "go-micro.dev/v4/runtime/local/source" ) type Source struct { diff --git a/runtime/options.go b/runtime/options.go index 25f8ee81..df3fa538 100644 --- a/runtime/options.go +++ b/runtime/options.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) type Option func(o *Options) diff --git a/runtime/service.go b/runtime/service.go index cb1af975..b599d9d8 100644 --- a/runtime/service.go +++ b/runtime/service.go @@ -8,10 +8,10 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/runtime/local/build" - "github.com/asim/go-micro/v3/runtime/local/process" - proc "github.com/asim/go-micro/v3/runtime/local/process/os" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/runtime/local/build" + "go-micro.dev/v4/runtime/local/process" + proc "go-micro.dev/v4/runtime/local/process/os" ) type service struct { diff --git a/selector/common_test.go b/selector/common_test.go index 1c679af8..1fe797e1 100644 --- a/selector/common_test.go +++ b/selector/common_test.go @@ -1,7 +1,7 @@ package selector import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) var ( diff --git a/selector/default.go b/selector/default.go index 61dc3e53..fa8aebf2 100644 --- a/selector/default.go +++ b/selector/default.go @@ -3,8 +3,8 @@ package selector import ( "time" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/registry/cache" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/registry/cache" ) type registrySelector struct { diff --git a/selector/default_test.go b/selector/default_test.go index 936ed587..451e77f2 100644 --- a/selector/default_test.go +++ b/selector/default_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestRegistrySelector(t *testing.T) { diff --git a/selector/filter.go b/selector/filter.go index b9646d46..874e5b69 100644 --- a/selector/filter.go +++ b/selector/filter.go @@ -1,7 +1,7 @@ package selector import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) // FilterEndpoint is an endpoint based Select Filter which will diff --git a/selector/filter_test.go b/selector/filter_test.go index b8a0224e..eef4c038 100644 --- a/selector/filter_test.go +++ b/selector/filter_test.go @@ -3,7 +3,7 @@ package selector import ( "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestFilterEndpoint(t *testing.T) { diff --git a/selector/options.go b/selector/options.go index a3f6eacd..b36690bd 100644 --- a/selector/options.go +++ b/selector/options.go @@ -3,7 +3,7 @@ package selector import ( "context" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type Options struct { diff --git a/selector/selector.go b/selector/selector.go index 1b23c107..4391d729 100644 --- a/selector/selector.go +++ b/selector/selector.go @@ -4,7 +4,7 @@ package selector import ( "errors" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) // Selector builds on the registry as a mechanism to pick nodes diff --git a/selector/strategy.go b/selector/strategy.go index 41e0ef52..e42a3e42 100644 --- a/selector/strategy.go +++ b/selector/strategy.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func init() { diff --git a/selector/strategy_test.go b/selector/strategy_test.go index 4831d78e..c672e456 100644 --- a/selector/strategy_test.go +++ b/selector/strategy_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestStrategies(t *testing.T) { diff --git a/server/extractor.go b/server/extractor.go index 9514bc08..0a37e211 100644 --- a/server/extractor.go +++ b/server/extractor.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func extractValue(v reflect.Type, d int) *registry.Value { diff --git a/server/extractor_test.go b/server/extractor_test.go index 09daaa0f..f650d64e 100644 --- a/server/extractor_test.go +++ b/server/extractor_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type testHandler struct{} diff --git a/server/mock/mock.go b/server/mock/mock.go index 84e9a2bc..3eb31b97 100644 --- a/server/mock/mock.go +++ b/server/mock/mock.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" "github.com/google/uuid" ) diff --git a/server/mock/mock_handler.go b/server/mock/mock_handler.go index 33e93243..97925ec5 100644 --- a/server/mock/mock_handler.go +++ b/server/mock/mock_handler.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) type MockHandler struct { diff --git a/server/mock/mock_subscriber.go b/server/mock/mock_subscriber.go index d879fe48..5ceafb6b 100644 --- a/server/mock/mock_subscriber.go +++ b/server/mock/mock_subscriber.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/server" ) type MockSubscriber struct { diff --git a/server/mock/mock_test.go b/server/mock/mock_test.go index ae8ec862..f8e8beae 100644 --- a/server/mock/mock_test.go +++ b/server/mock/mock_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/server" ) func TestMockServer(t *testing.T) { diff --git a/server/options.go b/server/options.go index 621155dd..8bb3654b 100644 --- a/server/options.go +++ b/server/options.go @@ -6,11 +6,11 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/transport" ) type Options struct { diff --git a/server/proto/server.pb.micro.go b/server/proto/server.pb.micro.go index c529bd50..b5c8951d 100644 --- a/server/proto/server.pb.micro.go +++ b/server/proto/server.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/server/rpc_codec.go b/server/rpc_codec.go index bbff1f44..f7ad93e8 100644 --- a/server/rpc_codec.go +++ b/server/rpc_codec.go @@ -4,14 +4,14 @@ import ( "bytes" "sync" - "github.com/asim/go-micro/v3/codec" - raw "github.com/asim/go-micro/v3/codec/bytes" - "github.com/asim/go-micro/v3/codec/grpc" - "github.com/asim/go-micro/v3/codec/json" - "github.com/asim/go-micro/v3/codec/jsonrpc" - "github.com/asim/go-micro/v3/codec/proto" - "github.com/asim/go-micro/v3/codec/protorpc" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/codec" + raw "go-micro.dev/v4/codec/bytes" + "go-micro.dev/v4/codec/grpc" + "go-micro.dev/v4/codec/json" + "go-micro.dev/v4/codec/jsonrpc" + "go-micro.dev/v4/codec/proto" + "go-micro.dev/v4/codec/protorpc" + "go-micro.dev/v4/transport" "github.com/oxtoacart/bpool" "github.com/pkg/errors" ) diff --git a/server/rpc_codec_test.go b/server/rpc_codec_test.go index c13a9d54..c8539027 100644 --- a/server/rpc_codec_test.go +++ b/server/rpc_codec_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/transport" ) // testCodec is a dummy codec that only knows how to encode nil bodies diff --git a/server/rpc_event.go b/server/rpc_event.go index ae47bf49..674bf9dc 100644 --- a/server/rpc_event.go +++ b/server/rpc_event.go @@ -1,8 +1,8 @@ package server import ( - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/transport" ) // event is a broker event we handle on the server transport diff --git a/server/rpc_handler.go b/server/rpc_handler.go index cd03bf4f..e85ab84f 100644 --- a/server/rpc_handler.go +++ b/server/rpc_handler.go @@ -3,7 +3,7 @@ package server import ( "reflect" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type rpcHandler struct { diff --git a/server/rpc_request.go b/server/rpc_request.go index 2f479fdc..8d55db46 100644 --- a/server/rpc_request.go +++ b/server/rpc_request.go @@ -3,9 +3,9 @@ package server import ( "bytes" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/transport" - "github.com/asim/go-micro/v3/util/buf" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/transport" + "go-micro.dev/v4/util/buf" ) type rpcRequest struct { diff --git a/server/rpc_response.go b/server/rpc_response.go index f8dc306d..3dc38683 100644 --- a/server/rpc_response.go +++ b/server/rpc_response.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/transport" ) type rpcResponse struct { diff --git a/server/rpc_router.go b/server/rpc_router.go index d4fc1d82..7985b9ab 100644 --- a/server/rpc_router.go +++ b/server/rpc_router.go @@ -18,9 +18,9 @@ import ( "unicode" "unicode/utf8" - "github.com/asim/go-micro/v3/codec" - merrors "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/codec" + merrors "go-micro.dev/v4/errors" + "go-micro.dev/v4/logger" ) var ( diff --git a/server/rpc_server.go b/server/rpc_server.go index 4b320f77..f1ed9720 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -12,17 +12,17 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/broker" - "github.com/asim/go-micro/v3/codec" - raw "github.com/asim/go-micro/v3/codec/bytes" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/transport" - "github.com/asim/go-micro/v3/util/addr" - "github.com/asim/go-micro/v3/util/backoff" - mnet "github.com/asim/go-micro/v3/util/net" - "github.com/asim/go-micro/v3/util/socket" + "go-micro.dev/v4/broker" + "go-micro.dev/v4/codec" + raw "go-micro.dev/v4/codec/bytes" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/transport" + "go-micro.dev/v4/util/addr" + "go-micro.dev/v4/util/backoff" + mnet "go-micro.dev/v4/util/net" + "go-micro.dev/v4/util/socket" ) type rpcServer struct { diff --git a/server/rpc_stream.go b/server/rpc_stream.go index 39513b7b..9da10593 100644 --- a/server/rpc_stream.go +++ b/server/rpc_stream.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) // Implements the Streamer interface diff --git a/server/rpc_stream_test.go b/server/rpc_stream_test.go index b6571f77..6de74d35 100644 --- a/server/rpc_stream_test.go +++ b/server/rpc_stream_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/codec/json" - protoCodec "github.com/asim/go-micro/v3/codec/proto" + "go-micro.dev/v4/codec/json" + protoCodec "go-micro.dev/v4/codec/proto" "github.com/golang/protobuf/proto" ) diff --git a/server/server.go b/server/server.go index 8792fde5..31fa2134 100644 --- a/server/server.go +++ b/server/server.go @@ -7,10 +7,10 @@ import ( "os/signal" "time" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - signalutil "github.com/asim/go-micro/v3/util/signal" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + signalutil "go-micro.dev/v4/util/signal" "github.com/google/uuid" ) diff --git a/server/subscriber.go b/server/subscriber.go index 34f47d15..1993e482 100644 --- a/server/subscriber.go +++ b/server/subscriber.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) const ( diff --git a/service.go b/service.go index 66c8c0b6..130a56a2 100644 --- a/service.go +++ b/service.go @@ -7,17 +7,17 @@ import ( "strings" "sync" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/cmd" - "github.com/asim/go-micro/v3/debug/handler" - "github.com/asim/go-micro/v3/debug/stats" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/logger" - plugin "github.com/asim/go-micro/v3/plugins" - "github.com/asim/go-micro/v3/server" - "github.com/asim/go-micro/v3/store" - signalutil "github.com/asim/go-micro/v3/util/signal" - "github.com/asim/go-micro/v3/util/wrapper" + "go-micro.dev/v4/client" + "go-micro.dev/v4/cmd" + "go-micro.dev/v4/debug/handler" + "go-micro.dev/v4/debug/stats" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/logger" + plugin "go-micro.dev/v4/plugins" + "go-micro.dev/v4/server" + "go-micro.dev/v4/store" + signalutil "go-micro.dev/v4/util/signal" + "go-micro.dev/v4/util/wrapper" ) type service struct { diff --git a/service_test.go b/service_test.go index 43ce8e3f..c3c18952 100644 --- a/service_test.go +++ b/service_test.go @@ -6,10 +6,10 @@ import ( "sync" "testing" - "github.com/asim/go-micro/v3/client" - proto "github.com/asim/go-micro/v3/debug/proto" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/util/test" + "go-micro.dev/v4/client" + proto "go-micro.dev/v4/debug/proto" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/util/test" ) func testShutdown(wg *sync.WaitGroup, cancel func()) { diff --git a/services/README.md b/services/README.md index fc834876..f676b528 100644 --- a/services/README.md +++ b/services/README.md @@ -78,7 +78,7 @@ import ( "fmt" "os" - "github.com/asim/go-micro/v3/services/currency" + "go-micro.dev/v4/services/currency" ) var ( diff --git a/store/options.go b/store/options.go index 4f7fa3f3..30cf9ad0 100644 --- a/store/options.go +++ b/store/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/asim/go-micro/v3/client" + "go-micro.dev/v4/client" ) // Options contains configuration for the Store diff --git a/transport/http_transport.go b/transport/http_transport.go index 1063769c..410de9ac 100644 --- a/transport/http_transport.go +++ b/transport/http_transport.go @@ -13,10 +13,10 @@ import ( "sync" "time" - maddr "github.com/asim/go-micro/v3/util/addr" - "github.com/asim/go-micro/v3/util/buf" - mnet "github.com/asim/go-micro/v3/util/net" - mls "github.com/asim/go-micro/v3/util/tls" + maddr "go-micro.dev/v4/util/addr" + "go-micro.dev/v4/util/buf" + mnet "go-micro.dev/v4/util/net" + mls "go-micro.dev/v4/util/tls" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/transport/memory.go b/transport/memory.go index a6885e84..09f1f9d9 100644 --- a/transport/memory.go +++ b/transport/memory.go @@ -9,8 +9,8 @@ import ( "sync" "time" - maddr "github.com/asim/go-micro/v3/util/addr" - mnet "github.com/asim/go-micro/v3/util/net" + maddr "go-micro.dev/v4/util/addr" + mnet "go-micro.dev/v4/util/net" ) type memorySocket struct { diff --git a/transport/options.go b/transport/options.go index 26a0cd9f..896dc7db 100644 --- a/transport/options.go +++ b/transport/options.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "time" - "github.com/asim/go-micro/v3/codec" + "go-micro.dev/v4/codec" ) type Options struct { diff --git a/util/ctx/ctx.go b/util/ctx/ctx.go index 43bd7bd5..9b33f97a 100644 --- a/util/ctx/ctx.go +++ b/util/ctx/ctx.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4/metadata" ) func FromRequest(r *http.Request) context.Context { diff --git a/util/ctx/ctx_test.go b/util/ctx/ctx_test.go index a150e91a..9d2b36e8 100644 --- a/util/ctx/ctx_test.go +++ b/util/ctx/ctx_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/asim/go-micro/v3/metadata" + "go-micro.dev/v4/metadata" ) func TestRequestToContext(t *testing.T) { diff --git a/util/file/client.go b/util/file/client.go index 2fa6e32f..d9971648 100644 --- a/util/file/client.go +++ b/util/file/client.go @@ -9,8 +9,8 @@ import ( "log" "os" - "github.com/asim/go-micro/v3/client" - proto "github.com/asim/go-micro/v3/util/file/proto" + "go-micro.dev/v4/client" + proto "go-micro.dev/v4/util/file/proto" ) // Client is the client interface to access files diff --git a/util/file/handler.go b/util/file/handler.go index 36e73466..0ca97361 100644 --- a/util/file/handler.go +++ b/util/file/handler.go @@ -6,10 +6,10 @@ import ( "path/filepath" "sync" - "github.com/asim/go-micro/v3/errors" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/server" - proto "github.com/asim/go-micro/v3/util/file/proto" + "go-micro.dev/v4/errors" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/server" + proto "go-micro.dev/v4/util/file/proto" "golang.org/x/net/context" ) diff --git a/util/file/proto/file.pb.micro.go b/util/file/proto/file.pb.micro.go index 7cce65b4..471fa87d 100644 --- a/util/file/proto/file.pb.micro.go +++ b/util/file/proto/file.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "github.com/asim/go-micro/v3/api" - client "github.com/asim/go-micro/v3/client" - server "github.com/asim/go-micro/v3/server" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/util/http/http.go b/util/http/http.go index 31360e34..084d6878 100644 --- a/util/http/http.go +++ b/util/http/http.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/registry" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/registry" + "go-micro.dev/v4/selector" ) // Write sets the status and body on a http ResponseWriter diff --git a/util/http/http_test.go b/util/http/http_test.go index c3d88efa..9d1178de 100644 --- a/util/http/http_test.go +++ b/util/http/http_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestRoundTripper(t *testing.T) { diff --git a/util/http/options.go b/util/http/options.go index aad26bbb..8e2448f1 100644 --- a/util/http/options.go +++ b/util/http/options.go @@ -1,7 +1,7 @@ package http import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) type Options struct { diff --git a/util/http/roundtripper.go b/util/http/roundtripper.go index f9b01ba2..9c719cb4 100644 --- a/util/http/roundtripper.go +++ b/util/http/roundtripper.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/asim/go-micro/v3/selector" + "go-micro.dev/v4/selector" ) type roundTripper struct { diff --git a/util/io/io.go b/util/io/io.go index 13aeb6ad..76465392 100644 --- a/util/io/io.go +++ b/util/io/io.go @@ -4,7 +4,7 @@ package io import ( "io" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) type rwc struct { diff --git a/util/kubernetes/api/request.go b/util/kubernetes/api/request.go index d9153668..ea954228 100644 --- a/util/kubernetes/api/request.go +++ b/util/kubernetes/api/request.go @@ -10,7 +10,7 @@ import ( "net/http" "net/url" - "github.com/asim/go-micro/v3/logger" + "go-micro.dev/v4/logger" ) // Request is used to construct a http request for the k8s API. diff --git a/util/kubernetes/client/client.go b/util/kubernetes/client/client.go index a02dfdbe..e4430a93 100644 --- a/util/kubernetes/client/client.go +++ b/util/kubernetes/client/client.go @@ -13,8 +13,8 @@ import ( "regexp" "strings" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/util/kubernetes/api" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/util/kubernetes/api" ) var ( diff --git a/util/kubernetes/client/watch.go b/util/kubernetes/client/watch.go index fb2e0eca..e4e757f7 100644 --- a/util/kubernetes/client/watch.go +++ b/util/kubernetes/client/watch.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "github.com/asim/go-micro/v3/util/kubernetes/api" + "go-micro.dev/v4/util/kubernetes/api" ) const ( diff --git a/util/log/log.go b/util/log/log.go index 8f919442..2484813e 100644 --- a/util/log/log.go +++ b/util/log/log.go @@ -7,8 +7,8 @@ import ( "os" "sync/atomic" - dlog "github.com/asim/go-micro/v3/debug/log" - nlog "github.com/asim/go-micro/v3/logger" + dlog "go-micro.dev/v4/debug/log" + nlog "go-micro.dev/v4/logger" ) // level is a log level diff --git a/util/mdns/server.go b/util/mdns/server.go index 531b2e55..96c1a590 100644 --- a/util/mdns/server.go +++ b/util/mdns/server.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - log "github.com/asim/go-micro/v3/logger" + log "go-micro.dev/v4/logger" "github.com/miekg/dns" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" diff --git a/util/pool/default.go b/util/pool/default.go index 3d2fbd07..9e11c87a 100644 --- a/util/pool/default.go +++ b/util/pool/default.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" "github.com/google/uuid" ) diff --git a/util/pool/default_test.go b/util/pool/default_test.go index 899540e9..3a38ce13 100644 --- a/util/pool/default_test.go +++ b/util/pool/default_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) func testPool(t *testing.T, size int, ttl time.Duration) { diff --git a/util/pool/options.go b/util/pool/options.go index 4a6bbea4..0772e229 100644 --- a/util/pool/options.go +++ b/util/pool/options.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) type Options struct { diff --git a/util/pool/pool.go b/util/pool/pool.go index d63960fc..1dfee597 100644 --- a/util/pool/pool.go +++ b/util/pool/pool.go @@ -4,7 +4,7 @@ package pool import ( "time" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) // Pool is an interface for connection pooling diff --git a/util/registry/util.go b/util/registry/util.go index edea2a09..7194bf03 100644 --- a/util/registry/util.go +++ b/util/registry/util.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func addNodes(old, neu []*registry.Node) []*registry.Node { diff --git a/util/registry/util_test.go b/util/registry/util_test.go index 25c2210d..0c1cf009 100644 --- a/util/registry/util_test.go +++ b/util/registry/util_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestRemove(t *testing.T) { diff --git a/util/socket/socket.go b/util/socket/socket.go index de226aea..0c5c27ff 100644 --- a/util/socket/socket.go +++ b/util/socket/socket.go @@ -4,7 +4,7 @@ package socket import ( "io" - "github.com/asim/go-micro/v3/transport" + "go-micro.dev/v4/transport" ) // Socket is our pseudo socket for transport.Socket diff --git a/util/stream/stream.go b/util/stream/stream.go index 6a22e981..c4f89bf8 100644 --- a/util/stream/stream.go +++ b/util/stream/stream.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/codec" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/client" + "go-micro.dev/v4/codec" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/server" ) type Stream interface { diff --git a/util/sync/manager.go b/util/sync/manager.go index 716fa0cc..4541a5f1 100644 --- a/util/sync/manager.go +++ b/util/sync/manager.go @@ -3,7 +3,7 @@ package sync import ( "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" "github.com/pkg/errors" ) diff --git a/util/sync/options.go b/util/sync/options.go index e2dbb03c..87da70de 100644 --- a/util/sync/options.go +++ b/util/sync/options.go @@ -3,7 +3,7 @@ package sync import ( "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" ) // Options represents Sync options diff --git a/util/sync/sync.go b/util/sync/sync.go index c3110b19..0e03c8a3 100644 --- a/util/sync/sync.go +++ b/util/sync/sync.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3/store" + "go-micro.dev/v4/store" "github.com/ef-ds/deque" "github.com/pkg/errors" ) diff --git a/util/test/test.go b/util/test/test.go index af5b3501..043321fc 100644 --- a/util/test/test.go +++ b/util/test/test.go @@ -1,7 +1,7 @@ package test import ( - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) var ( diff --git a/util/wrapper/wrapper.go b/util/wrapper/wrapper.go index 5f9ac28e..884ed64e 100644 --- a/util/wrapper/wrapper.go +++ b/util/wrapper/wrapper.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "github.com/asim/go-micro/v3/auth" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/debug/stats" - "github.com/asim/go-micro/v3/debug/trace" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/auth" + "go-micro.dev/v4/client" + "go-micro.dev/v4/debug/stats" + "go-micro.dev/v4/debug/trace" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/server" ) type fromServiceWrapper struct { diff --git a/util/wrapper/wrapper_test.go b/util/wrapper/wrapper_test.go index c67927bc..d31c065c 100644 --- a/util/wrapper/wrapper_test.go +++ b/util/wrapper/wrapper_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/asim/go-micro/v3/auth" - "github.com/asim/go-micro/v3/client" - "github.com/asim/go-micro/v3/metadata" - "github.com/asim/go-micro/v3/server" + "go-micro.dev/v4/auth" + "go-micro.dev/v4/client" + "go-micro.dev/v4/metadata" + "go-micro.dev/v4/server" ) func TestWrapper(t *testing.T) { diff --git a/web/options.go b/web/options.go index a333047b..adc06061 100644 --- a/web/options.go +++ b/web/options.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4" + "go-micro.dev/v4/registry" "github.com/urfave/cli/v2" ) diff --git a/web/service.go b/web/service.go index 4411e68c..71032e95 100644 --- a/web/service.go +++ b/web/service.go @@ -13,15 +13,15 @@ import ( "sync" "time" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/registry" - maddr "github.com/asim/go-micro/v3/util/addr" - "github.com/asim/go-micro/v3/util/backoff" - mhttp "github.com/asim/go-micro/v3/util/http" - mnet "github.com/asim/go-micro/v3/util/net" - signalutil "github.com/asim/go-micro/v3/util/signal" - mls "github.com/asim/go-micro/v3/util/tls" + "go-micro.dev/v4" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/registry" + maddr "go-micro.dev/v4/util/addr" + "go-micro.dev/v4/util/backoff" + mhttp "go-micro.dev/v4/util/http" + mnet "go-micro.dev/v4/util/net" + signalutil "go-micro.dev/v4/util/signal" + mls "go-micro.dev/v4/util/tls" "github.com/urfave/cli/v2" ) diff --git a/web/service_test.go b/web/service_test.go index 3b730822..bef2da08 100644 --- a/web/service_test.go +++ b/web/service_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3/registry" + "go-micro.dev/v4/registry" ) func TestService(t *testing.T) { diff --git a/web/web_test.go b/web/web_test.go index be77484c..a7815acd 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/asim/go-micro/v3" - "github.com/asim/go-micro/v3/logger" - "github.com/asim/go-micro/v3/web" + "go-micro.dev/v4" + "go-micro.dev/v4/logger" + "go-micro.dev/v4/web" "github.com/urfave/cli/v2" )