From f23638c0360a542c1b814d5ef3429439ba6d8807 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Thu, 30 Jan 2020 14:39:00 +0300 Subject: [PATCH] fix import paths for v2 release Signed-off-by: Vasiliy Tolstov --- agent/input/discord/conn.go | 4 +- agent/input/discord/discord.go | 2 +- agent/input/slack/conn.go | 2 +- agent/input/slack/slack.go | 2 +- agent/input/telegram/conn.go | 4 +- agent/input/telegram/telegram.go | 2 +- agent/proto/bot.pb.go | 4 +- agent/proto/bot.pb.micro.go | 6 +- api/api.go | 4 +- api/handler/api/api.go | 14 ++--- api/handler/api/util.go | 6 +- api/handler/broker/broker.go | 6 +- api/handler/cloudevents/cloudevents.go | 4 +- api/handler/event/event.go | 6 +- api/handler/http/http.go | 6 +- api/handler/http/http_test.go | 10 +-- api/handler/options.go | 4 +- api/handler/registry/registry.go | 4 +- api/handler/rpc/rpc.go | 22 +++---- api/handler/rpc/rpc_test.go | 2 +- api/handler/web/web.go | 6 +- api/proto/api.pb.go | 4 +- api/proto/api.pb.micro.go | 2 +- api/resolver/grpc/grpc.go | 2 +- api/resolver/host/host.go | 2 +- api/resolver/micro/micro.go | 2 +- api/resolver/path/path.go | 2 +- api/resolver/vpath/vpath.go | 2 +- api/router/options.go | 6 +- api/router/registry/registry.go | 8 +-- api/router/registry/registry_test.go | 2 +- api/router/router.go | 2 +- api/server/acme/autocert/autocert.go | 2 +- api/server/acme/certmagic/certmagic.go | 2 +- api/server/acme/certmagic/certmagic_test.go | 6 +- api/server/acme/certmagic/storage.go | 4 +- api/server/http/http.go | 4 +- api/server/options.go | 2 +- broker/default.go | 8 +-- broker/memory/memory.go | 6 +- broker/memory/memory_test.go | 2 +- broker/nats/context.go | 2 +- broker/nats/nats.go | 10 +-- broker/nats/nats_test.go | 2 +- broker/nats/options.go | 2 +- broker/options.go | 4 +- broker/service/proto/broker.pb.micro.go | 4 +- broker/service/service.go | 8 +-- broker/service/subscriber.go | 6 +- client/client.go | 2 +- client/common_test.go | 2 +- client/grpc/codec.go | 4 +- client/grpc/error.go | 2 +- client/grpc/grpc.go | 14 ++--- client/grpc/grpc_test.go | 8 +-- client/grpc/message.go | 2 +- client/grpc/options.go | 2 +- client/grpc/request.go | 4 +- client/grpc/response.go | 4 +- client/grpc/stream.go | 2 +- client/mucp/mucp.go | 2 +- client/options.go | 10 +-- client/options_test.go | 2 +- client/retry.go | 2 +- client/rpc_client.go | 20 +++--- client/rpc_client_test.go | 8 +-- client/rpc_codec.go | 20 +++--- client/rpc_request.go | 2 +- client/rpc_response.go | 4 +- client/rpc_stream.go | 2 +- client/selector/common_test.go | 2 +- client/selector/default.go | 4 +- client/selector/default_test.go | 2 +- client/selector/dns/dns.go | 4 +- client/selector/filter.go | 2 +- client/selector/filter_test.go | 2 +- client/selector/options.go | 2 +- client/selector/registry/options.go | 2 +- client/selector/registry/registry.go | 2 +- client/selector/router/router.go | 10 +-- client/selector/selector.go | 2 +- client/selector/static/static.go | 4 +- client/selector/strategy.go | 2 +- client/selector/strategy_test.go | 2 +- client/service/proto/client.pb.go | 4 +- client/service/proto/client.pb.micro.go | 6 +- client/wrapper.go | 2 +- codec/bytes/bytes.go | 2 +- codec/grpc/grpc.go | 2 +- codec/json/json.go | 2 +- codec/jsonrpc/client.go | 2 +- codec/jsonrpc/jsonrpc.go | 2 +- codec/jsonrpc/server.go | 2 +- codec/proto/proto.go | 2 +- codec/protorpc/protorpc.go | 2 +- codec/text/text.go | 2 +- config/cmd/cmd.go | 62 +++++++++---------- config/cmd/options.go | 18 +++--- config/config.go | 8 +-- config/default.go | 10 +-- config/default_test.go | 4 +- config/encoder/hcl/hcl.go | 2 +- config/encoder/json/json.go | 2 +- config/encoder/toml/toml.go | 2 +- config/encoder/xml/xml.go | 2 +- config/encoder/yaml/yaml.go | 2 +- config/loader/loader.go | 4 +- config/loader/memory/memory.go | 8 +-- config/loader/memory/options.go | 6 +- config/options.go | 6 +- config/reader/json/json.go | 8 +-- config/reader/json/json_test.go | 2 +- config/reader/json/values.go | 4 +- config/reader/json/values_test.go | 2 +- config/reader/options.go | 12 ++-- config/reader/reader.go | 2 +- config/source/cli/cli.go | 4 +- config/source/cli/cli_test.go | 4 +- config/source/cli/options.go | 2 +- config/source/env/env.go | 2 +- config/source/env/env_test.go | 2 +- config/source/env/options.go | 2 +- config/source/env/watcher.go | 2 +- config/source/etcd/etcd.go | 2 +- config/source/etcd/options.go | 2 +- config/source/etcd/util.go | 2 +- config/source/etcd/watcher.go | 2 +- config/source/file/file.go | 2 +- config/source/file/format.go | 2 +- config/source/file/format_test.go | 2 +- config/source/file/options.go | 2 +- config/source/file/watcher.go | 2 +- config/source/file/watcher_linux.go | 2 +- config/source/flag/flag.go | 2 +- config/source/flag/options.go | 2 +- config/source/memory/memory.go | 2 +- config/source/memory/options.go | 2 +- config/source/memory/watcher.go | 2 +- config/source/options.go | 4 +- config/source/service/options.go | 2 +- .../source/service/proto/service.pb.micro.go | 4 +- config/source/service/service.go | 8 +-- config/source/service/util.go | 4 +- config/source/service/watcher.go | 4 +- config/value.go | 2 +- debug/log/kubernetes/kubernetes.go | 6 +- debug/log/kubernetes/kubernetes_test.go | 2 +- debug/log/kubernetes/stream.go | 2 +- debug/log/memory/memory.go | 4 +- debug/log/memory/memory_test.go | 2 +- debug/log/memory/stream.go | 2 +- debug/log/noop/noop.go | 2 +- debug/log/os.go | 2 +- debug/profile/http/http.go | 2 +- debug/profile/pprof/pprof.go | 2 +- debug/service/client.go | 6 +- debug/service/handler/debug.go | 10 +-- debug/service/proto/debug.pb.micro.go | 4 +- debug/service/service.go | 4 +- debug/service/stream.go | 2 +- debug/stats/default.go | 2 +- debug/trace/memory/memory.go | 4 +- defaults.go | 16 ++--- event.go | 2 +- function.go | 2 +- function_test.go | 6 +- go.mod | 18 +----- go.sum | 58 +++++++++++++++++ micro.go | 4 +- monitor/default.go | 8 +-- monitor/options.go | 4 +- network/default.go | 34 +++++----- network/network.go | 4 +- network/node.go | 2 +- network/node_test.go | 2 +- network/options.go | 12 ++-- network/resolver/dns/dns.go | 2 +- network/resolver/dnssrv/dnssrv.go | 2 +- network/resolver/http/http.go | 2 +- network/resolver/registry/registry.go | 4 +- network/resolver/static/static.go | 2 +- network/service/proto/network.pb.go | 2 +- network/service/proto/network.pb.micro.go | 6 +- options.go | 16 ++--- plugin/default.go | 14 ++--- plugin/template.go | 2 +- proxy/grpc/grpc.go | 10 +-- proxy/http/http.go | 6 +- proxy/http/http_test.go | 8 +-- proxy/mucp/mucp.go | 20 +++--- proxy/options.go | 4 +- proxy/proxy.go | 2 +- registry/cache/cache.go | 4 +- registry/etcd/etcd.go | 4 +- registry/etcd/options.go | 2 +- registry/etcd/watcher.go | 2 +- registry/kubernetes/kubernetes.go | 4 +- registry/kubernetes/watcher.go | 6 +- registry/mdns/mdns.go | 2 +- registry/memory/memory.go | 4 +- registry/memory/memory_test.go | 2 +- registry/memory/memory_watcher.go | 2 +- registry/memory/options.go | 2 +- registry/memory/util.go | 2 +- registry/memory/watcher.go | 2 +- registry/memory/watcher_test.go | 2 +- registry/service/proto/registry.pb.micro.go | 4 +- registry/service/service.go | 8 +-- registry/service/util.go | 4 +- registry/service/watcher.go | 4 +- router/default.go | 4 +- router/default_test.go | 4 +- router/options.go | 4 +- router/service/proto/router.pb.micro.go | 4 +- router/service/service.go | 6 +- router/service/table.go | 6 +- router/service/watcher.go | 4 +- router/table.go | 2 +- runtime/default.go | 2 +- runtime/kubernetes/kubernetes.go | 6 +- runtime/kubernetes/service.go | 8 +-- runtime/local/build/build.go | 2 +- runtime/local/build/docker/docker.go | 4 +- runtime/local/build/go/golang.go | 2 +- runtime/local/process/os/os.go | 2 +- runtime/local/process/os/os_windows.go | 2 +- runtime/local/process/os/process.go | 2 +- runtime/local/process/process.go | 2 +- runtime/local/source/git/git.go | 2 +- runtime/local/source/go/golang.go | 2 +- runtime/service.go | 8 +-- runtime/service/proto/runtime.pb.micro.go | 4 +- runtime/service/service.go | 6 +- server/extractor.go | 2 +- server/extractor_test.go | 2 +- server/grpc/codec.go | 8 +-- server/grpc/error.go | 2 +- server/grpc/extractor.go | 2 +- server/grpc/extractor_test.go | 2 +- server/grpc/grpc.go | 20 +++--- server/grpc/grpc_test.go | 6 +- server/grpc/handler.go | 4 +- server/grpc/options.go | 10 +-- server/grpc/proto/test.micro.go | 4 +- server/grpc/request.go | 4 +- server/grpc/response.go | 2 +- server/grpc/server.go | 4 +- server/grpc/stream.go | 2 +- server/grpc/subscriber.go | 12 ++-- server/mock/mock.go | 2 +- server/mock/mock_handler.go | 4 +- server/mock/mock_subscriber.go | 4 +- server/mock/mock_test.go | 2 +- server/mucp/mucp.go | 2 +- server/options.go | 10 +-- server/proto/server.pb.go | 4 +- server/proto/server.pb.micro.go | 6 +- server/rpc_codec.go | 16 ++--- server/rpc_codec_test.go | 4 +- server/rpc_event.go | 4 +- server/rpc_handler.go | 2 +- server/rpc_request.go | 6 +- server/rpc_response.go | 4 +- server/rpc_router.go | 6 +- server/rpc_server.go | 20 +++--- server/rpc_stream.go | 2 +- server/rpc_stream_test.go | 4 +- server/server.go | 6 +- server/subscriber.go | 2 +- service.go | 24 +++---- service/grpc/grpc.go | 10 +-- service/grpc/grpc_test.go | 8 +-- service/grpc/options.go | 6 +- service/grpc/proto/test.micro.go | 4 +- service/mucp/mucp.go | 10 +-- service/options.go | 10 +-- service/service.go | 4 +- service_test.go | 12 ++-- store/cloudflare/cloudflare.go | 2 +- store/cloudflare/cloudflare_test.go | 2 +- store/cloudflare/options.go | 2 +- store/cockroach/cockroach.go | 4 +- store/cockroach/cockroach_test.go | 2 +- store/etcd/etcd.go | 2 +- store/memory/memory.go | 2 +- store/memory/memory_test.go | 2 +- store/service/proto/store.pb.micro.go | 4 +- store/service/service.go | 8 +-- sync/cron.go | 8 +-- sync/leader/etcd/etcd.go | 2 +- sync/lock/etcd/etcd.go | 2 +- sync/lock/http/http.go | 2 +- sync/lock/http/server/server.go | 4 +- sync/lock/memory/memory.go | 2 +- sync/map.go | 6 +- sync/options.go | 8 +-- sync/sync.go | 10 +-- sync/task/broker/broker.go | 4 +- sync/task/local/local.go | 2 +- sync/time/local/local.go | 2 +- sync/time/ntp/ntp.go | 2 +- transport/grpc/grpc.go | 10 +-- transport/grpc/grpc_test.go | 2 +- transport/grpc/handler.go | 8 +-- transport/grpc/proto/transport.micro.go | 4 +- transport/grpc/socket.go | 4 +- transport/http/http.go | 2 +- transport/http/http_test.go | 2 +- transport/http/options.go | 2 +- transport/http_transport.go | 8 +-- transport/memory/memory.go | 6 +- transport/memory/memory_test.go | 2 +- transport/options.go | 2 +- transport/quic/quic.go | 4 +- tunnel/broker/broker.go | 6 +- tunnel/default.go | 4 +- tunnel/link.go | 4 +- tunnel/listener.go | 2 +- tunnel/options.go | 4 +- tunnel/session.go | 4 +- tunnel/transport/listener.go | 4 +- tunnel/transport/transport.go | 4 +- tunnel/tunnel.go | 2 +- tunnel/tunnel_test.go | 2 +- util/ctx/ctx.go | 2 +- util/ctx/ctx_test.go | 2 +- util/http/http.go | 4 +- util/http/http_test.go | 4 +- util/http/options.go | 2 +- util/http/roundtripper.go | 2 +- util/io/io.go | 2 +- util/kubernetes/client/client.go | 4 +- util/kubernetes/client/watch.go | 2 +- util/log/log.go | 2 +- util/mux/mux.go | 6 +- util/pool/default.go | 2 +- util/pool/default_test.go | 4 +- util/pool/options.go | 2 +- util/pool/pool.go | 2 +- util/proto/proto.go | 4 +- util/socket/socket.go | 2 +- util/test/test.go | 2 +- util/wrapper/wrapper.go | 10 +-- util/wrapper/wrapper_test.go | 2 +- web/options.go | 4 +- web/service.go | 14 ++--- web/service_test.go | 4 +- 347 files changed, 864 insertions(+), 820 deletions(-) diff --git a/agent/input/discord/conn.go b/agent/input/discord/conn.go index cadc69d0..c7ca09ba 100644 --- a/agent/input/discord/conn.go +++ b/agent/input/discord/conn.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/bwmarrin/discordgo" - "github.com/micro/go-micro/agent/input" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/agent/input" + "github.com/micro/go-micro/v2/util/log" ) type discordConn struct { diff --git a/agent/input/discord/discord.go b/agent/input/discord/discord.go index f30a45b8..3c25f568 100644 --- a/agent/input/discord/discord.go +++ b/agent/input/discord/discord.go @@ -9,7 +9,7 @@ import ( "github.com/bwmarrin/discordgo" "github.com/micro/cli/v2" - "github.com/micro/go-micro/agent/input" + "github.com/micro/go-micro/v2/agent/input" ) func init() { diff --git a/agent/input/slack/conn.go b/agent/input/slack/conn.go index ee640922..1bc4bbdb 100644 --- a/agent/input/slack/conn.go +++ b/agent/input/slack/conn.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/agent/input" + "github.com/micro/go-micro/v2/agent/input" "github.com/nlopes/slack" ) diff --git a/agent/input/slack/slack.go b/agent/input/slack/slack.go index 53472c87..1475f23a 100644 --- a/agent/input/slack/slack.go +++ b/agent/input/slack/slack.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/micro/cli/v2" - "github.com/micro/go-micro/agent/input" + "github.com/micro/go-micro/v2/agent/input" "github.com/nlopes/slack" ) diff --git a/agent/input/telegram/conn.go b/agent/input/telegram/conn.go index 78a8ff3a..9dd594c8 100644 --- a/agent/input/telegram/conn.go +++ b/agent/input/telegram/conn.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/forestgiant/sliceutil" - "github.com/micro/go-micro/agent/input" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/agent/input" + "github.com/micro/go-micro/v2/util/log" tgbotapi "gopkg.in/telegram-bot-api.v4" ) diff --git a/agent/input/telegram/telegram.go b/agent/input/telegram/telegram.go index f7839714..c0fff91b 100644 --- a/agent/input/telegram/telegram.go +++ b/agent/input/telegram/telegram.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/micro/cli/v2" - "github.com/micro/go-micro/agent/input" + "github.com/micro/go-micro/v2/agent/input" tgbotapi "gopkg.in/telegram-bot-api.v4" ) diff --git a/agent/proto/bot.pb.go b/agent/proto/bot.pb.go index b51da305..db35f945 100644 --- a/agent/proto/bot.pb.go +++ b/agent/proto/bot.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/agent/proto/bot.proto +// source: github.com/micro/go-micro/v2/agent/proto/bot.proto package go_micro_bot @@ -192,7 +192,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/micro/go-micro/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12) + proto.RegisterFile("github.com/micro/go-micro/v2/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12) } var fileDescriptor_018e8d5b14a89d12 = []byte{ diff --git a/agent/proto/bot.pb.micro.go b/agent/proto/bot.pb.micro.go index 1c04fe59..61e678db 100644 --- a/agent/proto/bot.pb.micro.go +++ b/agent/proto/bot.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/agent/proto/bot.proto +// source: github.com/micro/go-micro/v2/agent/proto/bot.proto package go_micro_bot @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/api.go b/api/api.go index 160c2dfd..f04d67e0 100644 --- a/api/api.go +++ b/api/api.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" ) // Endpoint is a mapping between an RPC method and HTTP endpoint diff --git a/api/handler/api/api.go b/api/handler/api/api.go index 0798f337..7a14fb4f 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/micro/go-micro/api" - "github.com/micro/go-micro/api/handler" - api "github.com/micro/go-micro/api/proto" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/util/ctx" + goapi "github.com/micro/go-micro/v2/api" + "github.com/micro/go-micro/v2/api/handler" + api "github.com/micro/go-micro/v2/api/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/util/ctx" ) type apiHandler struct { diff --git a/api/handler/api/util.go b/api/handler/api/util.go index 824ec5da..f66f611b 100644 --- a/api/handler/api/util.go +++ b/api/handler/api/util.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - api "github.com/micro/go-micro/api/proto" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/registry" + api "github.com/micro/go-micro/v2/api/proto" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/registry" ) func requestToProto(r *http.Request) (*api.Request, error) { diff --git a/api/handler/broker/broker.go b/api/handler/broker/broker.go index 2d2905d9..bf4ccf60 100644 --- a/api/handler/broker/broker.go +++ b/api/handler/broker/broker.go @@ -11,9 +11,9 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/micro/go-micro/api/handler" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/api/handler" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/util/log" ) const ( diff --git a/api/handler/cloudevents/cloudevents.go b/api/handler/cloudevents/cloudevents.go index 9b4a6293..2eec44ef 100644 --- a/api/handler/cloudevents/cloudevents.go +++ b/api/handler/cloudevents/cloudevents.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/micro/go-micro/api/handler" - "github.com/micro/go-micro/util/ctx" + "github.com/micro/go-micro/v2/api/handler" + "github.com/micro/go-micro/v2/util/ctx" ) type event struct { diff --git a/api/handler/event/event.go b/api/handler/event/event.go index 8eb65aa1..a819d947 100644 --- a/api/handler/event/event.go +++ b/api/handler/event/event.go @@ -12,9 +12,9 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/api/handler" - proto "github.com/micro/go-micro/api/proto" - "github.com/micro/go-micro/util/ctx" + "github.com/micro/go-micro/v2/api/handler" + proto "github.com/micro/go-micro/v2/api/proto" + "github.com/micro/go-micro/v2/util/ctx" ) type event struct { diff --git a/api/handler/http/http.go b/api/handler/http/http.go index ad2b1c66..52108a40 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/micro/go-micro/api" - "github.com/micro/go-micro/api/handler" - "github.com/micro/go-micro/client/selector" + "github.com/micro/go-micro/v2/api" + "github.com/micro/go-micro/v2/api/handler" + "github.com/micro/go-micro/v2/client/selector" ) const ( diff --git a/api/handler/http/http_test.go b/api/handler/http/http_test.go index 608b521f..6f094874 100644 --- a/api/handler/http/http_test.go +++ b/api/handler/http/http_test.go @@ -6,11 +6,11 @@ import ( "net/http/httptest" "testing" - "github.com/micro/go-micro/api/handler" - "github.com/micro/go-micro/api/router" - regRouter "github.com/micro/go-micro/api/router/registry" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/memory" + "github.com/micro/go-micro/v2/api/handler" + "github.com/micro/go-micro/v2/api/router" + regRouter "github.com/micro/go-micro/v2/api/router/registry" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/memory" ) func testHttp(t *testing.T, path, service, ns string) { diff --git a/api/handler/options.go b/api/handler/options.go index 6ce0f99a..d7403270 100644 --- a/api/handler/options.go +++ b/api/handler/options.go @@ -1,8 +1,8 @@ package handler import ( - "github.com/micro/go-micro" - "github.com/micro/go-micro/api/router" + "github.com/micro/go-micro/v2" + "github.com/micro/go-micro/v2/api/router" ) type Options struct { diff --git a/api/handler/registry/registry.go b/api/handler/registry/registry.go index 0a840793..4aca36da 100644 --- a/api/handler/registry/registry.go +++ b/api/handler/registry/registry.go @@ -9,8 +9,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/micro/go-micro/api/handler" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/api/handler" + "github.com/micro/go-micro/v2/registry" ) const ( diff --git a/api/handler/rpc/rpc.go b/api/handler/rpc/rpc.go index 0c01e10d..76e60dc2 100644 --- a/api/handler/rpc/rpc.go +++ b/api/handler/rpc/rpc.go @@ -10,17 +10,17 @@ import ( "strings" "github.com/joncalhoun/qson" - "github.com/micro/go-micro/api" - "github.com/micro/go-micro/api/handler" - proto "github.com/micro/go-micro/api/internal/proto" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/jsonrpc" - "github.com/micro/go-micro/codec/protorpc" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/ctx" + "github.com/micro/go-micro/v2/api" + "github.com/micro/go-micro/v2/api/handler" + proto "github.com/micro/go-micro/v2/api/internal/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/jsonrpc" + "github.com/micro/go-micro/v2/codec/protorpc" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/ctx" ) const ( diff --git a/api/handler/rpc/rpc_test.go b/api/handler/rpc/rpc_test.go index f50cdedf..ba943a4d 100644 --- a/api/handler/rpc/rpc_test.go +++ b/api/handler/rpc/rpc_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/golang/protobuf/proto" - go_api "github.com/micro/go-micro/api/proto" + go_api "github.com/micro/go-micro/v2/api/proto" ) func TestRequestPayloadFromRequest(t *testing.T) { diff --git a/api/handler/web/web.go b/api/handler/web/web.go index 77a0f6af..ab4e7ebb 100644 --- a/api/handler/web/web.go +++ b/api/handler/web/web.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "github.com/micro/go-micro/api" - "github.com/micro/go-micro/api/handler" - "github.com/micro/go-micro/client/selector" + "github.com/micro/go-micro/v2/api" + "github.com/micro/go-micro/v2/api/handler" + "github.com/micro/go-micro/v2/client/selector" ) const ( diff --git a/api/proto/api.pb.go b/api/proto/api.pb.go index 9e912f49..b9dba1fb 100644 --- a/api/proto/api.pb.go +++ b/api/proto/api.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/api/proto/api.proto +// source: github.com/micro/go-micro/v2/api/proto/api.proto package go_api @@ -304,7 +304,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/micro/go-micro/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943) + proto.RegisterFile("github.com/micro/go-micro/v2/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943) } var fileDescriptor_7b6696ef87ec1943 = []byte{ diff --git a/api/proto/api.pb.micro.go b/api/proto/api.pb.micro.go index a05f98b1..494a7ce5 100644 --- a/api/proto/api.pb.micro.go +++ b/api/proto/api.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/api/proto/api.proto +// source: github.com/micro/go-micro/v2/api/proto/api.proto package go_api diff --git a/api/resolver/grpc/grpc.go b/api/resolver/grpc/grpc.go index 9f23dcd4..97ea279f 100644 --- a/api/resolver/grpc/grpc.go +++ b/api/resolver/grpc/grpc.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/micro/go-micro/api/resolver" + "github.com/micro/go-micro/v2/api/resolver" ) type Resolver struct{} diff --git a/api/resolver/host/host.go b/api/resolver/host/host.go index ba0d1945..157c138f 100644 --- a/api/resolver/host/host.go +++ b/api/resolver/host/host.go @@ -4,7 +4,7 @@ package host import ( "net/http" - "github.com/micro/go-micro/api/resolver" + "github.com/micro/go-micro/v2/api/resolver" ) type Resolver struct{} diff --git a/api/resolver/micro/micro.go b/api/resolver/micro/micro.go index 418f7a97..9d940887 100644 --- a/api/resolver/micro/micro.go +++ b/api/resolver/micro/micro.go @@ -4,7 +4,7 @@ package micro import ( "net/http" - "github.com/micro/go-micro/api/resolver" + "github.com/micro/go-micro/v2/api/resolver" ) // default resolver for legacy purposes diff --git a/api/resolver/path/path.go b/api/resolver/path/path.go index 635cbceb..fec80f62 100644 --- a/api/resolver/path/path.go +++ b/api/resolver/path/path.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/micro/go-micro/api/resolver" + "github.com/micro/go-micro/v2/api/resolver" ) type Resolver struct{} diff --git a/api/resolver/vpath/vpath.go b/api/resolver/vpath/vpath.go index a9baeecb..45f6faaf 100644 --- a/api/resolver/vpath/vpath.go +++ b/api/resolver/vpath/vpath.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/micro/go-micro/api/resolver" + "github.com/micro/go-micro/v2/api/resolver" ) type Resolver struct{} diff --git a/api/router/options.go b/api/router/options.go index a48f3e39..cbba2028 100644 --- a/api/router/options.go +++ b/api/router/options.go @@ -1,9 +1,9 @@ package router import ( - "github.com/micro/go-micro/api/resolver" - "github.com/micro/go-micro/api/resolver/micro" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/api/resolver" + "github.com/micro/go-micro/v2/api/resolver/micro" + "github.com/micro/go-micro/v2/registry" ) type Options struct { diff --git a/api/router/registry/registry.go b/api/router/registry/registry.go index 368e31d4..51cbd8fc 100644 --- a/api/router/registry/registry.go +++ b/api/router/registry/registry.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/micro/go-micro/api" - "github.com/micro/go-micro/api/router" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/cache" + "github.com/micro/go-micro/v2/api" + "github.com/micro/go-micro/v2/api/router" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/cache" ) // router is the default router diff --git a/api/router/registry/registry_test.go b/api/router/registry/registry_test.go index b2e9a59e..45646234 100644 --- a/api/router/registry/registry_test.go +++ b/api/router/registry/registry_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "github.com/micro/go-micro/api" + "github.com/micro/go-micro/v2/api" ) func TestSetNamespace(t *testing.T) { diff --git a/api/router/router.go b/api/router/router.go index 3135cf40..7a2dc24a 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -4,7 +4,7 @@ package router import ( "net/http" - "github.com/micro/go-micro/api" + "github.com/micro/go-micro/v2/api" ) // Router is used to determine an endpoint for a request diff --git a/api/server/acme/autocert/autocert.go b/api/server/acme/autocert/autocert.go index ad5bf0bd..48152517 100644 --- a/api/server/acme/autocert/autocert.go +++ b/api/server/acme/autocert/autocert.go @@ -5,7 +5,7 @@ package autocert import ( "net" - "github.com/micro/go-micro/api/server/acme" + "github.com/micro/go-micro/v2/api/server/acme" "golang.org/x/crypto/acme/autocert" ) diff --git a/api/server/acme/certmagic/certmagic.go b/api/server/acme/certmagic/certmagic.go index 4a3a464b..febe56a7 100644 --- a/api/server/acme/certmagic/certmagic.go +++ b/api/server/acme/certmagic/certmagic.go @@ -9,7 +9,7 @@ import ( "github.com/mholt/certmagic" - "github.com/micro/go-micro/api/server/acme" + "github.com/micro/go-micro/v2/api/server/acme" ) type certmagicProvider struct { diff --git a/api/server/acme/certmagic/certmagic_test.go b/api/server/acme/certmagic/certmagic_test.go index 1739f5f2..cf3c515a 100644 --- a/api/server/acme/certmagic/certmagic_test.go +++ b/api/server/acme/certmagic/certmagic_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-acme/lego/v3/providers/dns/cloudflare" "github.com/mholt/certmagic" - "github.com/micro/go-micro/api/server/acme" - cfstore "github.com/micro/go-micro/store/cloudflare" - "github.com/micro/go-micro/sync/lock/memory" + "github.com/micro/go-micro/v2/api/server/acme" + cfstore "github.com/micro/go-micro/v2/store/cloudflare" + "github.com/micro/go-micro/v2/sync/lock/memory" ) func TestCertMagic(t *testing.T) { diff --git a/api/server/acme/certmagic/storage.go b/api/server/acme/certmagic/storage.go index 24d187f5..204269e6 100644 --- a/api/server/acme/certmagic/storage.go +++ b/api/server/acme/certmagic/storage.go @@ -10,8 +10,8 @@ import ( "time" "github.com/mholt/certmagic" - "github.com/micro/go-micro/store" - "github.com/micro/go-micro/sync/lock" + "github.com/micro/go-micro/v2/store" + "github.com/micro/go-micro/v2/sync/lock" ) // File represents a "File" that will be stored in store.Store - the contents and last modified time diff --git a/api/server/http/http.go b/api/server/http/http.go index 3ff93b1a..ecf3d499 100644 --- a/api/server/http/http.go +++ b/api/server/http/http.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/gorilla/handlers" - "github.com/micro/go-micro/api/server" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/api/server" + "github.com/micro/go-micro/v2/util/log" ) type httpServer struct { diff --git a/api/server/options.go b/api/server/options.go index b94c3da8..687e0926 100644 --- a/api/server/options.go +++ b/api/server/options.go @@ -3,7 +3,7 @@ package server import ( "crypto/tls" - "github.com/micro/go-micro/api/server/acme" + "github.com/micro/go-micro/v2/api/server/acme" ) type Option func(o *Options) diff --git a/broker/default.go b/broker/default.go index f35bd9fc..dd4a95ab 100644 --- a/broker/default.go +++ b/broker/default.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/micro/go-micro/codec/json" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/addr" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/codec/json" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/addr" + "github.com/micro/go-micro/v2/util/log" "github.com/nats-io/nats-server/v2/server" nats "github.com/nats-io/nats.go" ) diff --git a/broker/memory/memory.go b/broker/memory/memory.go index effb22f3..36554237 100644 --- a/broker/memory/memory.go +++ b/broker/memory/memory.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/broker" - maddr "github.com/micro/go-micro/util/addr" - mnet "github.com/micro/go-micro/util/net" + "github.com/micro/go-micro/v2/broker" + maddr "github.com/micro/go-micro/v2/util/addr" + mnet "github.com/micro/go-micro/v2/util/net" ) type memoryBroker struct { diff --git a/broker/memory/memory_test.go b/broker/memory/memory_test.go index 625c7ee7..74e7941a 100644 --- a/broker/memory/memory_test.go +++ b/broker/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/v2/broker" ) func TestMemoryBroker(t *testing.T) { diff --git a/broker/nats/context.go b/broker/nats/context.go index 0f009e8b..d4c1a3b0 100644 --- a/broker/nats/context.go +++ b/broker/nats/context.go @@ -3,7 +3,7 @@ package nats import ( "context" - "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/v2/broker" ) // setSubscribeOption returns a function to setup a context with given value diff --git a/broker/nats/nats.go b/broker/nats/nats.go index 67833092..f4e00fce 100644 --- a/broker/nats/nats.go +++ b/broker/nats/nats.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec/json" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/addr" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec/json" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/addr" + "github.com/micro/go-micro/v2/util/log" "github.com/nats-io/nats-server/v2/server" nats "github.com/nats-io/nats.go" ) diff --git a/broker/nats/nats_test.go b/broker/nats/nats_test.go index e58362e5..109c192c 100644 --- a/broker/nats/nats_test.go +++ b/broker/nats/nats_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/v2/broker" nats "github.com/nats-io/nats.go" ) diff --git a/broker/nats/options.go b/broker/nats/options.go index ae8ca80d..ba127e73 100644 --- a/broker/nats/options.go +++ b/broker/nats/options.go @@ -1,7 +1,7 @@ package nats import ( - "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/v2/broker" nats "github.com/nats-io/nats.go" ) diff --git a/broker/options.go b/broker/options.go index 348857f3..3fdc4dbc 100644 --- a/broker/options.go +++ b/broker/options.go @@ -4,8 +4,8 @@ import ( "context" "crypto/tls" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/registry" ) type Options struct { diff --git a/broker/service/proto/broker.pb.micro.go b/broker/service/proto/broker.pb.micro.go index c0229fb6..4ce6cd52 100644 --- a/broker/service/proto/broker.pb.micro.go +++ b/broker/service/proto/broker.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/broker/service/service.go b/broker/service/service.go index 00d6d0b5..81c1fb28 100644 --- a/broker/service/service.go +++ b/broker/service/service.go @@ -5,10 +5,10 @@ import ( "context" "time" - "github.com/micro/go-micro/broker" - pb "github.com/micro/go-micro/broker/service/proto" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/broker" + pb "github.com/micro/go-micro/v2/broker/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/util/log" ) type serviceBroker struct { diff --git a/broker/service/subscriber.go b/broker/service/subscriber.go index 085b578a..36de7275 100644 --- a/broker/service/subscriber.go +++ b/broker/service/subscriber.go @@ -1,9 +1,9 @@ package service import ( - "github.com/micro/go-micro/broker" - pb "github.com/micro/go-micro/broker/service/proto" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/broker" + pb "github.com/micro/go-micro/v2/broker/service/proto" + "github.com/micro/go-micro/v2/util/log" ) type serviceSub struct { diff --git a/client/client.go b/client/client.go index b09ae3af..d16b1bda 100644 --- a/client/client.go +++ b/client/client.go @@ -5,7 +5,7 @@ import ( "context" "time" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) // Client is the interface used to make requests to services. diff --git a/client/common_test.go b/client/common_test.go index 25b2b09c..d1b347e6 100644 --- a/client/common_test.go +++ b/client/common_test.go @@ -1,7 +1,7 @@ package client import ( - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) var ( diff --git a/client/grpc/codec.go b/client/grpc/codec.go index 70ef0b99..4b224a71 100644 --- a/client/grpc/codec.go +++ b/client/grpc/codec.go @@ -9,8 +9,8 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" jsoniter "github.com/json-iterator/go" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/client/grpc/error.go b/client/grpc/error.go index 47832527..07a31c77 100644 --- a/client/grpc/error.go +++ b/client/grpc/error.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/v2/errors" "google.golang.org/grpc/status" ) diff --git a/client/grpc/grpc.go b/client/grpc/grpc.go index 1d4eea04..dc790760 100644 --- a/client/grpc/grpc.go +++ b/client/grpc/grpc.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - raw "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + raw "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/client/grpc/grpc_test.go b/client/grpc/grpc_test.go index 6d975ca3..16d34e79 100644 --- a/client/grpc/grpc_test.go +++ b/client/grpc/grpc_test.go @@ -5,10 +5,10 @@ import ( "net" "testing" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/memory" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/memory" pgrpc "google.golang.org/grpc" pb "google.golang.org/grpc/examples/helloworld/helloworld" ) diff --git a/client/grpc/message.go b/client/grpc/message.go index 5691868e..ddc8b926 100644 --- a/client/grpc/message.go +++ b/client/grpc/message.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/micro/go-micro/client" + "github.com/micro/go-micro/v2/client" ) type grpcEvent struct { diff --git a/client/grpc/options.go b/client/grpc/options.go index 146e42b0..28222f85 100644 --- a/client/grpc/options.go +++ b/client/grpc/options.go @@ -5,7 +5,7 @@ import ( "context" "crypto/tls" - "github.com/micro/go-micro/client" + "github.com/micro/go-micro/v2/client" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/client/grpc/request.go b/client/grpc/request.go index 066577ce..d7555727 100644 --- a/client/grpc/request.go +++ b/client/grpc/request.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/codec" ) type grpcRequest struct { diff --git a/client/grpc/response.go b/client/grpc/response.go index c870fad9..5fd40169 100644 --- a/client/grpc/response.go +++ b/client/grpc/response.go @@ -3,8 +3,8 @@ package grpc import ( "strings" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/client/grpc/stream.go b/client/grpc/stream.go index e5ebd156..ae13bbcf 100644 --- a/client/grpc/stream.go +++ b/client/grpc/stream.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/micro/go-micro/client" + "github.com/micro/go-micro/v2/client" "google.golang.org/grpc" ) diff --git a/client/mucp/mucp.go b/client/mucp/mucp.go index 67b43dbd..ddd1f7cb 100644 --- a/client/mucp/mucp.go +++ b/client/mucp/mucp.go @@ -2,7 +2,7 @@ package mucp import ( - "github.com/micro/go-micro/client" + "github.com/micro/go-micro/v2/client" ) // NewClient returns a new micro client interface diff --git a/client/options.go b/client/options.go index 50ec3951..6f854d17 100644 --- a/client/options.go +++ b/client/options.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/transport" ) type Options struct { diff --git a/client/options_test.go b/client/options_test.go index 8d209e21..83c3a557 100644 --- a/client/options_test.go +++ b/client/options_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) func TestCallOptions(t *testing.T) { diff --git a/client/retry.go b/client/retry.go index 46466d48..92ba4c07 100644 --- a/client/retry.go +++ b/client/retry.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/v2/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 63d20d7b..61c3fabb 100644 --- a/client/rpc_client.go +++ b/client/rpc_client.go @@ -9,16 +9,16 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/codec" - raw "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/buf" - "github.com/micro/go-micro/util/pool" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/codec" + raw "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/buf" + "github.com/micro/go-micro/v2/util/pool" ) type rpcClient struct { diff --git a/client/rpc_client_test.go b/client/rpc_client_test.go index ace08fff..721c4950 100644 --- a/client/rpc_client_test.go +++ b/client/rpc_client_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/memory" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/memory" ) func newTestRegistry() registry.Registry { diff --git a/client/rpc_codec.go b/client/rpc_codec.go index c3729be2..c22b9d28 100644 --- a/client/rpc_codec.go +++ b/client/rpc_codec.go @@ -4,16 +4,16 @@ import ( "bytes" errs "errors" - "github.com/micro/go-micro/codec" - raw "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/codec/grpc" - "github.com/micro/go-micro/codec/json" - "github.com/micro/go-micro/codec/jsonrpc" - "github.com/micro/go-micro/codec/proto" - "github.com/micro/go-micro/codec/protorpc" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/codec" + raw "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/codec/grpc" + "github.com/micro/go-micro/v2/codec/json" + "github.com/micro/go-micro/v2/codec/jsonrpc" + "github.com/micro/go-micro/v2/codec/proto" + "github.com/micro/go-micro/v2/codec/protorpc" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/transport" ) const ( diff --git a/client/rpc_request.go b/client/rpc_request.go index 7fd5762b..97ca50f7 100644 --- a/client/rpc_request.go +++ b/client/rpc_request.go @@ -1,7 +1,7 @@ package client import ( - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type rpcRequest struct { diff --git a/client/rpc_response.go b/client/rpc_response.go index 08aaa84d..d7faaea6 100644 --- a/client/rpc_response.go +++ b/client/rpc_response.go @@ -1,8 +1,8 @@ package client import ( - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/transport" ) type rpcResponse struct { diff --git a/client/rpc_stream.go b/client/rpc_stream.go index abc4f5f1..7c880d88 100644 --- a/client/rpc_stream.go +++ b/client/rpc_stream.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) // Implements the streamer interface diff --git a/client/selector/common_test.go b/client/selector/common_test.go index 1af55c1c..da084daf 100644 --- a/client/selector/common_test.go +++ b/client/selector/common_test.go @@ -1,7 +1,7 @@ package selector import ( - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) var ( diff --git a/client/selector/default.go b/client/selector/default.go index 870bea2a..2692d8ba 100644 --- a/client/selector/default.go +++ b/client/selector/default.go @@ -3,8 +3,8 @@ package selector import ( "time" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/cache" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/cache" ) type registrySelector struct { diff --git a/client/selector/default_test.go b/client/selector/default_test.go index 948eedcd..d3b50003 100644 --- a/client/selector/default_test.go +++ b/client/selector/default_test.go @@ -3,7 +3,7 @@ package selector import ( "testing" - "github.com/micro/go-micro/registry/memory" + "github.com/micro/go-micro/v2/registry/memory" ) func TestRegistrySelector(t *testing.T) { diff --git a/client/selector/dns/dns.go b/client/selector/dns/dns.go index 450ae412..114fe590 100644 --- a/client/selector/dns/dns.go +++ b/client/selector/dns/dns.go @@ -6,8 +6,8 @@ import ( "net" "strconv" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/registry" ) type dnsSelector struct { diff --git a/client/selector/filter.go b/client/selector/filter.go index 53c5af39..11c3a165 100644 --- a/client/selector/filter.go +++ b/client/selector/filter.go @@ -1,7 +1,7 @@ package selector import ( - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) // FilterEndpoint is an endpoint based Select Filter which will diff --git a/client/selector/filter_test.go b/client/selector/filter_test.go index 035feed3..375bdc45 100644 --- a/client/selector/filter_test.go +++ b/client/selector/filter_test.go @@ -3,7 +3,7 @@ package selector import ( "testing" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func TestFilterEndpoint(t *testing.T) { diff --git a/client/selector/options.go b/client/selector/options.go index 7ceb5290..898d2cc1 100644 --- a/client/selector/options.go +++ b/client/selector/options.go @@ -3,7 +3,7 @@ package selector import ( "context" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type Options struct { diff --git a/client/selector/registry/options.go b/client/selector/registry/options.go index 007c5023..ae739ef1 100644 --- a/client/selector/registry/options.go +++ b/client/selector/registry/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/micro/go-micro/client/selector" + "github.com/micro/go-micro/v2/client/selector" ) // Set the registry cache ttl diff --git a/client/selector/registry/registry.go b/client/selector/registry/registry.go index fe8373a7..ab83e996 100644 --- a/client/selector/registry/registry.go +++ b/client/selector/registry/registry.go @@ -2,7 +2,7 @@ package registry import ( - "github.com/micro/go-micro/client/selector" + "github.com/micro/go-micro/v2/client/selector" ) // NewSelector returns a new registry selector diff --git a/client/selector/router/router.go b/client/selector/router/router.go index d8e8aae3..e93fd08b 100644 --- a/client/selector/router/router.go +++ b/client/selector/router/router.go @@ -7,11 +7,11 @@ import ( "sort" "sync" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/router" - pb "github.com/micro/go-micro/router/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/router" + pb "github.com/micro/go-micro/v2/router/service/proto" ) type routerSelector struct { diff --git a/client/selector/selector.go b/client/selector/selector.go index 83d82974..3e86ade8 100644 --- a/client/selector/selector.go +++ b/client/selector/selector.go @@ -4,7 +4,7 @@ package selector import ( "errors" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) // Selector builds on the registry as a mechanism to pick nodes diff --git a/client/selector/static/static.go b/client/selector/static/static.go index 9bd18f03..dc256d2d 100644 --- a/client/selector/static/static.go +++ b/client/selector/static/static.go @@ -2,8 +2,8 @@ package static import ( - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/registry" ) // staticSelector is a static selector diff --git a/client/selector/strategy.go b/client/selector/strategy.go index 5014d25d..e68b9f23 100644 --- a/client/selector/strategy.go +++ b/client/selector/strategy.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func init() { diff --git a/client/selector/strategy_test.go b/client/selector/strategy_test.go index 2529a6b7..07bf30b6 100644 --- a/client/selector/strategy_test.go +++ b/client/selector/strategy_test.go @@ -3,7 +3,7 @@ package selector import ( "testing" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func TestStrategies(t *testing.T) { diff --git a/client/service/proto/client.pb.go b/client/service/proto/client.pb.go index bd5b3702..071c1c16 100644 --- a/client/service/proto/client.pb.go +++ b/client/service/proto/client.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/client/proto/client.proto +// source: github.com/micro/go-micro/v2/client/proto/client.proto package go_micro_client @@ -184,7 +184,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/micro/go-micro/client/proto/client.proto", fileDescriptor_d418333f021a3308) + proto.RegisterFile("github.com/micro/go-micro/v2/client/proto/client.proto", fileDescriptor_d418333f021a3308) } var fileDescriptor_d418333f021a3308 = []byte{ diff --git a/client/service/proto/client.pb.micro.go b/client/service/proto/client.pb.micro.go index 140d9b45..029a6c73 100644 --- a/client/service/proto/client.pb.micro.go +++ b/client/service/proto/client.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/client/proto/client.proto +// source: github.com/micro/go-micro/v2/client/proto/client.proto package go_micro_client @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/client/wrapper.go b/client/wrapper.go index ab86dcd1..d5138bcc 100644 --- a/client/wrapper.go +++ b/client/wrapper.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) // CallFunc represents the individual call func diff --git a/codec/bytes/bytes.go b/codec/bytes/bytes.go index 69d36235..23a6c6fc 100644 --- a/codec/bytes/bytes.go +++ b/codec/bytes/bytes.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type Codec struct { diff --git a/codec/grpc/grpc.go b/codec/grpc/grpc.go index f044b55f..90bf4eb6 100644 --- a/codec/grpc/grpc.go +++ b/codec/grpc/grpc.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type Codec struct { diff --git a/codec/json/json.go b/codec/json/json.go index 5af47a07..7db36a50 100644 --- a/codec/json/json.go +++ b/codec/json/json.go @@ -7,7 +7,7 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type Codec struct { diff --git a/codec/jsonrpc/client.go b/codec/jsonrpc/client.go index f5ec5636..f1e320a0 100644 --- a/codec/jsonrpc/client.go +++ b/codec/jsonrpc/client.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type clientCodec struct { diff --git a/codec/jsonrpc/jsonrpc.go b/codec/jsonrpc/jsonrpc.go index d7e0e1c9..fcf2ac65 100644 --- a/codec/jsonrpc/jsonrpc.go +++ b/codec/jsonrpc/jsonrpc.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type jsonCodec struct { diff --git a/codec/jsonrpc/server.go b/codec/jsonrpc/server.go index 53f681ef..48b71e64 100644 --- a/codec/jsonrpc/server.go +++ b/codec/jsonrpc/server.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type serverCodec struct { diff --git a/codec/proto/proto.go b/codec/proto/proto.go index d79d5166..c2c4f382 100644 --- a/codec/proto/proto.go +++ b/codec/proto/proto.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type Codec struct { diff --git a/codec/protorpc/protorpc.go b/codec/protorpc/protorpc.go index 255b93a4..4e4b2ee8 100644 --- a/codec/protorpc/protorpc.go +++ b/codec/protorpc/protorpc.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type flusher interface { diff --git a/codec/text/text.go b/codec/text/text.go index 799cf6c1..86be2068 100644 --- a/codec/text/text.go +++ b/codec/text/text.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type Codec struct { diff --git a/config/cmd/cmd.go b/config/cmd/cmd.go index da2ed12f..c576df2d 100644 --- a/config/cmd/cmd.go +++ b/config/cmd/cmd.go @@ -7,54 +7,54 @@ import ( "strings" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/runtime" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/store" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/runtime" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/store" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/log" // clients - cgrpc "github.com/micro/go-micro/client/grpc" - cmucp "github.com/micro/go-micro/client/mucp" + cgrpc "github.com/micro/go-micro/v2/client/grpc" + cmucp "github.com/micro/go-micro/v2/client/mucp" // servers "github.com/micro/cli/v2" - sgrpc "github.com/micro/go-micro/server/grpc" - smucp "github.com/micro/go-micro/server/mucp" + sgrpc "github.com/micro/go-micro/v2/server/grpc" + smucp "github.com/micro/go-micro/v2/server/mucp" // brokers - "github.com/micro/go-micro/broker/memory" - "github.com/micro/go-micro/broker/nats" - brokerSrv "github.com/micro/go-micro/broker/service" + "github.com/micro/go-micro/v2/broker/memory" + "github.com/micro/go-micro/v2/broker/nats" + brokerSrv "github.com/micro/go-micro/v2/broker/service" // registries - "github.com/micro/go-micro/registry/etcd" - kreg "github.com/micro/go-micro/registry/kubernetes" - "github.com/micro/go-micro/registry/mdns" - rmem "github.com/micro/go-micro/registry/memory" - regSrv "github.com/micro/go-micro/registry/service" + "github.com/micro/go-micro/v2/registry/etcd" + kreg "github.com/micro/go-micro/v2/registry/kubernetes" + "github.com/micro/go-micro/v2/registry/mdns" + rmem "github.com/micro/go-micro/v2/registry/memory" + regSrv "github.com/micro/go-micro/v2/registry/service" // selectors - "github.com/micro/go-micro/client/selector/dns" - "github.com/micro/go-micro/client/selector/router" - "github.com/micro/go-micro/client/selector/static" + "github.com/micro/go-micro/v2/client/selector/dns" + "github.com/micro/go-micro/v2/client/selector/router" + "github.com/micro/go-micro/v2/client/selector/static" // transports - thttp "github.com/micro/go-micro/transport/http" - tmem "github.com/micro/go-micro/transport/memory" + thttp "github.com/micro/go-micro/v2/transport/http" + tmem "github.com/micro/go-micro/v2/transport/memory" // stores - memStore "github.com/micro/go-micro/store/memory" - svcStore "github.com/micro/go-micro/store/service" + memStore "github.com/micro/go-micro/v2/store/memory" + svcStore "github.com/micro/go-micro/v2/store/service" // tracers - // jTracer "github.com/micro/go-micro/debug/trace/jaeger" - memTracer "github.com/micro/go-micro/debug/trace/memory" + // jTracer "github.com/micro/go-micro/v2/debug/trace/jaeger" + memTracer "github.com/micro/go-micro/v2/debug/trace/memory" ) type Cmd interface { diff --git a/config/cmd/options.go b/config/cmd/options.go index 68f4b135..695e8ccf 100644 --- a/config/cmd/options.go +++ b/config/cmd/options.go @@ -3,15 +3,15 @@ package cmd import ( "context" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/runtime" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/store" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/runtime" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/store" + "github.com/micro/go-micro/v2/transport" ) type Options struct { diff --git a/config/config.go b/config/config.go index b45215e8..bd780874 100644 --- a/config/config.go +++ b/config/config.go @@ -4,10 +4,10 @@ package config import ( "context" - "github.com/micro/go-micro/config/loader" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/source" - "github.com/micro/go-micro/config/source/file" + "github.com/micro/go-micro/v2/config/loader" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/source" + "github.com/micro/go-micro/v2/config/source/file" ) // Config is an interface abstraction for dynamic configuration diff --git a/config/default.go b/config/default.go index b4535ed9..2c050462 100644 --- a/config/default.go +++ b/config/default.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/micro/go-micro/config/loader" - "github.com/micro/go-micro/config/loader/memory" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/reader/json" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/loader" + "github.com/micro/go-micro/v2/config/loader/memory" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/reader/json" + "github.com/micro/go-micro/v2/config/source" ) type config struct { diff --git a/config/default_test.go b/config/default_test.go index e53a877b..0ee8d84a 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/micro/go-micro/config/source/env" - "github.com/micro/go-micro/config/source/file" + "github.com/micro/go-micro/v2/config/source/env" + "github.com/micro/go-micro/v2/config/source/file" ) var ( diff --git a/config/encoder/hcl/hcl.go b/config/encoder/hcl/hcl.go index 7fa02b2c..efde9d92 100644 --- a/config/encoder/hcl/hcl.go +++ b/config/encoder/hcl/hcl.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/hashicorp/hcl" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/config/encoder" ) type hclEncoder struct{} diff --git a/config/encoder/json/json.go b/config/encoder/json/json.go index a5b3557b..67714dfe 100644 --- a/config/encoder/json/json.go +++ b/config/encoder/json/json.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/config/encoder" ) type jsonEncoder struct{} diff --git a/config/encoder/toml/toml.go b/config/encoder/toml/toml.go index f9688966..baca12e4 100644 --- a/config/encoder/toml/toml.go +++ b/config/encoder/toml/toml.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/BurntSushi/toml" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/config/encoder" ) type tomlEncoder struct{} diff --git a/config/encoder/xml/xml.go b/config/encoder/xml/xml.go index e970d8f1..7b9c55f4 100644 --- a/config/encoder/xml/xml.go +++ b/config/encoder/xml/xml.go @@ -3,7 +3,7 @@ package xml import ( "encoding/xml" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/config/encoder" ) type xmlEncoder struct{} diff --git a/config/encoder/yaml/yaml.go b/config/encoder/yaml/yaml.go index efecbf0c..b671fcab 100644 --- a/config/encoder/yaml/yaml.go +++ b/config/encoder/yaml/yaml.go @@ -2,7 +2,7 @@ package yaml import ( "github.com/ghodss/yaml" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/config/encoder" ) type yamlEncoder struct{} diff --git a/config/loader/loader.go b/config/loader/loader.go index 93029243..1dcb1450 100644 --- a/config/loader/loader.go +++ b/config/loader/loader.go @@ -4,8 +4,8 @@ package loader import ( "context" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/source" ) // Loader manages loading sources diff --git a/config/loader/memory/memory.go b/config/loader/memory/memory.go index 60af473a..65c586bf 100644 --- a/config/loader/memory/memory.go +++ b/config/loader/memory/memory.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/micro/go-micro/config/loader" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/reader/json" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/loader" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/reader/json" + "github.com/micro/go-micro/v2/config/source" ) type memory struct { diff --git a/config/loader/memory/options.go b/config/loader/memory/options.go index 5d778d66..cbf9d497 100644 --- a/config/loader/memory/options.go +++ b/config/loader/memory/options.go @@ -1,9 +1,9 @@ package memory import ( - "github.com/micro/go-micro/config/loader" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/loader" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/source" ) // WithSource appends a source to list of sources diff --git a/config/options.go b/config/options.go index a21cf945..34e176a4 100644 --- a/config/options.go +++ b/config/options.go @@ -1,9 +1,9 @@ package config import ( - "github.com/micro/go-micro/config/loader" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/loader" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/source" ) // WithLoader sets the loader for manager config diff --git a/config/reader/json/json.go b/config/reader/json/json.go index 7f3058f8..96b2c7aa 100644 --- a/config/reader/json/json.go +++ b/config/reader/json/json.go @@ -5,10 +5,10 @@ import ( "time" "github.com/imdario/mergo" - "github.com/micro/go-micro/config/encoder" - "github.com/micro/go-micro/config/encoder/json" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/encoder" + "github.com/micro/go-micro/v2/config/encoder/json" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/source" ) type jsonReader struct { diff --git a/config/reader/json/json_test.go b/config/reader/json/json_test.go index 965e346d..2afff0fc 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/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) func TestReader(t *testing.T) { diff --git a/config/reader/json/values.go b/config/reader/json/values.go index 926cfd04..ce7601c7 100644 --- a/config/reader/json/values.go +++ b/config/reader/json/values.go @@ -8,8 +8,8 @@ import ( "time" simple "github.com/bitly/go-simplejson" - "github.com/micro/go-micro/config/reader" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/reader" + "github.com/micro/go-micro/v2/config/source" ) type jsonValues struct { diff --git a/config/reader/json/values_test.go b/config/reader/json/values_test.go index 166d9ae0..3ace3eb9 100644 --- a/config/reader/json/values_test.go +++ b/config/reader/json/values_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) func TestValues(t *testing.T) { diff --git a/config/reader/options.go b/config/reader/options.go index 71b525b9..23f9c3fd 100644 --- a/config/reader/options.go +++ b/config/reader/options.go @@ -1,12 +1,12 @@ package reader import ( - "github.com/micro/go-micro/config/encoder" - "github.com/micro/go-micro/config/encoder/hcl" - "github.com/micro/go-micro/config/encoder/json" - "github.com/micro/go-micro/config/encoder/toml" - "github.com/micro/go-micro/config/encoder/xml" - "github.com/micro/go-micro/config/encoder/yaml" + "github.com/micro/go-micro/v2/config/encoder" + "github.com/micro/go-micro/v2/config/encoder/hcl" + "github.com/micro/go-micro/v2/config/encoder/json" + "github.com/micro/go-micro/v2/config/encoder/toml" + "github.com/micro/go-micro/v2/config/encoder/xml" + "github.com/micro/go-micro/v2/config/encoder/yaml" ) type Options struct { diff --git a/config/reader/reader.go b/config/reader/reader.go index 9d6fbb1a..e10ff6df 100644 --- a/config/reader/reader.go +++ b/config/reader/reader.go @@ -4,7 +4,7 @@ package reader import ( "time" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) // Reader is an interface for merging changesets diff --git a/config/source/cli/cli.go b/config/source/cli/cli.go index 96e58331..6ca71709 100644 --- a/config/source/cli/cli.go +++ b/config/source/cli/cli.go @@ -9,8 +9,8 @@ import ( "github.com/imdario/mergo" "github.com/micro/cli/v2" - "github.com/micro/go-micro/config/cmd" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/cmd" + "github.com/micro/go-micro/v2/config/source" ) type cliSource struct { diff --git a/config/source/cli/cli_test.go b/config/source/cli/cli_test.go index 53985860..45022a95 100644 --- a/config/source/cli/cli_test.go +++ b/config/source/cli/cli_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/micro/cli/v2" - "github.com/micro/go-micro/config/cmd" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/cmd" + "github.com/micro/go-micro/v2/config/source" ) func test(t *testing.T, withContext bool) { diff --git a/config/source/cli/options.go b/config/source/cli/options.go index 274d9760..28d28720 100644 --- a/config/source/cli/options.go +++ b/config/source/cli/options.go @@ -4,7 +4,7 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type contextKey struct{} diff --git a/config/source/env/env.go b/config/source/env/env.go index c971945c..25f5b827 100644 --- a/config/source/env/env.go +++ b/config/source/env/env.go @@ -7,7 +7,7 @@ import ( "time" "github.com/imdario/mergo" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) var ( diff --git a/config/source/env/env_test.go b/config/source/env/env_test.go index 4c22122e..7b0f99d4 100644 --- a/config/source/env/env_test.go +++ b/config/source/env/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) func TestEnv_Read(t *testing.T) { diff --git a/config/source/env/options.go b/config/source/env/options.go index 495672b5..27f99241 100644 --- a/config/source/env/options.go +++ b/config/source/env/options.go @@ -5,7 +5,7 @@ import ( "strings" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type strippedPrefixKey struct{} diff --git a/config/source/env/watcher.go b/config/source/env/watcher.go index 4ffe783c..bf7fb481 100644 --- a/config/source/env/watcher.go +++ b/config/source/env/watcher.go @@ -1,7 +1,7 @@ package env import ( - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type watcher struct { diff --git a/config/source/etcd/etcd.go b/config/source/etcd/etcd.go index 9dc0c0c2..db9c50f0 100644 --- a/config/source/etcd/etcd.go +++ b/config/source/etcd/etcd.go @@ -8,7 +8,7 @@ import ( cetcd "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) // Currently a single etcd reader diff --git a/config/source/etcd/options.go b/config/source/etcd/options.go index 325d2f46..79e0ab61 100644 --- a/config/source/etcd/options.go +++ b/config/source/etcd/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type addressKey struct{} diff --git a/config/source/etcd/util.go b/config/source/etcd/util.go index 31887fc9..6186befa 100644 --- a/config/source/etcd/util.go +++ b/config/source/etcd/util.go @@ -5,7 +5,7 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/config/encoder" ) func makeEvMap(e encoder.Encoder, data map[string]interface{}, kv []*clientv3.Event, stripPrefix string) map[string]interface{} { diff --git a/config/source/etcd/watcher.go b/config/source/etcd/watcher.go index 2f9b3189..d43f2987 100644 --- a/config/source/etcd/watcher.go +++ b/config/source/etcd/watcher.go @@ -7,7 +7,7 @@ import ( "time" cetcd "github.com/coreos/etcd/clientv3" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type watcher struct { diff --git a/config/source/file/file.go b/config/source/file/file.go index 15b9b860..f04d67c6 100644 --- a/config/source/file/file.go +++ b/config/source/file/file.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type file struct { diff --git a/config/source/file/format.go b/config/source/file/format.go index 63f51bd9..09f10071 100644 --- a/config/source/file/format.go +++ b/config/source/file/format.go @@ -3,7 +3,7 @@ package file import ( "strings" - "github.com/micro/go-micro/config/encoder" + "github.com/micro/go-micro/v2/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 47f09836..8383f84a 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/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) func TestFormat(t *testing.T) { diff --git a/config/source/file/options.go b/config/source/file/options.go index e9b16e90..e2f67bb4 100644 --- a/config/source/file/options.go +++ b/config/source/file/options.go @@ -3,7 +3,7 @@ package file import ( "context" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type filePathKey struct{} diff --git a/config/source/file/watcher.go b/config/source/file/watcher.go index d9595e27..f26cc6e4 100644 --- a/config/source/file/watcher.go +++ b/config/source/file/watcher.go @@ -6,7 +6,7 @@ import ( "os" "github.com/fsnotify/fsnotify" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type watcher struct { diff --git a/config/source/file/watcher_linux.go b/config/source/file/watcher_linux.go index 82d45154..13efbde5 100644 --- a/config/source/file/watcher_linux.go +++ b/config/source/file/watcher_linux.go @@ -6,7 +6,7 @@ import ( "os" "github.com/fsnotify/fsnotify" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type watcher struct { diff --git a/config/source/flag/flag.go b/config/source/flag/flag.go index 98ff4d91..3cd3dcf6 100644 --- a/config/source/flag/flag.go +++ b/config/source/flag/flag.go @@ -4,7 +4,7 @@ import ( "errors" "flag" "github.com/imdario/mergo" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" "strings" "time" ) diff --git a/config/source/flag/options.go b/config/source/flag/options.go index 369cccb6..85ccfd83 100644 --- a/config/source/flag/options.go +++ b/config/source/flag/options.go @@ -3,7 +3,7 @@ package flag import ( "context" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type includeUnsetKey struct{} diff --git a/config/source/memory/memory.go b/config/source/memory/memory.go index e6a25d2a..bb3f2b73 100644 --- a/config/source/memory/memory.go +++ b/config/source/memory/memory.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type memory struct { diff --git a/config/source/memory/options.go b/config/source/memory/options.go index 674bee58..d7ec6309 100644 --- a/config/source/memory/options.go +++ b/config/source/memory/options.go @@ -3,7 +3,7 @@ package memory import ( "context" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type changeSetKey struct{} diff --git a/config/source/memory/watcher.go b/config/source/memory/watcher.go index 4cdc09e1..c04714b1 100644 --- a/config/source/memory/watcher.go +++ b/config/source/memory/watcher.go @@ -1,7 +1,7 @@ package memory import ( - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type watcher struct { diff --git a/config/source/options.go b/config/source/options.go index 0f8f7943..d4a2ba09 100644 --- a/config/source/options.go +++ b/config/source/options.go @@ -3,8 +3,8 @@ package source import ( "context" - "github.com/micro/go-micro/config/encoder" - "github.com/micro/go-micro/config/encoder/json" + "github.com/micro/go-micro/v2/config/encoder" + "github.com/micro/go-micro/v2/config/encoder/json" ) type Options struct { diff --git a/config/source/service/options.go b/config/source/service/options.go index 1075a4ac..ea80e1bd 100644 --- a/config/source/service/options.go +++ b/config/source/service/options.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/micro/go-micro/config/source" + "github.com/micro/go-micro/v2/config/source" ) type serviceNameKey struct{} diff --git a/config/source/service/proto/service.pb.micro.go b/config/source/service/proto/service.pb.micro.go index 238b6112..f88a9b15 100644 --- a/config/source/service/proto/service.pb.micro.go +++ b/config/source/service/proto/service.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/config/source/service/service.go b/config/source/service/service.go index caf1eebe..567db30a 100644 --- a/config/source/service/service.go +++ b/config/source/service/service.go @@ -3,10 +3,10 @@ package service import ( "context" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/config/source" - proto "github.com/micro/go-micro/config/source/service/proto" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/config/source" + proto "github.com/micro/go-micro/v2/config/source/service/proto" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/config/source/service/util.go b/config/source/service/util.go index eb248356..a2f71e45 100644 --- a/config/source/service/util.go +++ b/config/source/service/util.go @@ -3,8 +3,8 @@ package service import ( "time" - "github.com/micro/go-micro/config/source" - proto "github.com/micro/go-micro/config/source/service/proto" + "github.com/micro/go-micro/v2/config/source" + proto "github.com/micro/go-micro/v2/config/source/service/proto" ) func toChangeSet(c *proto.ChangeSet) *source.ChangeSet { diff --git a/config/source/service/watcher.go b/config/source/service/watcher.go index 2806d427..c99e5f7c 100644 --- a/config/source/service/watcher.go +++ b/config/source/service/watcher.go @@ -1,8 +1,8 @@ package service import ( - "github.com/micro/go-micro/config/source" - proto "github.com/micro/go-micro/config/source/service/proto" + "github.com/micro/go-micro/v2/config/source" + proto "github.com/micro/go-micro/v2/config/source/service/proto" ) type watcher struct { diff --git a/config/value.go b/config/value.go index 929d671b..90710bad 100644 --- a/config/value.go +++ b/config/value.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/micro/go-micro/config/reader" + "github.com/micro/go-micro/v2/config/reader" ) type value struct{} diff --git a/debug/log/kubernetes/kubernetes.go b/debug/log/kubernetes/kubernetes.go index 861dbc46..d81aba23 100644 --- a/debug/log/kubernetes/kubernetes.go +++ b/debug/log/kubernetes/kubernetes.go @@ -1,4 +1,4 @@ -// Package kubernetes is a logger implementing (github.com/micro/go-micro/debug/log).Log +// Package kubernetes is a logger implementing (github.com/micro/go-micro/v2/debug/log).Log package kubernetes import ( @@ -10,8 +10,8 @@ import ( "strconv" "time" - "github.com/micro/go-micro/debug/log" - "github.com/micro/go-micro/util/kubernetes/client" + "github.com/micro/go-micro/v2/debug/log" + "github.com/micro/go-micro/v2/util/kubernetes/client" ) type klog struct { diff --git a/debug/log/kubernetes/kubernetes_test.go b/debug/log/kubernetes/kubernetes_test.go index 955e5d46..97749869 100644 --- a/debug/log/kubernetes/kubernetes_test.go +++ b/debug/log/kubernetes/kubernetes_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" "github.com/stretchr/testify/assert" ) diff --git a/debug/log/kubernetes/stream.go b/debug/log/kubernetes/stream.go index eed76d3e..e8fd3e98 100644 --- a/debug/log/kubernetes/stream.go +++ b/debug/log/kubernetes/stream.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" ) func write(l log.Record) error { diff --git a/debug/log/memory/memory.go b/debug/log/memory/memory.go index 18215701..b168addd 100644 --- a/debug/log/memory/memory.go +++ b/debug/log/memory/memory.go @@ -4,8 +4,8 @@ package memory import ( "fmt" - "github.com/micro/go-micro/debug/log" - "github.com/micro/go-micro/util/ring" + "github.com/micro/go-micro/v2/debug/log" + "github.com/micro/go-micro/v2/util/ring" ) var ( diff --git a/debug/log/memory/memory_test.go b/debug/log/memory/memory_test.go index db907f75..8fc861ac 100644 --- a/debug/log/memory/memory_test.go +++ b/debug/log/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" ) func TestLogger(t *testing.T) { diff --git a/debug/log/memory/stream.go b/debug/log/memory/stream.go index a7992230..ae6493ae 100644 --- a/debug/log/memory/stream.go +++ b/debug/log/memory/stream.go @@ -1,7 +1,7 @@ package memory import ( - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" ) type logStream struct { diff --git a/debug/log/noop/noop.go b/debug/log/noop/noop.go index 2d8a40da..1cbeba6a 100644 --- a/debug/log/noop/noop.go +++ b/debug/log/noop/noop.go @@ -1,7 +1,7 @@ package noop import ( - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" ) type noop struct{} diff --git a/debug/log/os.go b/debug/log/os.go index ed96668d..3073eacf 100644 --- a/debug/log/os.go +++ b/debug/log/os.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/util/ring" + "github.com/micro/go-micro/v2/util/ring" ) // Should stream from OS diff --git a/debug/profile/http/http.go b/debug/profile/http/http.go index 66cbf49c..a21bc2eb 100644 --- a/debug/profile/http/http.go +++ b/debug/profile/http/http.go @@ -7,7 +7,7 @@ import ( "net/http/pprof" "sync" - "github.com/micro/go-micro/debug/profile" + "github.com/micro/go-micro/v2/debug/profile" ) type httpProfile struct { diff --git a/debug/profile/pprof/pprof.go b/debug/profile/pprof/pprof.go index 5dfd49ba..42761efe 100644 --- a/debug/profile/pprof/pprof.go +++ b/debug/profile/pprof/pprof.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/debug/profile" + "github.com/micro/go-micro/v2/debug/profile" ) type profiler struct { diff --git a/debug/service/client.go b/debug/service/client.go index 89209955..192101f3 100644 --- a/debug/service/client.go +++ b/debug/service/client.go @@ -5,10 +5,10 @@ import ( "context" "time" - "github.com/micro/go-micro/client" + "github.com/micro/go-micro/v2/client" - "github.com/micro/go-micro/debug/log" - pb "github.com/micro/go-micro/debug/service/proto" + "github.com/micro/go-micro/v2/debug/log" + pb "github.com/micro/go-micro/v2/debug/service/proto" ) // Debug provides debug service client diff --git a/debug/service/handler/debug.go b/debug/service/handler/debug.go index e66c8fb2..967a3218 100644 --- a/debug/service/handler/debug.go +++ b/debug/service/handler/debug.go @@ -5,11 +5,11 @@ import ( "context" "time" - "github.com/micro/go-micro/debug/log" - proto "github.com/micro/go-micro/debug/service/proto" - "github.com/micro/go-micro/debug/stats" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/debug/log" + proto "github.com/micro/go-micro/v2/debug/service/proto" + "github.com/micro/go-micro/v2/debug/stats" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/server" ) // NewHandler returns an instance of the Debug Handler diff --git a/debug/service/proto/debug.pb.micro.go b/debug/service/proto/debug.pb.micro.go index 2144f1b4..a5f773e1 100644 --- a/debug/service/proto/debug.pb.micro.go +++ b/debug/service/proto/debug.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/debug/service/service.go b/debug/service/service.go index 95ad0f3c..cadbe4b8 100644 --- a/debug/service/service.go +++ b/debug/service/service.go @@ -3,8 +3,8 @@ package service import ( "time" - "github.com/micro/go-micro/debug" - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug" + "github.com/micro/go-micro/v2/debug/log" ) type serviceLog struct { diff --git a/debug/service/stream.go b/debug/service/stream.go index d7bd9765..f6662ad7 100644 --- a/debug/service/stream.go +++ b/debug/service/stream.go @@ -1,7 +1,7 @@ package service import ( - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" ) type logStream struct { diff --git a/debug/stats/default.go b/debug/stats/default.go index d4ffc23e..d36dfd0f 100644 --- a/debug/stats/default.go +++ b/debug/stats/default.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/util/ring" + "github.com/micro/go-micro/v2/util/ring" ) type stats struct { diff --git a/debug/trace/memory/memory.go b/debug/trace/memory/memory.go index 20420fa7..11413adc 100644 --- a/debug/trace/memory/memory.go +++ b/debug/trace/memory/memory.go @@ -5,8 +5,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/util/ring" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/util/ring" ) type Tracer struct { diff --git a/defaults.go b/defaults.go index 01854ff3..ca5b1e57 100644 --- a/defaults.go +++ b/defaults.go @@ -1,16 +1,16 @@ package micro import ( - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/store" // set defaults - gcli "github.com/micro/go-micro/client/grpc" - memTrace "github.com/micro/go-micro/debug/trace/memory" - gsrv "github.com/micro/go-micro/server/grpc" - memStore "github.com/micro/go-micro/store/memory" + gcli "github.com/micro/go-micro/v2/client/grpc" + memTrace "github.com/micro/go-micro/v2/debug/trace/memory" + gsrv "github.com/micro/go-micro/v2/server/grpc" + memStore "github.com/micro/go-micro/v2/store/memory" ) func init() { diff --git a/event.go b/event.go index 5301c747..c55e37bb 100644 --- a/event.go +++ b/event.go @@ -3,7 +3,7 @@ package micro import ( "context" - "github.com/micro/go-micro/client" + "github.com/micro/go-micro/v2/client" ) type event struct { diff --git a/function.go b/function.go index a9cc0d89..06037066 100644 --- a/function.go +++ b/function.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" ) type function struct { diff --git a/function_test.go b/function_test.go index 51d80fc9..8b26516e 100644 --- a/function_test.go +++ b/function_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - proto "github.com/micro/go-micro/debug/service/proto" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/util/test" + proto "github.com/micro/go-micro/v2/debug/service/proto" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/util/test" ) func TestFunction(t *testing.T) { diff --git a/go.mod b/go.mod index 8dfa1e41..eb869453 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/micro/go-micro +module github.com/micro/go-micro/v2 go 1.13 @@ -6,37 +6,29 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/beevik/ntp v0.2.0 github.com/bitly/go-simplejson v0.5.0 - github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/bwmarrin/discordgo v0.20.2 - github.com/coreos/bbolt v1.3.3 // indirect github.com/coreos/etcd v3.3.18+incompatible - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c github.com/fsnotify/fsnotify v1.4.7 github.com/fsouza/go-dockerclient v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-acme/lego/v3 v3.3.0 github.com/go-playground/universal-translator v0.17.0 // indirect - github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.3.2 github.com/google/uuid v1.1.1 github.com/gorilla/handlers v1.4.2 github.com/gorilla/websocket v1.4.1 - github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/hashicorp/hcl v1.0.0 github.com/imdario/mergo v0.3.8 - github.com/jonboulle/clockwork v0.1.0 // indirect github.com/joncalhoun/qson v0.0.0-20170526102502-8a9cab3a62b1 github.com/json-iterator/go v1.1.9 github.com/kr/pretty v0.1.0 - github.com/leodido/go-urn v1.2.0 // indirect github.com/lib/pq v1.3.0 github.com/lucas-clemente/quic-go v0.14.1 github.com/mholt/certmagic v0.9.1 github.com/micro/cli/v2 v2.1.1 + github.com/micro/go-micro v1.18.0 github.com/micro/mdns v0.3.0 github.com/miekg/dns v1.1.27 github.com/mitchellh/hashstructure v1.0.0 @@ -45,19 +37,13 @@ require ( github.com/nlopes/slack v0.6.1-0.20191106133607-d06c2a2b3249 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c github.com/pkg/errors v0.9.1 - github.com/soheilhy/cmux v0.1.4 // indirect github.com/stretchr/testify v1.4.0 - github.com/technoweenie/multipartstreamer v1.0.1 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc // indirect - github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - go.etcd.io/bbolt v1.3.3 // indirect go.uber.org/zap v1.13.0 golang.org/x/crypto v0.0.0-20200117160349-530e935923ad golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa google.golang.org/grpc v1.26.0 - gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/validator.v9 v9.31.0 gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/telegram-bot-api.v4 v4.6.4 - sigs.k8s.io/yaml v1.1.0 // indirect ) diff --git a/go.sum b/go.sum index 05236368..ef80de45 100644 --- a/go.sum +++ b/go.sum @@ -30,8 +30,10 @@ github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvd github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c h1:YMP6olTU903X3gxQJckdmiP8/zkSMq4kN3uipsU9XjU= github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c/go.mod h1:7xhjOwRV2+0HXGmM0jxaEu+ZiXJFoVZOTfL/dmqbrD8= github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks= @@ -64,6 +66,8 @@ github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngE github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/bwmarrin/discordgo v0.19.0/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= +github.com/bwmarrin/discordgo v0.20.1/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= github.com/bwmarrin/discordgo v0.20.2 h1:nA7jiTtqUA9lT93WL2jPjUp8ZTEInRujBdx1C9gkr20= github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c= @@ -80,6 +84,7 @@ github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= @@ -88,12 +93,15 @@ github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDG github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNNP3dXwIq1lE= github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok= @@ -103,6 +111,7 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decker502/dnspod-go v0.2.0/go.mod h1:qsurYu1FgxcDwfSwXJdLt4kRsBLZeosEb9uq4Sy+08g= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= @@ -110,6 +119,7 @@ github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s9 github.com/dnsimple/dnsimple-go v0.30.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg= github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.4.2-0.20190710153559-aa8249ae1b8b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23 h1:oqgGT9O61YAYvI41EBsLePOr+LE6roB0xY4gpkZuFSE= github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -121,6 +131,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= @@ -131,12 +142,14 @@ github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c h1:pBgVXWDXj github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c/go.mod h1:pFdJbAhRf7rh6YYMUdIQGyzne6zYL1tCUW8QV2B3UfY= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsouza/go-dockerclient v1.4.4/go.mod h1:PrwszSL5fbmsESocROrOGq/NULMXRw+bajY0ltzD6MA= github.com/fsouza/go-dockerclient v1.6.0 h1:f7j+AX94143JL1H3TiqSMkM4EcLDI0De1qD4GGn3Hig= github.com/fsouza/go-dockerclient v1.6.0/go.mod h1:YWwtNPuL4XTX1SKJQk86cWPmmqwx+4np9qfPbb+znGc= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-acme/lego/v3 v3.1.0/go.mod h1:074uqt+JS6plx+c9Xaiz6+L+GBb+7itGtzfcDM2AhEE= github.com/go-acme/lego/v3 v3.3.0 h1:6BePZsOiYA4/w+M7QDytxQtMfCipMPGnWAHs9pWks98= github.com/go-acme/lego/v3 v3.3.0/go.mod h1:iGSY2vQrvQs3WezicSB/oVbO2eCrD88dpWPwb1qLqu0= github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s= @@ -144,10 +157,14 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.44.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U= +github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -162,6 +179,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -222,6 +240,7 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= +github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84= github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -235,6 +254,7 @@ github.com/joncalhoun/qson v0.0.0-20170526102502-8a9cab3a62b1/go.mod h1:DFXrEwSR github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -259,17 +279,22 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA= github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w= +github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/linode/linodego v0.10.0/go.mod h1:cziNP7pbvE3mXIPneHj0oRY8L1WtGEIKlZ8LANE4eXA= github.com/liquidweb/liquidweb-go v1.6.0/go.mod h1:UDcVnAMDkZxpw4Y7NOHkqoeiGacVLEIG/i5J9cyixzQ= +github.com/lucas-clemente/quic-go v0.12.1/go.mod h1:UXJJPE4RfFef/xPO5wQm0tITK8gNfqwTxjbE7s3Vb8s= +github.com/lucas-clemente/quic-go v0.13.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU= github.com/lucas-clemente/quic-go v0.14.1 h1:c1aKoBZKOPA+49q96B1wGkibyPP0AxYh45WuAoq+87E= github.com/lucas-clemente/quic-go v0.14.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU= github.com/marten-seemann/chacha20 v0.2.0 h1:f40vqzzx+3GdOmzQoItkLX5WLvHgPgyYqFFIO5Gh4hQ= github.com/marten-seemann/chacha20 v0.2.0/go.mod h1:HSdjFau7GzYRj+ahFNwsO3ouVJr1HFkWoEwNDb4TMtE= github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= +github.com/marten-seemann/qtls v0.3.2/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gtbkks= github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -278,14 +303,23 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mholt/certmagic v0.7.5/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ= +github.com/mholt/certmagic v0.8.3/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ= github.com/mholt/certmagic v0.9.1 h1:wPzyouOyE+30NIQETJuhTB5ZQWz+0Hy038vaR5WWQDE= github.com/mholt/certmagic v0.9.1/go.mod h1:nu8jbsbtwK4205EDH/ZUMTKsfYpJA1Q7MKXHfgTihNw= +github.com/micro/cli v0.2.0 h1:ut3rV5JWqZjsXIa2MvGF+qMUP8DAUTvHX9Br5gO4afA= +github.com/micro/cli v0.2.0/go.mod h1:jRT9gmfVKWSS6pkKcXQ8YhUyj6bzwxK8Fp5b0Y7qNnk= github.com/micro/cli/v2 v2.1.1 h1:uFw0SMIKmGuyHIm8lXns/NOn7V62bM5y7DnlxUM+BEQ= github.com/micro/cli/v2 v2.1.1/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg= +github.com/micro/go-micro v1.16.0/go.mod h1:A0F58bHLh2m0LAI9QyhvmbN8c1cxhAZo3cM6s+iDsrM= +github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E= +github.com/micro/go-micro v1.18.0/go.mod h1:klwUJL1gkdY1MHFyz+fFJXn52dKcty4hoe95Mp571AA= github.com/micro/mdns v0.3.0 h1:bYycYe+98AXR3s8Nq5qvt6C573uFTDPIYzJemWON0QE= github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc= +github.com/micro/protoc-gen-micro v1.0.0/go.mod h1:C8ij4DJhapBmypcT00AXdb0cZ675/3PqUO02buWWqbE= github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -307,16 +341,20 @@ github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.0/go.mod h1:r5y0WgCag0dTj/qiHkHrXAcKQ/f5GMOZaEGdoxxnJ4I= github.com/nats-io/nats-server/v2 v2.1.2 h1:i2Ly0B+1+rzNZHHWtD4ZwKi+OU5l+uQo1iDHZ2PmiIc= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= github.com/nats-io/nats.go v1.9.1 h1:ik3HbLhZ0YABLto7iX80pZLPw/6dx3T+++MZJwLnMrQ= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3 h1:6JrEfig+HzTH85yxzhSVbjHRJv9cn0p6n3IngIcM5/k= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= +github.com/nlopes/slack v0.6.0/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk= github.com/nlopes/slack v0.6.1-0.20191106133607-d06c2a2b3249 h1:Pr5gZa2VcmktVwq0lyC39MsN5tz356vC/pQHKvq+QBo= github.com/nlopes/slack v0.6.1-0.20191106133607-d06c2a2b3249/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk= github.com/nrdcg/auroradns v1.0.0/go.mod h1:6JPXKzIRzZzMqtTDgueIhTi6rFf1QvYE/HzqidhOhjw= @@ -407,6 +445,7 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM= github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog= github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc h1:yUaosFVTJwnltaHbSNC3i82I92quFs+OFPRl8kNMVwo= github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f/go.mod h1:i0f4R4o2HM0m3DZYQWsj6/MEowD57VzoH0v3d7igeFY= @@ -433,28 +472,35 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.2.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190130090550-b01c7a725664/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200117160349-530e935923ad h1:Jh8cai0fqIK+f6nG0UgPW5wFk8wmiMhM3AyciDBdtQg= golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -499,7 +545,9 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191011234655-491137f69257/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191109021931-daa7c04131f5/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -523,6 +571,7 @@ golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -532,12 +581,16 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4 h1:Hynbrlo6LbYI3H1IqXpkVDOcX/3HiPdhVEuyj5a59RM= +golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -563,6 +616,7 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -593,6 +647,7 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1 h1:aQktFqmDE2yjveXJlVIfslDFmFnUXSqG0i6KRcJAeMc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -602,6 +657,8 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -613,6 +670,7 @@ gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v9 v9.30.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M= gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= diff --git a/micro.go b/micro.go index 6dc43848..77be00d0 100644 --- a/micro.go +++ b/micro.go @@ -4,8 +4,8 @@ package micro import ( "context" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/server" ) type serviceKey struct{} diff --git a/monitor/default.go b/monitor/default.go index b37b5658..380c036b 100644 --- a/monitor/default.go +++ b/monitor/default.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "github.com/micro/go-micro/client" - pb "github.com/micro/go-micro/debug/service/proto" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/cache" + "github.com/micro/go-micro/v2/client" + pb "github.com/micro/go-micro/v2/debug/service/proto" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/cache" ) type monitor struct { diff --git a/monitor/options.go b/monitor/options.go index 445d39d9..6bb74a02 100644 --- a/monitor/options.go +++ b/monitor/options.go @@ -1,8 +1,8 @@ package monitor import ( - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/registry" ) type Options struct { diff --git a/network/default.go b/network/default.go index 48e6f9ee..a5613827 100644 --- a/network/default.go +++ b/network/default.go @@ -12,23 +12,23 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/client" - cmucp "github.com/micro/go-micro/client/mucp" - rtr "github.com/micro/go-micro/client/selector/router" - "github.com/micro/go-micro/network/resolver/dns" - pbNet "github.com/micro/go-micro/network/service/proto" - "github.com/micro/go-micro/proxy" - "github.com/micro/go-micro/router" - pbRtr "github.com/micro/go-micro/router/service/proto" - "github.com/micro/go-micro/server" - smucp "github.com/micro/go-micro/server/mucp" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/tunnel" - bun "github.com/micro/go-micro/tunnel/broker" - tun "github.com/micro/go-micro/tunnel/transport" - "github.com/micro/go-micro/util/backoff" - "github.com/micro/go-micro/util/log" - pbUtil "github.com/micro/go-micro/util/proto" + "github.com/micro/go-micro/v2/client" + cmucp "github.com/micro/go-micro/v2/client/mucp" + rtr "github.com/micro/go-micro/v2/client/selector/router" + "github.com/micro/go-micro/v2/network/resolver/dns" + pbNet "github.com/micro/go-micro/v2/network/service/proto" + "github.com/micro/go-micro/v2/proxy" + "github.com/micro/go-micro/v2/router" + pbRtr "github.com/micro/go-micro/v2/router/service/proto" + "github.com/micro/go-micro/v2/server" + smucp "github.com/micro/go-micro/v2/server/mucp" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/tunnel" + bun "github.com/micro/go-micro/v2/tunnel/broker" + tun "github.com/micro/go-micro/v2/tunnel/transport" + "github.com/micro/go-micro/v2/util/backoff" + "github.com/micro/go-micro/v2/util/log" + pbUtil "github.com/micro/go-micro/v2/util/proto" ) var ( diff --git a/network/network.go b/network/network.go index 535870f0..e71c6ab2 100644 --- a/network/network.go +++ b/network/network.go @@ -4,8 +4,8 @@ package network import ( "time" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/server" ) var ( diff --git a/network/node.go b/network/node.go index 4ff181f6..b952f0ce 100644 --- a/network/node.go +++ b/network/node.go @@ -6,7 +6,7 @@ import ( "sync" "time" - pb "github.com/micro/go-micro/network/service/proto" + pb "github.com/micro/go-micro/v2/network/service/proto" ) var ( diff --git a/network/node_test.go b/network/node_test.go index 99975415..d256e3f8 100644 --- a/network/node_test.go +++ b/network/node_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - pb "github.com/micro/go-micro/network/service/proto" + pb "github.com/micro/go-micro/v2/network/service/proto" ) var ( diff --git a/network/options.go b/network/options.go index 63ff6fe7..084dce63 100644 --- a/network/options.go +++ b/network/options.go @@ -2,12 +2,12 @@ package network import ( "github.com/google/uuid" - "github.com/micro/go-micro/network/resolver" - "github.com/micro/go-micro/network/resolver/registry" - "github.com/micro/go-micro/proxy" - "github.com/micro/go-micro/proxy/mucp" - "github.com/micro/go-micro/router" - "github.com/micro/go-micro/tunnel" + "github.com/micro/go-micro/v2/network/resolver" + "github.com/micro/go-micro/v2/network/resolver/registry" + "github.com/micro/go-micro/v2/proxy" + "github.com/micro/go-micro/v2/proxy/mucp" + "github.com/micro/go-micro/v2/router" + "github.com/micro/go-micro/v2/tunnel" ) type Option func(*Options) diff --git a/network/resolver/dns/dns.go b/network/resolver/dns/dns.go index a8d27b06..2b1670f1 100644 --- a/network/resolver/dns/dns.go +++ b/network/resolver/dns/dns.go @@ -5,7 +5,7 @@ import ( "context" "net" - "github.com/micro/go-micro/network/resolver" + "github.com/micro/go-micro/v2/network/resolver" "github.com/miekg/dns" ) diff --git a/network/resolver/dnssrv/dnssrv.go b/network/resolver/dnssrv/dnssrv.go index 63a92eda..80259eec 100644 --- a/network/resolver/dnssrv/dnssrv.go +++ b/network/resolver/dnssrv/dnssrv.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/micro/go-micro/network/resolver" + "github.com/micro/go-micro/v2/network/resolver" ) // Resolver is a DNS network resolve diff --git a/network/resolver/http/http.go b/network/resolver/http/http.go index 889ad687..ad3d1654 100644 --- a/network/resolver/http/http.go +++ b/network/resolver/http/http.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/micro/go-micro/network/resolver" + "github.com/micro/go-micro/v2/network/resolver" ) // Resolver is a HTTP network resolver diff --git a/network/resolver/registry/registry.go b/network/resolver/registry/registry.go index 20fffc18..0852d9c8 100644 --- a/network/resolver/registry/registry.go +++ b/network/resolver/registry/registry.go @@ -2,8 +2,8 @@ package registry import ( - "github.com/micro/go-micro/network/resolver" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/network/resolver" + "github.com/micro/go-micro/v2/registry" ) // Resolver is a registry network resolver diff --git a/network/resolver/static/static.go b/network/resolver/static/static.go index 485332c5..49f64003 100644 --- a/network/resolver/static/static.go +++ b/network/resolver/static/static.go @@ -2,7 +2,7 @@ package registry import ( - "github.com/micro/go-micro/network/resolver" + "github.com/micro/go-micro/v2/network/resolver" ) // Resolver returns a static list of nodes. In the event the node list diff --git a/network/service/proto/network.pb.go b/network/service/proto/network.pb.go index 54902c65..6dded795 100644 --- a/network/service/proto/network.pb.go +++ b/network/service/proto/network.pb.go @@ -6,7 +6,7 @@ package go_micro_network import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - proto1 "github.com/micro/go-micro/router/service/proto" + proto1 "github.com/micro/go-micro/v2/router/service/proto" math "math" ) diff --git a/network/service/proto/network.pb.micro.go b/network/service/proto/network.pb.micro.go index a6df00c6..4fbda43d 100644 --- a/network/service/proto/network.pb.micro.go +++ b/network/service/proto/network.pb.micro.go @@ -6,14 +6,14 @@ package go_micro_network import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - _ "github.com/micro/go-micro/router/service/proto" + _ "github.com/micro/go-micro/v2/router/service/proto" math "math" ) import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/options.go b/options.go index 1642704d..d616115e 100644 --- a/options.go +++ b/options.go @@ -5,14 +5,14 @@ import ( "time" "github.com/micro/cli/v2" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/config/cmd" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/config/cmd" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/transport" ) type Options struct { diff --git a/plugin/default.go b/plugin/default.go index 8fde651a..794f8622 100644 --- a/plugin/default.go +++ b/plugin/default.go @@ -11,13 +11,13 @@ import ( "strings" "text/template" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/config/cmd" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/config/cmd" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/transport" ) type plugin struct{} diff --git a/plugin/template.go b/plugin/template.go index dd559bfa..38e6f7e4 100644 --- a/plugin/template.go +++ b/plugin/template.go @@ -5,7 +5,7 @@ var ( package main import ( - "github.com/micro/go-micro/plugin" + "github.com/micro/go-micro/v2/plugin" "{{.Path}}" ) diff --git a/proxy/grpc/grpc.go b/proxy/grpc/grpc.go index e8a28877..0df9bbe0 100644 --- a/proxy/grpc/grpc.go +++ b/proxy/grpc/grpc.go @@ -6,11 +6,11 @@ import ( "io" "strings" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/grpc" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/proxy" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/grpc" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/proxy" + "github.com/micro/go-micro/v2/server" ) // Proxy will transparently proxy requests to the backend. diff --git a/proxy/http/http.go b/proxy/http/http.go index dd666763..06332da5 100644 --- a/proxy/http/http.go +++ b/proxy/http/http.go @@ -10,9 +10,9 @@ import ( "net/url" "path" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/proxy" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/proxy" + "github.com/micro/go-micro/v2/server" ) // Proxy will proxy rpc requests as http POST requests. It is a server.Proxy diff --git a/proxy/http/http_test.go b/proxy/http/http_test.go index acdcde95..fd3a1c11 100644 --- a/proxy/http/http_test.go +++ b/proxy/http/http_test.go @@ -8,10 +8,10 @@ import ( "sync" "testing" - "github.com/micro/go-micro" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/server" ) type testHandler struct{} diff --git a/proxy/mucp/mucp.go b/proxy/mucp/mucp.go index e42a13fd..68fa35f6 100644 --- a/proxy/mucp/mucp.go +++ b/proxy/mucp/mucp.go @@ -10,16 +10,16 @@ import ( "sync" "time" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/proxy" - "github.com/micro/go-micro/router" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/proxy" + "github.com/micro/go-micro/v2/router" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/log" ) // Proxy will transparently proxy requests to an endpoint. diff --git a/proxy/options.go b/proxy/options.go index 20ca9c4d..877d66d5 100644 --- a/proxy/options.go +++ b/proxy/options.go @@ -2,8 +2,8 @@ package proxy import ( - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/router" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/router" ) type Options struct { diff --git a/proxy/proxy.go b/proxy/proxy.go index 982ad3c6..6b7b3a8d 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -4,7 +4,7 @@ package proxy import ( "context" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" ) // Proxy can be used as a proxy server for go-micro services diff --git a/registry/cache/cache.go b/registry/cache/cache.go index 75fcac32..51c3aac0 100644 --- a/registry/cache/cache.go +++ b/registry/cache/cache.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/micro/go-micro/registry" - log "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/registry" + log "github.com/micro/go-micro/v2/util/log" ) // Cache is the registry cache interface diff --git a/registry/etcd/etcd.go b/registry/etcd/etcd.go index c93a2801..b51a4010 100644 --- a/registry/etcd/etcd.go +++ b/registry/etcd/etcd.go @@ -15,8 +15,8 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/log" hash "github.com/mitchellh/hashstructure" "go.uber.org/zap" ) diff --git a/registry/etcd/options.go b/registry/etcd/options.go index 611e119f..b3ea19f1 100644 --- a/registry/etcd/options.go +++ b/registry/etcd/options.go @@ -3,7 +3,7 @@ package etcd import ( "context" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" "go.uber.org/zap" ) diff --git a/registry/etcd/watcher.go b/registry/etcd/watcher.go index 4eef76ba..fdf2ea58 100644 --- a/registry/etcd/watcher.go +++ b/registry/etcd/watcher.go @@ -6,7 +6,7 @@ import ( "time" "github.com/coreos/etcd/clientv3" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type etcdWatcher struct { diff --git a/registry/kubernetes/kubernetes.go b/registry/kubernetes/kubernetes.go index 47fa7090..81719376 100644 --- a/registry/kubernetes/kubernetes.go +++ b/registry/kubernetes/kubernetes.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/kubernetes/client" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/kubernetes/client" ) type kregistry struct { diff --git a/registry/kubernetes/watcher.go b/registry/kubernetes/watcher.go index c51d4fc8..0d848c4a 100644 --- a/registry/kubernetes/watcher.go +++ b/registry/kubernetes/watcher.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/kubernetes/client" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/kubernetes/client" + "github.com/micro/go-micro/v2/util/log" ) type k8sWatcher struct { diff --git a/registry/mdns/mdns.go b/registry/mdns/mdns.go index f84e8961..498b2429 100644 --- a/registry/mdns/mdns.go +++ b/registry/mdns/mdns.go @@ -4,7 +4,7 @@ package mdns import ( "context" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) // NewRegistry returns a new mdns registry diff --git a/registry/memory/memory.go b/registry/memory/memory.go index 3d7b782e..2586d5e4 100644 --- a/registry/memory/memory.go +++ b/registry/memory/memory.go @@ -7,8 +7,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/registry/memory/memory_test.go b/registry/memory/memory_test.go index cab6a6f4..9609b20c 100644 --- a/registry/memory/memory_test.go +++ b/registry/memory/memory_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) var ( diff --git a/registry/memory/memory_watcher.go b/registry/memory/memory_watcher.go index 8eb3cfd1..79346ec3 100644 --- a/registry/memory/memory_watcher.go +++ b/registry/memory/memory_watcher.go @@ -3,7 +3,7 @@ package memory import ( "errors" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type memoryWatcher struct { diff --git a/registry/memory/options.go b/registry/memory/options.go index 7922dcaa..57e430ef 100644 --- a/registry/memory/options.go +++ b/registry/memory/options.go @@ -3,7 +3,7 @@ package memory import ( "context" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type servicesKey struct{} diff --git a/registry/memory/util.go b/registry/memory/util.go index d78e3324..32a3852d 100644 --- a/registry/memory/util.go +++ b/registry/memory/util.go @@ -3,7 +3,7 @@ package memory import ( "time" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func serviceToRecord(s *registry.Service, ttl time.Duration) *record { diff --git a/registry/memory/watcher.go b/registry/memory/watcher.go index c1a7067c..76ae6440 100644 --- a/registry/memory/watcher.go +++ b/registry/memory/watcher.go @@ -3,7 +3,7 @@ package memory import ( "errors" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type Watcher struct { diff --git a/registry/memory/watcher_test.go b/registry/memory/watcher_test.go index 1df468fd..37b4a4ae 100644 --- a/registry/memory/watcher_test.go +++ b/registry/memory/watcher_test.go @@ -3,7 +3,7 @@ package memory import ( "testing" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func TestWatcher(t *testing.T) { diff --git a/registry/service/proto/registry.pb.micro.go b/registry/service/proto/registry.pb.micro.go index 254935ed..7317a4eb 100644 --- a/registry/service/proto/registry.pb.micro.go +++ b/registry/service/proto/registry.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/registry/service/service.go b/registry/service/service.go index 42aa89d8..e266347f 100644 --- a/registry/service/service.go +++ b/registry/service/service.go @@ -5,10 +5,10 @@ import ( "context" "time" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/client/grpc" - "github.com/micro/go-micro/registry" - pb "github.com/micro/go-micro/registry/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/client/grpc" + "github.com/micro/go-micro/v2/registry" + pb "github.com/micro/go-micro/v2/registry/service/proto" ) var ( diff --git a/registry/service/util.go b/registry/service/util.go index 76d8ea9d..4ba5f4da 100644 --- a/registry/service/util.go +++ b/registry/service/util.go @@ -1,8 +1,8 @@ package service import ( - "github.com/micro/go-micro/registry" - pb "github.com/micro/go-micro/registry/service/proto" + "github.com/micro/go-micro/v2/registry" + pb "github.com/micro/go-micro/v2/registry/service/proto" ) func values(v []*registry.Value) []*pb.Value { diff --git a/registry/service/watcher.go b/registry/service/watcher.go index 973f9547..bf998a2f 100644 --- a/registry/service/watcher.go +++ b/registry/service/watcher.go @@ -1,8 +1,8 @@ package service import ( - "github.com/micro/go-micro/registry" - pb "github.com/micro/go-micro/registry/service/proto" + "github.com/micro/go-micro/v2/registry" + pb "github.com/micro/go-micro/v2/registry/service/proto" ) type serviceWatcher struct { diff --git a/router/default.go b/router/default.go index f699651c..7056f1a0 100644 --- a/router/default.go +++ b/router/default.go @@ -10,8 +10,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/router/default_test.go b/router/default_test.go index 581ef7ae..c94ac9b4 100644 --- a/router/default_test.go +++ b/router/default_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/util/log" ) func routerTestSetup() Router { diff --git a/router/options.go b/router/options.go index 0fa67b4f..a5f44b46 100644 --- a/router/options.go +++ b/router/options.go @@ -2,8 +2,8 @@ package router import ( "github.com/google/uuid" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/registry" ) // Options are router options diff --git a/router/service/proto/router.pb.micro.go b/router/service/proto/router.pb.micro.go index ae8143bc..5bc8c690 100644 --- a/router/service/proto/router.pb.micro.go +++ b/router/service/proto/router.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/router/service/service.go b/router/service/service.go index 1de462a7..97b329e7 100644 --- a/router/service/service.go +++ b/router/service/service.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/router" - pb "github.com/micro/go-micro/router/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/router" + pb "github.com/micro/go-micro/v2/router/service/proto" ) type svc struct { diff --git a/router/service/table.go b/router/service/table.go index bcfc8ef3..8590d323 100644 --- a/router/service/table.go +++ b/router/service/table.go @@ -3,9 +3,9 @@ package service import ( "context" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/router" - pb "github.com/micro/go-micro/router/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/router" + pb "github.com/micro/go-micro/v2/router/service/proto" ) type table struct { diff --git a/router/service/watcher.go b/router/service/watcher.go index 2ffc7ada..3f641e8b 100644 --- a/router/service/watcher.go +++ b/router/service/watcher.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/micro/go-micro/router" - pb "github.com/micro/go-micro/router/service/proto" + "github.com/micro/go-micro/v2/router" + pb "github.com/micro/go-micro/v2/router/service/proto" ) type watcher struct { diff --git a/router/table.go b/router/table.go index 8ee853ec..df17ee3e 100644 --- a/router/table.go +++ b/router/table.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/runtime/default.go b/runtime/default.go index 453510a3..eed3ff3f 100644 --- a/runtime/default.go +++ b/runtime/default.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/util/log" ) type runtime struct { diff --git a/runtime/kubernetes/kubernetes.go b/runtime/kubernetes/kubernetes.go index fe9b5af8..3545967b 100644 --- a/runtime/kubernetes/kubernetes.go +++ b/runtime/kubernetes/kubernetes.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/micro/go-micro/runtime" - "github.com/micro/go-micro/util/kubernetes/client" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/runtime" + "github.com/micro/go-micro/v2/util/kubernetes/client" + "github.com/micro/go-micro/v2/util/log" ) // action to take on runtime service diff --git a/runtime/kubernetes/service.go b/runtime/kubernetes/service.go index 3b6963be..6c3024cb 100644 --- a/runtime/kubernetes/service.go +++ b/runtime/kubernetes/service.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/micro/go-micro/runtime" - "github.com/micro/go-micro/util/kubernetes/api" - "github.com/micro/go-micro/util/kubernetes/client" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/runtime" + "github.com/micro/go-micro/v2/util/kubernetes/api" + "github.com/micro/go-micro/v2/util/kubernetes/client" + "github.com/micro/go-micro/v2/util/log" ) type service struct { diff --git a/runtime/local/build/build.go b/runtime/local/build/build.go index a179ec0e..568ddc3f 100644 --- a/runtime/local/build/build.go +++ b/runtime/local/build/build.go @@ -2,7 +2,7 @@ package build import ( - "github.com/micro/go-micro/runtime/local/source" + "github.com/micro/go-micro/v2/runtime/local/source" ) // Builder builds binaries diff --git a/runtime/local/build/docker/docker.go b/runtime/local/build/docker/docker.go index 84b163d4..bb953a71 100644 --- a/runtime/local/build/docker/docker.go +++ b/runtime/local/build/docker/docker.go @@ -9,8 +9,8 @@ import ( "path/filepath" docker "github.com/fsouza/go-dockerclient" - "github.com/micro/go-micro/runtime/local/build" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/runtime/local/build" + "github.com/micro/go-micro/v2/util/log" ) type Builder struct { diff --git a/runtime/local/build/go/golang.go b/runtime/local/build/go/golang.go index c11430c0..ce12124d 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/micro/go-micro/runtime/local/build" + "github.com/micro/go-micro/v2/runtime/local/build" ) type Builder struct { diff --git a/runtime/local/process/os/os.go b/runtime/local/process/os/os.go index 1fb9f231..f1825e97 100644 --- a/runtime/local/process/os/os.go +++ b/runtime/local/process/os/os.go @@ -10,7 +10,7 @@ import ( "strconv" "syscall" - "github.com/micro/go-micro/runtime/local/process" + "github.com/micro/go-micro/v2/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 38ff70a5..d5c7869d 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/micro/go-micro/runtime/local/process" + "github.com/micro/go-micro/v2/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 71f85a2c..8a939177 100644 --- a/runtime/local/process/os/process.go +++ b/runtime/local/process/os/process.go @@ -2,7 +2,7 @@ package os import ( - "github.com/micro/go-micro/runtime/local/process" + "github.com/micro/go-micro/v2/runtime/local/process" ) type Process struct{} diff --git a/runtime/local/process/process.go b/runtime/local/process/process.go index 8d2bdf7e..4449d294 100644 --- a/runtime/local/process/process.go +++ b/runtime/local/process/process.go @@ -4,7 +4,7 @@ package process import ( "io" - "github.com/micro/go-micro/runtime/local/build" + "github.com/micro/go-micro/v2/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 516e8857..7581040f 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/micro/go-micro/runtime/local/source" + "github.com/micro/go-micro/v2/runtime/local/source" git "gopkg.in/src-d/go-git.v4" ) diff --git a/runtime/local/source/go/golang.go b/runtime/local/source/go/golang.go index 95abdc60..82df5920 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/micro/go-micro/runtime/local/source" + "github.com/micro/go-micro/v2/runtime/local/source" ) type Source struct { diff --git a/runtime/service.go b/runtime/service.go index efd499a3..ea42dc9e 100644 --- a/runtime/service.go +++ b/runtime/service.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/micro/go-micro/runtime/local/build" - "github.com/micro/go-micro/runtime/local/process" - proc "github.com/micro/go-micro/runtime/local/process/os" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/runtime/local/build" + "github.com/micro/go-micro/v2/runtime/local/process" + proc "github.com/micro/go-micro/v2/runtime/local/process/os" + "github.com/micro/go-micro/v2/util/log" ) type service struct { diff --git a/runtime/service/proto/runtime.pb.micro.go b/runtime/service/proto/runtime.pb.micro.go index 38f340d4..a357362d 100644 --- a/runtime/service/proto/runtime.pb.micro.go +++ b/runtime/service/proto/runtime.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/runtime/service/service.go b/runtime/service/service.go index 5ecfb9ec..c46c5ba4 100644 --- a/runtime/service/service.go +++ b/runtime/service/service.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/runtime" - pb "github.com/micro/go-micro/runtime/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/runtime" + pb "github.com/micro/go-micro/v2/runtime/service/proto" ) type svc struct { diff --git a/server/extractor.go b/server/extractor.go index 2a9d4e01..49655605 100644 --- a/server/extractor.go +++ b/server/extractor.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func extractValue(v reflect.Type, d int) *registry.Value { diff --git a/server/extractor_test.go b/server/extractor_test.go index 8cae373c..8512f241 100644 --- a/server/extractor_test.go +++ b/server/extractor_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type testHandler struct{} diff --git a/server/grpc/codec.go b/server/grpc/codec.go index dff9f600..cb27ec6e 100644 --- a/server/grpc/codec.go +++ b/server/grpc/codec.go @@ -9,10 +9,10 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/codec/jsonrpc" - "github.com/micro/go-micro/codec/protorpc" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/codec/jsonrpc" + "github.com/micro/go-micro/v2/codec/protorpc" "google.golang.org/grpc" "google.golang.org/grpc/encoding" "google.golang.org/grpc/metadata" diff --git a/server/grpc/error.go b/server/grpc/error.go index 4001622d..45564152 100644 --- a/server/grpc/error.go +++ b/server/grpc/error.go @@ -3,7 +3,7 @@ package grpc import ( "net/http" - "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/v2/errors" "google.golang.org/grpc/codes" ) diff --git a/server/grpc/extractor.go b/server/grpc/extractor.go index 875bb1c9..5576182b 100644 --- a/server/grpc/extractor.go +++ b/server/grpc/extractor.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func extractValue(v reflect.Type, d int) *registry.Value { diff --git a/server/grpc/extractor_test.go b/server/grpc/extractor_test.go index ebbd0e2b..ccf99424 100644 --- a/server/grpc/extractor_test.go +++ b/server/grpc/extractor_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type testHandler struct{} diff --git a/server/grpc/grpc.go b/server/grpc/grpc.go index 53674aa7..7a098e86 100644 --- a/server/grpc/grpc.go +++ b/server/grpc/grpc.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/errors" - meta "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/addr" - mgrpc "github.com/micro/go-micro/util/grpc" - "github.com/micro/go-micro/util/log" - mnet "github.com/micro/go-micro/util/net" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/errors" + meta "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/addr" + mgrpc "github.com/micro/go-micro/v2/util/grpc" + "github.com/micro/go-micro/v2/util/log" + mnet "github.com/micro/go-micro/v2/util/net" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/server/grpc/grpc_test.go b/server/grpc/grpc_test.go index dcf7350b..5d218ccf 100644 --- a/server/grpc/grpc_test.go +++ b/server/grpc/grpc_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/server" "google.golang.org/grpc" - pb "github.com/micro/go-micro/server/grpc/proto" + pb "github.com/micro/go-micro/v2/server/grpc/proto" ) // server is used to implement helloworld.GreeterServer. diff --git a/server/grpc/handler.go b/server/grpc/handler.go index f41a1fe9..fb4e2bbe 100644 --- a/server/grpc/handler.go +++ b/server/grpc/handler.go @@ -3,8 +3,8 @@ package grpc import ( "reflect" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" ) type rpcHandler struct { diff --git a/server/grpc/options.go b/server/grpc/options.go index c57c022e..b411b88e 100644 --- a/server/grpc/options.go +++ b/server/grpc/options.go @@ -4,11 +4,11 @@ import ( "context" "crypto/tls" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/transport" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/server/grpc/proto/test.micro.go b/server/grpc/proto/test.micro.go index b00e7ea3..5cc8a4e0 100644 --- a/server/grpc/proto/test.micro.go +++ b/server/grpc/proto/test.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/server/grpc/request.go b/server/grpc/request.go index adfed48e..1261bbc8 100644 --- a/server/grpc/request.go +++ b/server/grpc/request.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" ) type rpcRequest struct { diff --git a/server/grpc/response.go b/server/grpc/response.go index f13ad89c..e5c74fc2 100644 --- a/server/grpc/response.go +++ b/server/grpc/response.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type rpcResponse struct { diff --git a/server/grpc/server.go b/server/grpc/server.go index 140d7e5b..6d43ba17 100644 --- a/server/grpc/server.go +++ b/server/grpc/server.go @@ -14,8 +14,8 @@ import ( "unicode" "unicode/utf8" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/server/grpc/stream.go b/server/grpc/stream.go index ae31a0bb..92165864 100644 --- a/server/grpc/stream.go +++ b/server/grpc/stream.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" "google.golang.org/grpc" ) diff --git a/server/grpc/subscriber.go b/server/grpc/subscriber.go index 9dd071c1..c628a6e0 100644 --- a/server/grpc/subscriber.go +++ b/server/grpc/subscriber.go @@ -7,12 +7,12 @@ import ( "runtime/debug" "strings" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/log" ) const ( diff --git a/server/mock/mock.go b/server/mock/mock.go index ce2a4671..0725cbfc 100644 --- a/server/mock/mock.go +++ b/server/mock/mock.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/google/uuid" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" ) type MockServer struct { diff --git a/server/mock/mock_handler.go b/server/mock/mock_handler.go index e08efc06..de46fe52 100644 --- a/server/mock/mock_handler.go +++ b/server/mock/mock_handler.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" ) type MockHandler struct { diff --git a/server/mock/mock_subscriber.go b/server/mock/mock_subscriber.go index e5de5396..fb2bb7da 100644 --- a/server/mock/mock_subscriber.go +++ b/server/mock/mock_subscriber.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" ) type MockSubscriber struct { diff --git a/server/mock/mock_test.go b/server/mock/mock_test.go index d910af1a..6c76af91 100644 --- a/server/mock/mock_test.go +++ b/server/mock/mock_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" ) func TestMockServer(t *testing.T) { diff --git a/server/mucp/mucp.go b/server/mucp/mucp.go index c4133dc0..25e0c734 100644 --- a/server/mucp/mucp.go +++ b/server/mucp/mucp.go @@ -2,7 +2,7 @@ package mucp import ( - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" ) // NewServer returns a micro server interface diff --git a/server/options.go b/server/options.go index 42eeccc6..d7b03d4b 100644 --- a/server/options.go +++ b/server/options.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/transport" ) type Options struct { diff --git a/server/proto/server.pb.go b/server/proto/server.pb.go index bcd86b46..d9fd74aa 100644 --- a/server/proto/server.pb.go +++ b/server/proto/server.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/server/proto/server.proto +// source: github.com/micro/go-micro/v2/server/proto/server.proto package go_micro_server @@ -184,7 +184,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/micro/go-micro/server/proto/server.proto", fileDescriptor_4cb0c66620400ff8) + proto.RegisterFile("github.com/micro/go-micro/v2/server/proto/server.proto", fileDescriptor_4cb0c66620400ff8) } var fileDescriptor_4cb0c66620400ff8 = []byte{ diff --git a/server/proto/server.pb.micro.go b/server/proto/server.pb.micro.go index 77194020..1c7ebd3d 100644 --- a/server/proto/server.pb.micro.go +++ b/server/proto/server.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/server/proto/server.proto +// source: github.com/micro/go-micro/v2/server/proto/server.proto package go_micro_server @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/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 53d552f4..0d902c3d 100644 --- a/server/rpc_codec.go +++ b/server/rpc_codec.go @@ -4,14 +4,14 @@ import ( "bytes" "sync" - "github.com/micro/go-micro/codec" - raw "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/codec/grpc" - "github.com/micro/go-micro/codec/json" - "github.com/micro/go-micro/codec/jsonrpc" - "github.com/micro/go-micro/codec/proto" - "github.com/micro/go-micro/codec/protorpc" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/codec" + raw "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/codec/grpc" + "github.com/micro/go-micro/v2/codec/json" + "github.com/micro/go-micro/v2/codec/jsonrpc" + "github.com/micro/go-micro/v2/codec/proto" + "github.com/micro/go-micro/v2/codec/protorpc" + "github.com/micro/go-micro/v2/transport" "github.com/oxtoacart/bpool" "github.com/pkg/errors" ) diff --git a/server/rpc_codec_test.go b/server/rpc_codec_test.go index 1088af01..47289c6d 100644 --- a/server/rpc_codec_test.go +++ b/server/rpc_codec_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/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 4bd39d4d..fe2a946a 100644 --- a/server/rpc_event.go +++ b/server/rpc_event.go @@ -1,8 +1,8 @@ package server import ( - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/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 42ec7f0f..7d2923ca 100644 --- a/server/rpc_handler.go +++ b/server/rpc_handler.go @@ -3,7 +3,7 @@ package server import ( "reflect" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type rpcHandler struct { diff --git a/server/rpc_request.go b/server/rpc_request.go index 065d57e4..767f1ac8 100644 --- a/server/rpc_request.go +++ b/server/rpc_request.go @@ -3,9 +3,9 @@ package server import ( "bytes" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/buf" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/buf" ) type rpcRequest struct { diff --git a/server/rpc_response.go b/server/rpc_response.go index d89fa0b6..d42a2ac8 100644 --- a/server/rpc_response.go +++ b/server/rpc_response.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/transport" ) type rpcResponse struct { diff --git a/server/rpc_router.go b/server/rpc_router.go index 70fe1104..8d36f1f0 100644 --- a/server/rpc_router.go +++ b/server/rpc_router.go @@ -18,9 +18,9 @@ import ( "unicode" "unicode/utf8" - "github.com/micro/go-micro/codec" - merrors "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/codec" + merrors "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/server/rpc_server.go b/server/rpc_server.go index a6ccd6a5..7eba3806 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -12,16 +12,16 @@ import ( "sync" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" - raw "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/addr" - log "github.com/micro/go-micro/util/log" - mnet "github.com/micro/go-micro/util/net" - "github.com/micro/go-micro/util/socket" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec" + raw "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/addr" + log "github.com/micro/go-micro/v2/util/log" + mnet "github.com/micro/go-micro/v2/util/net" + "github.com/micro/go-micro/v2/util/socket" ) type rpcServer struct { diff --git a/server/rpc_stream.go b/server/rpc_stream.go index 7421fd45..dbee673e 100644 --- a/server/rpc_stream.go +++ b/server/rpc_stream.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) // Implements the Streamer interface diff --git a/server/rpc_stream_test.go b/server/rpc_stream_test.go index 18a0f0a3..f4b0b7bd 100644 --- a/server/rpc_stream_test.go +++ b/server/rpc_stream_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec/json" - protoCodec "github.com/micro/go-micro/codec/proto" + "github.com/micro/go-micro/v2/codec/json" + protoCodec "github.com/micro/go-micro/v2/codec/proto" ) // protoStruct implements proto.Message diff --git a/server/server.go b/server/server.go index f494ef0b..a45dd8d0 100644 --- a/server/server.go +++ b/server/server.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/registry" - log "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/registry" + log "github.com/micro/go-micro/v2/util/log" ) // Server is a simple micro server abstraction diff --git a/server/subscriber.go b/server/subscriber.go index 62de0ed8..6278175a 100644 --- a/server/subscriber.go +++ b/server/subscriber.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) const ( diff --git a/service.go b/service.go index de5697f7..b1bf7e2c 100644 --- a/service.go +++ b/service.go @@ -8,18 +8,18 @@ import ( "sync" "syscall" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/config/cmd" - "github.com/micro/go-micro/debug/profile" - "github.com/micro/go-micro/debug/profile/http" - "github.com/micro/go-micro/debug/profile/pprof" - "github.com/micro/go-micro/debug/service/handler" - "github.com/micro/go-micro/debug/stats" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/plugin" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/log" - "github.com/micro/go-micro/util/wrapper" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/config/cmd" + "github.com/micro/go-micro/v2/debug/profile" + "github.com/micro/go-micro/v2/debug/profile/http" + "github.com/micro/go-micro/v2/debug/profile/pprof" + "github.com/micro/go-micro/v2/debug/service/handler" + "github.com/micro/go-micro/v2/debug/stats" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/plugin" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/log" + "github.com/micro/go-micro/v2/util/wrapper" ) type service struct { diff --git a/service/grpc/grpc.go b/service/grpc/grpc.go index f6c0effa..e5d46bb5 100644 --- a/service/grpc/grpc.go +++ b/service/grpc/grpc.go @@ -1,11 +1,11 @@ package grpc import ( - "github.com/micro/go-micro/client" - gclient "github.com/micro/go-micro/client/grpc" - "github.com/micro/go-micro/server" - gserver "github.com/micro/go-micro/server/grpc" - "github.com/micro/go-micro/service" + "github.com/micro/go-micro/v2/client" + gclient "github.com/micro/go-micro/v2/client/grpc" + "github.com/micro/go-micro/v2/server" + gserver "github.com/micro/go-micro/v2/server/grpc" + "github.com/micro/go-micro/v2/service" ) type grpcService struct { diff --git a/service/grpc/grpc_test.go b/service/grpc/grpc_test.go index 4ea738dd..1f213008 100644 --- a/service/grpc/grpc_test.go +++ b/service/grpc/grpc_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/service" - hello "github.com/micro/go-micro/service/grpc/proto" - mls "github.com/micro/go-micro/util/tls" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/service" + hello "github.com/micro/go-micro/v2/service/grpc/proto" + mls "github.com/micro/go-micro/v2/util/tls" ) type testHandler struct{} diff --git a/service/grpc/options.go b/service/grpc/options.go index 82dbb19f..302f960b 100644 --- a/service/grpc/options.go +++ b/service/grpc/options.go @@ -3,9 +3,9 @@ package grpc import ( "crypto/tls" - gc "github.com/micro/go-micro/client/grpc" - gs "github.com/micro/go-micro/server/grpc" - "github.com/micro/go-micro/service" + gc "github.com/micro/go-micro/v2/client/grpc" + gs "github.com/micro/go-micro/v2/server/grpc" + "github.com/micro/go-micro/v2/service" ) // WithTLS sets the TLS config for the service diff --git a/service/grpc/proto/test.micro.go b/service/grpc/proto/test.micro.go index b00e7ea3..5cc8a4e0 100644 --- a/service/grpc/proto/test.micro.go +++ b/service/grpc/proto/test.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/service/mucp/mucp.go b/service/mucp/mucp.go index 64f70d51..d8238014 100644 --- a/service/mucp/mucp.go +++ b/service/mucp/mucp.go @@ -2,11 +2,11 @@ package mucp import ( - "github.com/micro/go-micro/client" - cmucp "github.com/micro/go-micro/client/mucp" - "github.com/micro/go-micro/server" - smucp "github.com/micro/go-micro/server/mucp" - "github.com/micro/go-micro/service" + "github.com/micro/go-micro/v2/client" + cmucp "github.com/micro/go-micro/v2/client/mucp" + "github.com/micro/go-micro/v2/server" + smucp "github.com/micro/go-micro/v2/server/mucp" + "github.com/micro/go-micro/v2/service" ) type mucpService struct { diff --git a/service/options.go b/service/options.go index b3268786..52e2a424 100644 --- a/service/options.go +++ b/service/options.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/transport" ) type Options struct { diff --git a/service/service.go b/service/service.go index aca8acd6..31d943b8 100644 --- a/service/service.go +++ b/service/service.go @@ -2,8 +2,8 @@ package service import ( - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/server" ) // Service is an interface for a micro service diff --git a/service_test.go b/service_test.go index c2a7c33b..3c97c6a0 100644 --- a/service_test.go +++ b/service_test.go @@ -6,12 +6,12 @@ import ( "sync" "testing" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/debug/log/noop" - proto "github.com/micro/go-micro/debug/service/proto" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/util/log" - "github.com/micro/go-micro/util/test" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/debug/log/noop" + proto "github.com/micro/go-micro/v2/debug/service/proto" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/util/log" + "github.com/micro/go-micro/v2/util/test" ) func testShutdown(wg *sync.WaitGroup, cancel func()) { diff --git a/store/cloudflare/cloudflare.go b/store/cloudflare/cloudflare.go index ff1a6d8e..7feac885 100644 --- a/store/cloudflare/cloudflare.go +++ b/store/cloudflare/cloudflare.go @@ -17,7 +17,7 @@ import ( "strconv" "time" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" "github.com/pkg/errors" ) diff --git a/store/cloudflare/cloudflare_test.go b/store/cloudflare/cloudflare_test.go index b1586a36..ee5deee1 100644 --- a/store/cloudflare/cloudflare_test.go +++ b/store/cloudflare/cloudflare_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" ) func TestCloudflare(t *testing.T) { diff --git a/store/cloudflare/options.go b/store/cloudflare/options.go index be6bf6f6..8b307024 100644 --- a/store/cloudflare/options.go +++ b/store/cloudflare/options.go @@ -3,7 +3,7 @@ package cloudflare import ( "context" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" ) func getOption(ctx context.Context, key string) string { diff --git a/store/cockroach/cockroach.go b/store/cockroach/cockroach.go index d60a60f5..faaf9e2a 100644 --- a/store/cockroach/cockroach.go +++ b/store/cockroach/cockroach.go @@ -10,8 +10,8 @@ import ( "unicode" "github.com/lib/pq" - "github.com/micro/go-micro/store" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/store" + "github.com/micro/go-micro/v2/util/log" "github.com/pkg/errors" ) diff --git a/store/cockroach/cockroach_test.go b/store/cockroach/cockroach_test.go index cb0b53a8..02354eac 100644 --- a/store/cockroach/cockroach_test.go +++ b/store/cockroach/cockroach_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/kr/pretty" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" ) func TestSQL(t *testing.T) { diff --git a/store/etcd/etcd.go b/store/etcd/etcd.go index c1d8850e..fd896c7a 100644 --- a/store/etcd/etcd.go +++ b/store/etcd/etcd.go @@ -6,7 +6,7 @@ import ( "log" client "github.com/coreos/etcd/clientv3" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" ) type ekv struct { diff --git a/store/memory/memory.go b/store/memory/memory.go index 224c0f97..97e6bd84 100644 --- a/store/memory/memory.go +++ b/store/memory/memory.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" ) type memoryStore struct { diff --git a/store/memory/memory_test.go b/store/memory/memory_test.go index de889856..27837e2f 100644 --- a/store/memory/memory_test.go +++ b/store/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/store" + "github.com/micro/go-micro/v2/store" ) func TestReadRecordExpire(t *testing.T) { diff --git a/store/service/proto/store.pb.micro.go b/store/service/proto/store.pb.micro.go index 422387b9..448ea6bc 100644 --- a/store/service/proto/store.pb.micro.go +++ b/store/service/proto/store.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/store/service/service.go b/store/service/service.go index 6a34bdfe..713cda15 100644 --- a/store/service/service.go +++ b/store/service/service.go @@ -6,10 +6,10 @@ import ( "io" "time" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/store" - pb "github.com/micro/go-micro/store/service/proto" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/store" + pb "github.com/micro/go-micro/v2/store/service/proto" ) type serviceStore struct { diff --git a/sync/cron.go b/sync/cron.go index 0fd479a1..bc3133b6 100644 --- a/sync/cron.go +++ b/sync/cron.go @@ -5,10 +5,10 @@ import ( "math" "time" - "github.com/micro/go-micro/sync/leader/etcd" - "github.com/micro/go-micro/sync/task" - "github.com/micro/go-micro/sync/task/local" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/sync/leader/etcd" + "github.com/micro/go-micro/v2/sync/task" + "github.com/micro/go-micro/v2/sync/task/local" + "github.com/micro/go-micro/v2/util/log" ) type syncCron struct { diff --git a/sync/leader/etcd/etcd.go b/sync/leader/etcd/etcd.go index f8e5baa5..8e23370b 100644 --- a/sync/leader/etcd/etcd.go +++ b/sync/leader/etcd/etcd.go @@ -8,7 +8,7 @@ import ( client "github.com/coreos/etcd/clientv3" cc "github.com/coreos/etcd/clientv3/concurrency" - "github.com/micro/go-micro/sync/leader" + "github.com/micro/go-micro/v2/sync/leader" ) type etcdLeader struct { diff --git a/sync/lock/etcd/etcd.go b/sync/lock/etcd/etcd.go index 9c55ddde..1d2a7e70 100644 --- a/sync/lock/etcd/etcd.go +++ b/sync/lock/etcd/etcd.go @@ -11,7 +11,7 @@ import ( client "github.com/coreos/etcd/clientv3" cc "github.com/coreos/etcd/clientv3/concurrency" - "github.com/micro/go-micro/sync/lock" + "github.com/micro/go-micro/v2/sync/lock" ) type etcdLock struct { diff --git a/sync/lock/http/http.go b/sync/lock/http/http.go index 497774d5..3118c189 100644 --- a/sync/lock/http/http.go +++ b/sync/lock/http/http.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/micro/go-micro/sync/lock" + "github.com/micro/go-micro/v2/sync/lock" ) var ( diff --git a/sync/lock/http/server/server.go b/sync/lock/http/server/server.go index 49298547..df38fd69 100644 --- a/sync/lock/http/server/server.go +++ b/sync/lock/http/server/server.go @@ -4,8 +4,8 @@ package server import ( "net/http" - "github.com/micro/go-micro/sync/lock" - lkhttp "github.com/micro/go-micro/sync/lock/http" + "github.com/micro/go-micro/v2/sync/lock" + lkhttp "github.com/micro/go-micro/v2/sync/lock/http" ) func Handler(lk lock.Lock) http.Handler { diff --git a/sync/lock/memory/memory.go b/sync/lock/memory/memory.go index f8e46c7f..99ad1532 100644 --- a/sync/lock/memory/memory.go +++ b/sync/lock/memory/memory.go @@ -5,7 +5,7 @@ import ( "sync" "time" - lock "github.com/micro/go-micro/sync/lock" + lock "github.com/micro/go-micro/v2/sync/lock" ) type memoryLock struct { diff --git a/sync/map.go b/sync/map.go index 2515d57c..83736cff 100644 --- a/sync/map.go +++ b/sync/map.go @@ -7,9 +7,9 @@ import ( "fmt" "sort" - "github.com/micro/go-micro/store" - ckv "github.com/micro/go-micro/store/etcd" - lock "github.com/micro/go-micro/sync/lock/etcd" + "github.com/micro/go-micro/v2/store" + ckv "github.com/micro/go-micro/v2/store/etcd" + lock "github.com/micro/go-micro/v2/sync/lock/etcd" ) type syncMap struct { diff --git a/sync/options.go b/sync/options.go index 0e5cf3d0..a179479d 100644 --- a/sync/options.go +++ b/sync/options.go @@ -1,10 +1,10 @@ package sync import ( - "github.com/micro/go-micro/store" - "github.com/micro/go-micro/sync/leader" - "github.com/micro/go-micro/sync/lock" - "github.com/micro/go-micro/sync/time" + "github.com/micro/go-micro/v2/store" + "github.com/micro/go-micro/v2/sync/leader" + "github.com/micro/go-micro/v2/sync/lock" + "github.com/micro/go-micro/v2/sync/time" ) // WithLeader sets the leader election implementation opton diff --git a/sync/sync.go b/sync/sync.go index 7b080b1d..69d0c410 100644 --- a/sync/sync.go +++ b/sync/sync.go @@ -2,11 +2,11 @@ package sync import ( - "github.com/micro/go-micro/store" - "github.com/micro/go-micro/sync/leader" - "github.com/micro/go-micro/sync/lock" - "github.com/micro/go-micro/sync/task" - "github.com/micro/go-micro/sync/time" + "github.com/micro/go-micro/v2/store" + "github.com/micro/go-micro/v2/sync/leader" + "github.com/micro/go-micro/v2/sync/lock" + "github.com/micro/go-micro/v2/sync/task" + "github.com/micro/go-micro/v2/sync/time" ) // Map provides synchronized access to key-value storage. diff --git a/sync/task/broker/broker.go b/sync/task/broker/broker.go index 45c20b3e..feedb0ec 100644 --- a/sync/task/broker/broker.go +++ b/sync/task/broker/broker.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/sync/task" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/sync/task" ) type brokerKey struct{} diff --git a/sync/task/local/local.go b/sync/task/local/local.go index 94aa7707..5ce2631d 100644 --- a/sync/task/local/local.go +++ b/sync/task/local/local.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/micro/go-micro/sync/task" + "github.com/micro/go-micro/v2/sync/task" ) type localTask struct { diff --git a/sync/time/local/local.go b/sync/time/local/local.go index a3d899c1..6be36de7 100644 --- a/sync/time/local/local.go +++ b/sync/time/local/local.go @@ -4,7 +4,7 @@ package local import ( gotime "time" - "github.com/micro/go-micro/sync/time" + "github.com/micro/go-micro/v2/sync/time" ) type Time struct{} diff --git a/sync/time/ntp/ntp.go b/sync/time/ntp/ntp.go index 2de6a852..91cf5862 100644 --- a/sync/time/ntp/ntp.go +++ b/sync/time/ntp/ntp.go @@ -6,7 +6,7 @@ import ( gotime "time" "github.com/beevik/ntp" - "github.com/micro/go-micro/sync/time" + "github.com/micro/go-micro/v2/sync/time" ) type ntpTime struct { diff --git a/transport/grpc/grpc.go b/transport/grpc/grpc.go index a60ec70e..58f5cfd7 100644 --- a/transport/grpc/grpc.go +++ b/transport/grpc/grpc.go @@ -6,15 +6,15 @@ import ( "crypto/tls" "net" - "github.com/micro/go-micro/transport" - maddr "github.com/micro/go-micro/util/addr" - mnet "github.com/micro/go-micro/util/net" - mls "github.com/micro/go-micro/util/tls" + "github.com/micro/go-micro/v2/transport" + maddr "github.com/micro/go-micro/v2/util/addr" + mnet "github.com/micro/go-micro/v2/util/net" + mls "github.com/micro/go-micro/v2/util/tls" "google.golang.org/grpc" "google.golang.org/grpc/credentials" - pb "github.com/micro/go-micro/transport/grpc/proto" + pb "github.com/micro/go-micro/v2/transport/grpc/proto" ) type grpcTransport struct { diff --git a/transport/grpc/grpc_test.go b/transport/grpc/grpc_test.go index b1e46ba5..5fbca5b8 100644 --- a/transport/grpc/grpc_test.go +++ b/transport/grpc/grpc_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) func expectedPort(t *testing.T, expected string, lsn transport.Listener) { diff --git a/transport/grpc/handler.go b/transport/grpc/handler.go index ce58a227..ce3690f3 100644 --- a/transport/grpc/handler.go +++ b/transport/grpc/handler.go @@ -3,10 +3,10 @@ package grpc import ( "runtime/debug" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/transport" - pb "github.com/micro/go-micro/transport/grpc/proto" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/transport" + pb "github.com/micro/go-micro/v2/transport/grpc/proto" + "github.com/micro/go-micro/v2/util/log" "google.golang.org/grpc/peer" ) diff --git a/transport/grpc/proto/transport.micro.go b/transport/grpc/proto/transport.micro.go index 81cf981c..6cb11d4e 100644 --- a/transport/grpc/proto/transport.micro.go +++ b/transport/grpc/proto/transport.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/transport/grpc/socket.go b/transport/grpc/socket.go index 2567559d..866ee7ae 100644 --- a/transport/grpc/socket.go +++ b/transport/grpc/socket.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/micro/go-micro/transport" - pb "github.com/micro/go-micro/transport/grpc/proto" + "github.com/micro/go-micro/v2/transport" + pb "github.com/micro/go-micro/v2/transport/grpc/proto" "google.golang.org/grpc" ) diff --git a/transport/http/http.go b/transport/http/http.go index 672db54c..b9fd0b11 100644 --- a/transport/http/http.go +++ b/transport/http/http.go @@ -2,7 +2,7 @@ package http import ( - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) // NewTransport returns a new http transport using net/http and supporting http2 diff --git a/transport/http/http_test.go b/transport/http/http_test.go index faaf5215..fd519063 100644 --- a/transport/http/http_test.go +++ b/transport/http/http_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) func call(b *testing.B, c int) { diff --git a/transport/http/options.go b/transport/http/options.go index 2a6e56c5..c5210f09 100644 --- a/transport/http/options.go +++ b/transport/http/options.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) // Handle registers the handler for the given pattern. diff --git a/transport/http_transport.go b/transport/http_transport.go index 1ce109aa..ced00c13 100644 --- a/transport/http_transport.go +++ b/transport/http_transport.go @@ -13,10 +13,10 @@ import ( "sync" "time" - maddr "github.com/micro/go-micro/util/addr" - "github.com/micro/go-micro/util/buf" - mnet "github.com/micro/go-micro/util/net" - mls "github.com/micro/go-micro/util/tls" + maddr "github.com/micro/go-micro/v2/util/addr" + "github.com/micro/go-micro/v2/util/buf" + mnet "github.com/micro/go-micro/v2/util/net" + mls "github.com/micro/go-micro/v2/util/tls" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/transport/memory/memory.go b/transport/memory/memory.go index ed269367..ae831cc6 100644 --- a/transport/memory/memory.go +++ b/transport/memory/memory.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/micro/go-micro/transport" - maddr "github.com/micro/go-micro/util/addr" - mnet "github.com/micro/go-micro/util/net" + "github.com/micro/go-micro/v2/transport" + maddr "github.com/micro/go-micro/v2/util/addr" + mnet "github.com/micro/go-micro/v2/util/net" ) type memorySocket struct { diff --git a/transport/memory/memory_test.go b/transport/memory/memory_test.go index d779f53e..50e64aaf 100644 --- a/transport/memory/memory_test.go +++ b/transport/memory/memory_test.go @@ -3,7 +3,7 @@ package memory import ( "testing" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) func TestMemoryTransport(t *testing.T) { diff --git a/transport/options.go b/transport/options.go index bea0d227..d30e4c28 100644 --- a/transport/options.go +++ b/transport/options.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "time" - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type Options struct { diff --git a/transport/quic/quic.go b/transport/quic/quic.go index a39e9519..4bb65202 100644 --- a/transport/quic/quic.go +++ b/transport/quic/quic.go @@ -8,8 +8,8 @@ import ( "time" quic "github.com/lucas-clemente/quic-go" - "github.com/micro/go-micro/transport" - utls "github.com/micro/go-micro/util/tls" + "github.com/micro/go-micro/v2/transport" + utls "github.com/micro/go-micro/v2/util/tls" ) type quicSocket struct { diff --git a/tunnel/broker/broker.go b/tunnel/broker/broker.go index d11e160c..1b904e95 100644 --- a/tunnel/broker/broker.go +++ b/tunnel/broker/broker.go @@ -4,9 +4,9 @@ package broker import ( "context" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/tunnel" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/tunnel" ) type tunBroker struct { diff --git a/tunnel/default.go b/tunnel/default.go index d146cb34..0bde3bde 100644 --- a/tunnel/default.go +++ b/tunnel/default.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/tunnel/link.go b/tunnel/link.go index 0f5b3980..b05a25b2 100644 --- a/tunnel/link.go +++ b/tunnel/link.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/log" ) type link struct { diff --git a/tunnel/listener.go b/tunnel/listener.go index 052955cb..ac5ba3dc 100644 --- a/tunnel/listener.go +++ b/tunnel/listener.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/util/log" ) type tunListener struct { diff --git a/tunnel/options.go b/tunnel/options.go index 262df797..166680d9 100644 --- a/tunnel/options.go +++ b/tunnel/options.go @@ -4,8 +4,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/transport/quic" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/transport/quic" ) var ( diff --git a/tunnel/session.go b/tunnel/session.go index ebf01ded..f662b1df 100644 --- a/tunnel/session.go +++ b/tunnel/session.go @@ -5,8 +5,8 @@ import ( "io" "time" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/util/log" ) // session is our pseudo session for transport.Socket diff --git a/tunnel/transport/listener.go b/tunnel/transport/listener.go index 075f12cf..337ab72a 100644 --- a/tunnel/transport/listener.go +++ b/tunnel/transport/listener.go @@ -1,8 +1,8 @@ package transport import ( - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/tunnel" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/tunnel" ) type tunListener struct { diff --git a/tunnel/transport/transport.go b/tunnel/transport/transport.go index d37468d2..0448d969 100644 --- a/tunnel/transport/transport.go +++ b/tunnel/transport/transport.go @@ -4,8 +4,8 @@ package transport import ( "context" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/tunnel" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/tunnel" ) type tunTransport struct { diff --git a/tunnel/tunnel.go b/tunnel/tunnel.go index 516ce6c0..4075029b 100644 --- a/tunnel/tunnel.go +++ b/tunnel/tunnel.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) const ( diff --git a/tunnel/tunnel_test.go b/tunnel/tunnel_test.go index 9633e53d..2e86baf0 100644 --- a/tunnel/tunnel_test.go +++ b/tunnel/tunnel_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) func testBrokenTunAccept(t *testing.T, tun Tunnel, wait chan bool, wg *sync.WaitGroup) { diff --git a/util/ctx/ctx.go b/util/ctx/ctx.go index 2fb69a43..939a6587 100644 --- a/util/ctx/ctx.go +++ b/util/ctx/ctx.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/micro/go-micro/metadata" + "github.com/micro/go-micro/v2/metadata" ) func FromRequest(r *http.Request) context.Context { diff --git a/util/ctx/ctx_test.go b/util/ctx/ctx_test.go index 3df4acc7..03effcf3 100644 --- a/util/ctx/ctx_test.go +++ b/util/ctx/ctx_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/micro/go-micro/metadata" + "github.com/micro/go-micro/v2/metadata" ) func TestRequestToContext(t *testing.T) { diff --git a/util/http/http.go b/util/http/http.go index 47fc33f4..055374ed 100644 --- a/util/http/http.go +++ b/util/http/http.go @@ -3,8 +3,8 @@ package http import ( "net/http" - "github.com/micro/go-micro/client/selector" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/client/selector" + "github.com/micro/go-micro/v2/registry" ) func NewRoundTripper(opts ...Option) http.RoundTripper { diff --git a/util/http/http_test.go b/util/http/http_test.go index 60196038..34585c9f 100644 --- a/util/http/http_test.go +++ b/util/http/http_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/memory" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/memory" ) func TestRoundTripper(t *testing.T) { diff --git a/util/http/options.go b/util/http/options.go index a248e422..319b5157 100644 --- a/util/http/options.go +++ b/util/http/options.go @@ -1,7 +1,7 @@ package http import ( - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type Options struct { diff --git a/util/http/roundtripper.go b/util/http/roundtripper.go index 36c26b5c..349418ee 100644 --- a/util/http/roundtripper.go +++ b/util/http/roundtripper.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/micro/go-micro/client/selector" + "github.com/micro/go-micro/v2/client/selector" ) type roundTripper struct { diff --git a/util/io/io.go b/util/io/io.go index 133ba6b8..257d9b93 100644 --- a/util/io/io.go +++ b/util/io/io.go @@ -4,7 +4,7 @@ package io import ( "io" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) type rwc struct { diff --git a/util/kubernetes/client/client.go b/util/kubernetes/client/client.go index a71d8bab..01bf48cc 100644 --- a/util/kubernetes/client/client.go +++ b/util/kubernetes/client/client.go @@ -12,8 +12,8 @@ import ( "path" "strings" - "github.com/micro/go-micro/util/kubernetes/api" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/util/kubernetes/api" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/util/kubernetes/client/watch.go b/util/kubernetes/client/watch.go index a734db93..c55a406a 100644 --- a/util/kubernetes/client/watch.go +++ b/util/kubernetes/client/watch.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "github.com/micro/go-micro/util/kubernetes/api" + "github.com/micro/go-micro/v2/util/kubernetes/api" ) const ( diff --git a/util/log/log.go b/util/log/log.go index 360f8039..ddd6e929 100644 --- a/util/log/log.go +++ b/util/log/log.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/micro/go-micro/debug/log" + "github.com/micro/go-micro/v2/debug/log" ) // level is a log level diff --git a/util/mux/mux.go b/util/mux/mux.go index 7655f802..0f03298f 100644 --- a/util/mux/mux.go +++ b/util/mux/mux.go @@ -5,9 +5,9 @@ import ( "context" "sync" - "github.com/micro/go-micro/debug/service/handler" - "github.com/micro/go-micro/proxy" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/debug/service/handler" + "github.com/micro/go-micro/v2/proxy" + "github.com/micro/go-micro/v2/server" ) // Server is a proxy muxer that incudes the use of the DefaultHandler diff --git a/util/pool/default.go b/util/pool/default.go index d625289c..7175b2bb 100644 --- a/util/pool/default.go +++ b/util/pool/default.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) type pool struct { diff --git a/util/pool/default_test.go b/util/pool/default_test.go index 4823e228..74c84bb7 100644 --- a/util/pool/default_test.go +++ b/util/pool/default_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/micro/go-micro/transport" - "github.com/micro/go-micro/transport/memory" + "github.com/micro/go-micro/v2/transport" + "github.com/micro/go-micro/v2/transport/memory" ) func testPool(t *testing.T, size int, ttl time.Duration) { diff --git a/util/pool/options.go b/util/pool/options.go index ed3feda7..5b6632ac 100644 --- a/util/pool/options.go +++ b/util/pool/options.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) type Options struct { diff --git a/util/pool/pool.go b/util/pool/pool.go index 79dd1a64..68e43395 100644 --- a/util/pool/pool.go +++ b/util/pool/pool.go @@ -4,7 +4,7 @@ package pool import ( "time" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) // Pool is an interface for connection pooling diff --git a/util/proto/proto.go b/util/proto/proto.go index 1e41c61c..ef49f123 100644 --- a/util/proto/proto.go +++ b/util/proto/proto.go @@ -2,8 +2,8 @@ package proto import ( - "github.com/micro/go-micro/router" - pbRtr "github.com/micro/go-micro/router/service/proto" + "github.com/micro/go-micro/v2/router" + pbRtr "github.com/micro/go-micro/v2/router/service/proto" ) // RouteToProto encodes route into protobuf and returns it diff --git a/util/socket/socket.go b/util/socket/socket.go index e68df694..d1338ab5 100644 --- a/util/socket/socket.go +++ b/util/socket/socket.go @@ -4,7 +4,7 @@ package socket import ( "io" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/transport" ) // Socket is our pseudo socket for transport.Socket diff --git a/util/test/test.go b/util/test/test.go index 100c8e79..f95b1f68 100644 --- a/util/test/test.go +++ b/util/test/test.go @@ -1,7 +1,7 @@ package test import ( - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) var ( diff --git a/util/wrapper/wrapper.go b/util/wrapper/wrapper.go index d6d2814a..c91368b6 100644 --- a/util/wrapper/wrapper.go +++ b/util/wrapper/wrapper.go @@ -3,11 +3,11 @@ package wrapper import ( "context" - "github.com/micro/go-micro/client" - "github.com/micro/go-micro/debug/stats" - "github.com/micro/go-micro/debug/trace" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/client" + "github.com/micro/go-micro/v2/debug/stats" + "github.com/micro/go-micro/v2/debug/trace" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/server" ) type clientWrapper struct { diff --git a/util/wrapper/wrapper_test.go b/util/wrapper/wrapper_test.go index 915eb668..b45fb86b 100644 --- a/util/wrapper/wrapper_test.go +++ b/util/wrapper/wrapper_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/micro/go-micro/metadata" + "github.com/micro/go-micro/v2/metadata" ) func TestWrapper(t *testing.T) { diff --git a/web/options.go b/web/options.go index ec4e1a6b..c675f4ea 100644 --- a/web/options.go +++ b/web/options.go @@ -7,8 +7,8 @@ import ( "time" "github.com/micro/cli/v2" - "github.com/micro/go-micro" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2" + "github.com/micro/go-micro/v2/registry" ) type Options struct { diff --git a/web/service.go b/web/service.go index c717e9e0..aa351236 100644 --- a/web/service.go +++ b/web/service.go @@ -15,13 +15,13 @@ import ( "time" "github.com/micro/cli/v2" - "github.com/micro/go-micro" - "github.com/micro/go-micro/registry" - maddr "github.com/micro/go-micro/util/addr" - mhttp "github.com/micro/go-micro/util/http" - "github.com/micro/go-micro/util/log" - mnet "github.com/micro/go-micro/util/net" - mls "github.com/micro/go-micro/util/tls" + "github.com/micro/go-micro/v2" + "github.com/micro/go-micro/v2/registry" + maddr "github.com/micro/go-micro/v2/util/addr" + mhttp "github.com/micro/go-micro/v2/util/http" + "github.com/micro/go-micro/v2/util/log" + mnet "github.com/micro/go-micro/v2/util/net" + mls "github.com/micro/go-micro/v2/util/tls" ) type service struct { diff --git a/web/service_test.go b/web/service_test.go index 33365535..99b36ae5 100644 --- a/web/service_test.go +++ b/web/service_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/registry/memory" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/registry/memory" ) func TestService(t *testing.T) {