From 610c00859f90c7630113873278be05f41d13e808 Mon Sep 17 00:00:00 2001 From: asim Date: Tue, 4 Jun 2024 21:40:43 +0100 Subject: [PATCH] v5 --- README.md | 6 ++-- api/api.go | 8 +++--- api/client/client.go | 2 +- api/default.go | 10 +++---- api/handler/api/api.go | 14 +++++----- api/handler/api/util.go | 6 ++-- api/handler/event/event.go | 6 ++-- api/handler/http/http.go | 6 ++-- api/handler/http/http_test.go | 12 ++++---- api/handler/options.go | 6 ++-- api/handler/rpc/rpc.go | 28 +++++++++---------- api/handler/rpc/rpc_test.go | 2 +- api/handler/rpc/stream.go | 8 +++--- api/handler/web/web.go | 6 ++-- api/options.go | 9 +++--- api/resolver/grpc/grpc.go | 2 +- api/resolver/host/host.go | 2 +- api/resolver/path/path.go | 2 +- api/resolver/vpath/vpath.go | 2 +- api/router/options.go | 8 +++--- api/router/registry/registry.go | 12 ++++---- api/router/registry/registry_test.go | 2 +- api/router/router.go | 2 +- api/router/static/static.go | 12 ++++---- api/router/util/parse.go | 2 +- api/router/util/parse_test.go | 2 +- api/router/util/runtime.go | 2 +- api/server/acme/autocert/autocert.go | 4 +-- api/server/acme/options.go | 2 +- api/server/http/http.go | 6 ++-- api/server/http/http_test.go | 4 +-- api/server/options.go | 8 +++--- auth/options.go | 2 +- broker/http.go | 16 +++++------ broker/http_test.go | 4 +-- broker/memory.go | 6 ++-- broker/memory_test.go | 2 +- broker/options.go | 6 ++-- cache/options.go | 2 +- client/backoff.go | 2 +- client/cache.go | 4 +-- client/cache_test.go | 4 +-- client/client.go | 2 +- client/common_test.go | 2 +- client/options.go | 12 ++++---- client/options_test.go | 2 +- client/retry.go | 2 +- client/rpc_client.go | 26 +++++++++--------- client/rpc_client_test.go | 6 ++-- client/rpc_codec.go | 22 +++++++-------- client/rpc_request.go | 2 +- client/rpc_response.go | 4 +-- client/rpc_stream.go | 2 +- client/wrapper.go | 2 +- codec/bytes/bytes.go | 2 +- codec/bytes/marshaler.go | 2 +- codec/grpc/grpc.go | 4 +-- codec/json/json.go | 2 +- codec/jsonrpc/client.go | 2 +- codec/jsonrpc/jsonrpc.go | 2 +- codec/jsonrpc/server.go | 2 +- codec/proto/marshaler.go | 2 +- codec/proto/proto.go | 2 +- codec/protorpc/protorpc.go | 2 +- codec/text/text.go | 2 +- config/config.go | 8 +++--- config/default.go | 10 +++---- config/default_test.go | 8 +++--- config/encoder/json/json.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 | 4 +-- config/reader/reader.go | 2 +- config/secrets/box/box.go | 2 +- config/secrets/box/box_test.go | 2 +- config/secrets/secretbox/secretbox.go | 2 +- config/secrets/secretbox/secretbox_test.go | 2 +- config/source/cli/cli.go | 4 +-- config/source/cli/cli_test.go | 8 +++--- 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/file/file.go | 2 +- config/source/file/file_test.go | 4 +-- 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/file/watcher_test.go | 4 +-- 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 | 6 ++-- config/value.go | 2 +- debug/handler/debug.go | 10 +++---- 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/proto/debug.pb.micro.go | 6 ++-- debug/stats/default.go | 2 +- debug/trace/default.go | 2 +- debug/trace/trace.go | 4 +-- event.go | 2 +- events/memory.go | 4 +-- events/options.go | 2 +- events/store.go | 4 +-- go.mod | 2 +- logger/default.go | 2 +- micro.go | 4 +-- options.go | 30 ++++++++++---------- registry/cache/cache.go | 6 ++-- registry/cache/options.go | 2 +- registry/mdns_registry.go | 4 +-- registry/memory.go | 2 +- registry/options.go | 2 +- runtime/default.go | 4 +-- runtime/kubernetes/kubernetes.go | 6 ++-- runtime/kubernetes/logs.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/local.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/options.go | 4 +-- runtime/service.go | 8 +++--- selector/common_test.go | 2 +- selector/default.go | 4 +-- selector/default_test.go | 2 +- selector/filter.go | 2 +- selector/filter_test.go | 2 +- selector/options.go | 4 +-- selector/selector.go | 2 +- selector/strategy.go | 2 +- selector/strategy_test.go | 2 +- server/extractor.go | 2 +- server/extractor_test.go | 2 +- server/mock/mock.go | 2 +- server/mock/mock_handler.go | 4 +-- server/mock/mock_subscriber.go | 4 +-- server/mock/mock_test.go | 2 +- server/options.go | 12 ++++---- server/proto/server.pb.micro.go | 6 ++-- server/rpc_codec.go | 18 ++++++------ server/rpc_codec_test.go | 4 +-- server/rpc_event.go | 6 ++-- server/rpc_events.go | 10 +++---- server/rpc_handler.go | 2 +- server/rpc_helper.go | 4 +-- server/rpc_request.go | 6 ++-- server/rpc_response.go | 4 +-- server/rpc_router.go | 6 ++-- server/rpc_server.go | 22 +++++++-------- server/rpc_stream.go | 2 +- server/rpc_stream_test.go | 4 +-- server/server.go | 8 +++--- server/subscriber.go | 2 +- service.go | 12 ++++---- store/options.go | 4 +-- sync/options.go | 2 +- sync/sync.go | 2 +- test/benchmark.go | 14 +++++----- test/service.go | 8 +++--- transport/http_client.go | 4 +-- transport/http_listener.go | 2 +- transport/http_transport.go | 8 +++--- transport/memory.go | 4 +-- transport/options.go | 4 +-- util/addr/addr_test.go | 22 +++++++-------- util/cmd/cmd.go | 32 +++++++++++----------- util/cmd/options.go | 26 +++++++++--------- util/ctx/ctx.go | 2 +- util/ctx/ctx_test.go | 2 +- util/file/client.go | 6 ++-- util/file/handler.go | 8 +++--- util/file/proto/file.pb.micro.go | 6 ++-- util/http/http.go | 8 +++--- util/http/http_test.go | 2 +- util/http/options.go | 2 +- util/http/roundtripper.go | 2 +- util/io/io.go | 2 +- util/kubernetes/api/request.go | 2 +- util/kubernetes/client/client.go | 4 +-- util/kubernetes/client/watch.go | 2 +- util/mdns/client.go | 2 +- util/mdns/server.go | 2 +- util/pool/default.go | 2 +- util/pool/default_test.go | 2 +- util/pool/options.go | 2 +- util/pool/pool.go | 2 +- util/registry/util.go | 2 +- util/registry/util_test.go | 2 +- util/socket/socket.go | 2 +- util/stream/stream.go | 8 +++--- util/sync/manager.go | 2 +- util/sync/options.go | 2 +- util/sync/sync.go | 2 +- util/test/test.go | 2 +- util/wrapper/wrapper.go | 14 +++++----- util/wrapper/wrapper_test.go | 8 +++--- web/options.go | 6 ++-- web/service.go | 18 ++++++------ web/service_test.go | 2 +- web/web_test.go | 6 ++-- 224 files changed, 549 insertions(+), 550 deletions(-) diff --git a/README.md b/README.md index 0e2dc525..cf11f579 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Go Micro [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go-micro.dev/v4?tab=doc) [![Go Report Card](https://goreportcard.com/badge/github.com/go-micro/go-micro)](https://goreportcard.com/report/github.com/go-micro/go-micro) +# Go Micro [![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go-micro.dev/v5?tab=doc) [![Go Report Card](https://goreportcard.com/badge/github.com/go-micro/go-micro)](https://goreportcard.com/report/github.com/go-micro/go-micro) Go Micro is a framework for distributed systems development. @@ -54,7 +54,7 @@ Go Micro abstracts away the details of distributed systems. Here are the main fe To make use of Go Micro import it ```golang -import "go-micro.dev/v4" +import "go-micro.dev/v5" ``` Define a handler (protobuf is optionally supported - see [example](https://github.com/go-micro/examples/blob/main/helloworld/main.go)) @@ -127,4 +127,4 @@ See [github.com/go-micro](https://github.com/go-micro) for tooling. ## License -Go Micro is Apache 2.0 licensed. +[Business Source License 1.1](LICENSE) diff --git a/api/api.go b/api/api.go index f2853921..433c893d 100644 --- a/api/api.go +++ b/api/api.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/client" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/server" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/client" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/server" ) // API interface provides a way to diff --git a/api/client/client.go b/api/client/client.go index 4681a65a..ee64e0ed 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -12,7 +12,7 @@ import ( "time" "github.com/gorilla/websocket" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) const ( diff --git a/api/default.go b/api/default.go index e202eb5c..b56fef67 100644 --- a/api/default.go +++ b/api/default.go @@ -3,11 +3,11 @@ package api import ( "context" - "go-micro.dev/v4/api/handler" - "go-micro.dev/v4/api/handler/rpc" - "go-micro.dev/v4/api/router/registry" - "go-micro.dev/v4/api/server" - "go-micro.dev/v4/api/server/http" + "go-micro.dev/v5/api/handler" + "go-micro.dev/v5/api/handler/rpc" + "go-micro.dev/v5/api/router/registry" + "go-micro.dev/v5/api/server" + "go-micro.dev/v5/api/server/http" ) type api struct { diff --git a/api/handler/api/api.go b/api/handler/api/api.go index aa688423..7b8647eb 100644 --- a/api/handler/api/api.go +++ b/api/handler/api/api.go @@ -4,13 +4,13 @@ package api import ( "net/http" - "go-micro.dev/v4/api/handler" - api "go-micro.dev/v4/api/proto" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/client" - "go-micro.dev/v4/errors" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/util/ctx" + "go-micro.dev/v5/api/handler" + api "go-micro.dev/v5/api/proto" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/client" + "go-micro.dev/v5/errors" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/util/ctx" ) type apiHandler struct { diff --git a/api/handler/api/util.go b/api/handler/api/util.go index 5f16fa24..ae54ad35 100644 --- a/api/handler/api/util.go +++ b/api/handler/api/util.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/oxtoacart/bpool" - api "go-micro.dev/v4/api/proto" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" + api "go-micro.dev/v5/api/proto" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/selector" ) var ( diff --git a/api/handler/event/event.go b/api/handler/event/event.go index 9ce36bec..c47db572 100644 --- a/api/handler/event/event.go +++ b/api/handler/event/event.go @@ -12,9 +12,9 @@ import ( "github.com/google/uuid" "github.com/oxtoacart/bpool" - "go-micro.dev/v4/api/handler" - proto "go-micro.dev/v4/api/proto" - "go-micro.dev/v4/util/ctx" + "go-micro.dev/v5/api/handler" + proto "go-micro.dev/v5/api/proto" + "go-micro.dev/v5/util/ctx" ) var ( diff --git a/api/handler/http/http.go b/api/handler/http/http.go index befa7d58..cff21025 100644 --- a/api/handler/http/http.go +++ b/api/handler/http/http.go @@ -8,9 +8,9 @@ import ( "net/http/httputil" "net/url" - "go-micro.dev/v4/api/handler" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/selector" + "go-micro.dev/v5/api/handler" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/selector" ) const ( diff --git a/api/handler/http/http_test.go b/api/handler/http/http_test.go index d7424e7c..9b6ca094 100644 --- a/api/handler/http/http_test.go +++ b/api/handler/http/http_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "testing" - "go-micro.dev/v4/api/handler" - "go-micro.dev/v4/api/resolver" - "go-micro.dev/v4/api/resolver/vpath" - "go-micro.dev/v4/api/router" - regRouter "go-micro.dev/v4/api/router/registry" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/api/handler" + "go-micro.dev/v5/api/resolver" + "go-micro.dev/v5/api/resolver/vpath" + "go-micro.dev/v5/api/router" + regRouter "go-micro.dev/v5/api/router/registry" + "go-micro.dev/v5/registry" ) func testHttp(t *testing.T, path, service, ns string) { diff --git a/api/handler/options.go b/api/handler/options.go index 5ea9779d..52671130 100644 --- a/api/handler/options.go +++ b/api/handler/options.go @@ -1,9 +1,9 @@ package handler import ( - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/client" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/client" + "go-micro.dev/v5/logger" ) var ( diff --git a/api/handler/rpc/rpc.go b/api/handler/rpc/rpc.go index 9785361c..d7910691 100644 --- a/api/handler/rpc/rpc.go +++ b/api/handler/rpc/rpc.go @@ -11,20 +11,20 @@ import ( jsonpatch "github.com/evanphx/json-patch/v5" "github.com/oxtoacart/bpool" - "go-micro.dev/v4/api/handler" - "go-micro.dev/v4/api/internal/proto" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/client" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/codec/jsonrpc" - "go-micro.dev/v4/codec/protorpc" - "go-micro.dev/v4/errors" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/util/ctx" - "go-micro.dev/v4/util/qson" + "go-micro.dev/v5/api/handler" + "go-micro.dev/v5/api/internal/proto" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/client" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/codec/jsonrpc" + "go-micro.dev/v5/codec/protorpc" + "go-micro.dev/v5/errors" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/util/ctx" + "go-micro.dev/v5/util/qson" ) const ( diff --git a/api/handler/rpc/rpc_test.go b/api/handler/rpc/rpc_test.go index 719d7305..f6f489a7 100644 --- a/api/handler/rpc/rpc_test.go +++ b/api/handler/rpc/rpc_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/golang/protobuf/proto" - go_api "go-micro.dev/v4/api/proto" + go_api "go-micro.dev/v5/api/proto" ) func TestRequestPayloadFromRequest(t *testing.T) { diff --git a/api/handler/rpc/stream.go b/api/handler/rpc/stream.go index 66f72c84..74e23916 100644 --- a/api/handler/rpc/stream.go +++ b/api/handler/rpc/stream.go @@ -12,10 +12,10 @@ import ( "github.com/gobwas/httphead" "github.com/gobwas/ws" "github.com/gobwas/ws/wsutil" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/client" - raw "go-micro.dev/v4/codec/bytes" - "go-micro.dev/v4/selector" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/client" + raw "go-micro.dev/v5/codec/bytes" + "go-micro.dev/v5/selector" ) // serveWebsocket will stream rpc back over websockets assuming json. diff --git a/api/handler/web/web.go b/api/handler/web/web.go index 0286546f..bd1e364d 100644 --- a/api/handler/web/web.go +++ b/api/handler/web/web.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "go-micro.dev/v4/api/handler" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/selector" + "go-micro.dev/v5/api/handler" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/selector" ) const ( diff --git a/api/options.go b/api/options.go index 3a1eeeb1..952d7c70 100644 --- a/api/options.go +++ b/api/options.go @@ -1,10 +1,10 @@ package api import ( - "go-micro.dev/v4/api/router" - registry2 "go-micro.dev/v4/api/router/registry" - "go-micro.dev/v4/client" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/api/router" + registry2 "go-micro.dev/v5/api/router/registry" + "go-micro.dev/v5/client" + "go-micro.dev/v5/registry" ) func NewOptions(opts ...Option) Options { @@ -43,4 +43,3 @@ func WithRegistry(r registry.Registry) Option { return nil } } - diff --git a/api/resolver/grpc/grpc.go b/api/resolver/grpc/grpc.go index 00ffdac5..28ab4184 100644 --- a/api/resolver/grpc/grpc.go +++ b/api/resolver/grpc/grpc.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "go-micro.dev/v4/api/resolver" + "go-micro.dev/v5/api/resolver" ) // Resolver is the gRPC Resolver. diff --git a/api/resolver/host/host.go b/api/resolver/host/host.go index 8f0daa2b..ba12f616 100644 --- a/api/resolver/host/host.go +++ b/api/resolver/host/host.go @@ -4,7 +4,7 @@ package host import ( "net/http" - "go-micro.dev/v4/api/resolver" + "go-micro.dev/v5/api/resolver" ) // Resolver is a host resolver. diff --git a/api/resolver/path/path.go b/api/resolver/path/path.go index 87c99416..628320a4 100644 --- a/api/resolver/path/path.go +++ b/api/resolver/path/path.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "go-micro.dev/v4/api/resolver" + "go-micro.dev/v5/api/resolver" ) // Resolver is a path resolver. diff --git a/api/resolver/vpath/vpath.go b/api/resolver/vpath/vpath.go index 80d9b9f3..bf249ec4 100644 --- a/api/resolver/vpath/vpath.go +++ b/api/resolver/vpath/vpath.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "go-micro.dev/v4/api/resolver" + "go-micro.dev/v5/api/resolver" ) // NewResolver returns a new vpath resolver. diff --git a/api/router/options.go b/api/router/options.go index 904e6c8a..91a2f85b 100644 --- a/api/router/options.go +++ b/api/router/options.go @@ -1,10 +1,10 @@ package router import ( - "go-micro.dev/v4/api/resolver" - "go-micro.dev/v4/api/resolver/vpath" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/api/resolver" + "go-micro.dev/v5/api/resolver/vpath" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" ) // Options is a struct of options available. diff --git a/api/router/registry/registry.go b/api/router/registry/registry.go index 9abc142a..f68784de 100644 --- a/api/router/registry/registry.go +++ b/api/router/registry/registry.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/api/router/util" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/registry/cache" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/api/router/util" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/registry/cache" ) // endpoint struct, that holds compiled pcre. diff --git a/api/router/registry/registry_test.go b/api/router/registry/registry_test.go index 2df6b57c..5ff16216 100644 --- a/api/router/registry/registry_test.go +++ b/api/router/registry/registry_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestStoreRegex(t *testing.T) { diff --git a/api/router/router.go b/api/router/router.go index ed840b8c..d60715f9 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -4,7 +4,7 @@ package router import ( "net/http" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) // Router is used to determine an endpoint for a request. diff --git a/api/router/static/static.go b/api/router/static/static.go index 5a2f8158..113a7689 100644 --- a/api/router/static/static.go +++ b/api/router/static/static.go @@ -8,12 +8,12 @@ import ( "strings" "sync" - "go-micro.dev/v4/api/router" - "go-micro.dev/v4/api/router/util" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/registry" - rutil "go-micro.dev/v4/util/registry" + "go-micro.dev/v5/api/router" + "go-micro.dev/v5/api/router/util" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/registry" + rutil "go-micro.dev/v5/util/registry" ) type endpoint struct { diff --git a/api/router/util/parse.go b/api/router/util/parse.go index 4b6f5449..e836614f 100644 --- a/api/router/util/parse.go +++ b/api/router/util/parse.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - log "go-micro.dev/v4/logger" + log "go-micro.dev/v5/logger" ) // InvalidTemplateError indicates that the path template is not valid. diff --git a/api/router/util/parse_test.go b/api/router/util/parse_test.go index 884651a3..a96799bb 100644 --- a/api/router/util/parse_test.go +++ b/api/router/util/parse_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) func TestTokenize(t *testing.T) { diff --git a/api/router/util/runtime.go b/api/router/util/runtime.go index aaae845f..22522298 100644 --- a/api/router/util/runtime.go +++ b/api/router/util/runtime.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - log "go-micro.dev/v4/logger" + log "go-micro.dev/v5/logger" ) var ( diff --git a/api/server/acme/autocert/autocert.go b/api/server/acme/autocert/autocert.go index 9f643801..5811254d 100644 --- a/api/server/acme/autocert/autocert.go +++ b/api/server/acme/autocert/autocert.go @@ -7,8 +7,8 @@ import ( "net" "os" - "go-micro.dev/v4/api/server/acme" - log "go-micro.dev/v4/logger" + "go-micro.dev/v5/api/server/acme" + log "go-micro.dev/v5/logger" "golang.org/x/crypto/acme/autocert" ) diff --git a/api/server/acme/options.go b/api/server/acme/options.go index 88bf21d1..34ff674f 100644 --- a/api/server/acme/options.go +++ b/api/server/acme/options.go @@ -2,7 +2,7 @@ package acme import ( "github.com/go-acme/lego/v4/challenge" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) // Option (or Options) are passed to New() to configure providers. diff --git a/api/server/http/http.go b/api/server/http/http.go index b7d3ab88..4c47fa7d 100644 --- a/api/server/http/http.go +++ b/api/server/http/http.go @@ -9,9 +9,9 @@ import ( "sync" "github.com/gorilla/handlers" - "go-micro.dev/v4/api/server" - "go-micro.dev/v4/api/server/cors" - log "go-micro.dev/v4/logger" + "go-micro.dev/v5/api/server" + "go-micro.dev/v5/api/server/cors" + log "go-micro.dev/v5/logger" ) type httpServer struct { diff --git a/api/server/http/http_test.go b/api/server/http/http_test.go index b1ddab83..2e0a5942 100644 --- a/api/server/http/http_test.go +++ b/api/server/http/http_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "go-micro.dev/v4/api/server" - "go-micro.dev/v4/api/server/cors" + "go-micro.dev/v5/api/server" + "go-micro.dev/v5/api/server/cors" ) func TestHTTPServer(t *testing.T) { diff --git a/api/server/options.go b/api/server/options.go index 1f3c4ede..39576416 100644 --- a/api/server/options.go +++ b/api/server/options.go @@ -4,10 +4,10 @@ import ( "crypto/tls" "net/http" - "go-micro.dev/v4/api/resolver" - "go-micro.dev/v4/api/server/acme" - "go-micro.dev/v4/api/server/cors" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/api/resolver" + "go-micro.dev/v5/api/server/acme" + "go-micro.dev/v5/api/server/cors" + "go-micro.dev/v5/logger" ) type Option func(o *Options) diff --git a/auth/options.go b/auth/options.go index 04a35654..a28bd5ad 100644 --- a/auth/options.go +++ b/auth/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) func NewOptions(opts ...Option) Options { diff --git a/broker/http.go b/broker/http.go index ef43f22d..def6993e 100644 --- a/broker/http.go +++ b/broker/http.go @@ -16,14 +16,14 @@ import ( "time" "github.com/google/uuid" - "go-micro.dev/v4/codec/json" - merr "go-micro.dev/v4/errors" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/registry/cache" - "go-micro.dev/v4/transport/headers" - maddr "go-micro.dev/v4/util/addr" - mnet "go-micro.dev/v4/util/net" - mls "go-micro.dev/v4/util/tls" + "go-micro.dev/v5/codec/json" + merr "go-micro.dev/v5/errors" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/registry/cache" + "go-micro.dev/v5/transport/headers" + maddr "go-micro.dev/v5/util/addr" + mnet "go-micro.dev/v5/util/net" + mls "go-micro.dev/v5/util/tls" "golang.org/x/net/http2" ) diff --git a/broker/http_test.go b/broker/http_test.go index 5bf81992..71c984e7 100644 --- a/broker/http_test.go +++ b/broker/http_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/google/uuid" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/registry" ) var ( diff --git a/broker/memory.go b/broker/memory.go index 270d2c60..d863cd67 100644 --- a/broker/memory.go +++ b/broker/memory.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/uuid" - log "go-micro.dev/v4/logger" - maddr "go-micro.dev/v4/util/addr" - mnet "go-micro.dev/v4/util/net" + log "go-micro.dev/v5/logger" + maddr "go-micro.dev/v5/util/addr" + mnet "go-micro.dev/v5/util/net" ) type memoryBroker struct { diff --git a/broker/memory_test.go b/broker/memory_test.go index dc0ea3d5..03436c8e 100644 --- a/broker/memory_test.go +++ b/broker/memory_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "go-micro.dev/v4/broker" + "go-micro.dev/v5/broker" ) func TestMemoryBroker(t *testing.T) { diff --git a/broker/options.go b/broker/options.go index 72a6c8db..aa39d50d 100644 --- a/broker/options.go +++ b/broker/options.go @@ -4,9 +4,9 @@ import ( "context" "crypto/tls" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" ) type Options struct { diff --git a/cache/options.go b/cache/options.go index 2e85f625..94c68701 100644 --- a/cache/options.go +++ b/cache/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) // Options represents the options for the cache. diff --git a/client/backoff.go b/client/backoff.go index 21dea703..5921b4c8 100644 --- a/client/backoff.go +++ b/client/backoff.go @@ -4,7 +4,7 @@ import ( "context" "time" - "go-micro.dev/v4/util/backoff" + "go-micro.dev/v5/util/backoff" ) type BackoffFunc func(ctx context.Context, req Request, attempts int) (time.Duration, error) diff --git a/client/cache.go b/client/cache.go index 03aee347..4ea64433 100644 --- a/client/cache.go +++ b/client/cache.go @@ -9,8 +9,8 @@ import ( cache "github.com/patrickmn/go-cache" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/transport/headers" ) // NewCache returns an initialized cache. diff --git a/client/cache_test.go b/client/cache_test.go index 6b49b172..075ea57e 100644 --- a/client/cache_test.go +++ b/client/cache_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/transport/headers" ) func TestCache(t *testing.T) { diff --git a/client/client.go b/client/client.go index 484e13df..c5088ee0 100644 --- a/client/client.go +++ b/client/client.go @@ -4,7 +4,7 @@ package client import ( "context" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) var ( diff --git a/client/common_test.go b/client/common_test.go index f03b137e..fab8b4ff 100644 --- a/client/common_test.go +++ b/client/common_test.go @@ -1,7 +1,7 @@ package client import ( - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) var ( diff --git a/client/options.go b/client/options.go index d662a819..fcc395ad 100644 --- a/client/options.go +++ b/client/options.go @@ -4,12 +4,12 @@ import ( "context" "time" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/transport" ) var ( diff --git a/client/options_test.go b/client/options_test.go index a872792b..3912838a 100644 --- a/client/options_test.go +++ b/client/options_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) func TestCallOptions(t *testing.T) { diff --git a/client/retry.go b/client/retry.go index 6a15a0f7..06560e91 100644 --- a/client/retry.go +++ b/client/retry.go @@ -3,7 +3,7 @@ package client import ( "context" - "go-micro.dev/v4/errors" + "go-micro.dev/v5/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 d011d441..f7a680e9 100644 --- a/client/rpc_client.go +++ b/client/rpc_client.go @@ -10,19 +10,19 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/codec" - raw "go-micro.dev/v4/codec/bytes" - merrors "go-micro.dev/v4/errors" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/transport/headers" - "go-micro.dev/v4/util/buf" - "go-micro.dev/v4/util/net" - "go-micro.dev/v4/util/pool" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/codec" + raw "go-micro.dev/v5/codec/bytes" + merrors "go-micro.dev/v5/errors" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/transport/headers" + "go-micro.dev/v5/util/buf" + "go-micro.dev/v5/util/net" + "go-micro.dev/v5/util/pool" ) const ( diff --git a/client/rpc_client_test.go b/client/rpc_client_test.go index 8253be77..29eabd94 100644 --- a/client/rpc_client_test.go +++ b/client/rpc_client_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "go-micro.dev/v4/errors" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" + "go-micro.dev/v5/errors" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/selector" ) const ( diff --git a/client/rpc_codec.go b/client/rpc_codec.go index a581be24..18ea8026 100644 --- a/client/rpc_codec.go +++ b/client/rpc_codec.go @@ -4,17 +4,17 @@ import ( "bytes" errs "errors" - "go-micro.dev/v4/codec" - raw "go-micro.dev/v4/codec/bytes" - "go-micro.dev/v4/codec/grpc" - "go-micro.dev/v4/codec/json" - "go-micro.dev/v4/codec/jsonrpc" - "go-micro.dev/v4/codec/proto" - "go-micro.dev/v4/codec/protorpc" - "go-micro.dev/v4/errors" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/codec" + raw "go-micro.dev/v5/codec/bytes" + "go-micro.dev/v5/codec/grpc" + "go-micro.dev/v5/codec/json" + "go-micro.dev/v5/codec/jsonrpc" + "go-micro.dev/v5/codec/proto" + "go-micro.dev/v5/codec/protorpc" + "go-micro.dev/v5/errors" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/transport/headers" ) const ( diff --git a/client/rpc_request.go b/client/rpc_request.go index 499ae5cc..a04bb839 100644 --- a/client/rpc_request.go +++ b/client/rpc_request.go @@ -1,7 +1,7 @@ package client import ( - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type rpcRequest struct { diff --git a/client/rpc_response.go b/client/rpc_response.go index cae0f262..abcd8e36 100644 --- a/client/rpc_response.go +++ b/client/rpc_response.go @@ -1,8 +1,8 @@ package client import ( - "go-micro.dev/v4/codec" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/transport" ) type rpcResponse struct { diff --git a/client/rpc_stream.go b/client/rpc_stream.go index b87b2b69..8951e37d 100644 --- a/client/rpc_stream.go +++ b/client/rpc_stream.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) // Implements the streamer interface. diff --git a/client/wrapper.go b/client/wrapper.go index f332e800..d7f0a435 100644 --- a/client/wrapper.go +++ b/client/wrapper.go @@ -3,7 +3,7 @@ package client import ( "context" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) // CallFunc represents the individual call func. diff --git a/codec/bytes/bytes.go b/codec/bytes/bytes.go index 580fb515..f30638b8 100644 --- a/codec/bytes/bytes.go +++ b/codec/bytes/bytes.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type Codec struct { diff --git a/codec/bytes/marshaler.go b/codec/bytes/marshaler.go index fcaa5234..6f3ea2b4 100644 --- a/codec/bytes/marshaler.go +++ b/codec/bytes/marshaler.go @@ -1,7 +1,7 @@ package bytes import ( - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type Marshaler struct{} diff --git a/codec/grpc/grpc.go b/codec/grpc/grpc.go index 40d6be17..4c698b9d 100644 --- a/codec/grpc/grpc.go +++ b/codec/grpc/grpc.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/golang/protobuf/proto" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/transport/headers" ) type Codec struct { diff --git a/codec/json/json.go b/codec/json/json.go index 8ed8c3e4..4b4835da 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" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type Codec struct { diff --git a/codec/jsonrpc/client.go b/codec/jsonrpc/client.go index 935720a3..06782eee 100644 --- a/codec/jsonrpc/client.go +++ b/codec/jsonrpc/client.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type clientCodec struct { diff --git a/codec/jsonrpc/jsonrpc.go b/codec/jsonrpc/jsonrpc.go index cd1bef49..19d13445 100644 --- a/codec/jsonrpc/jsonrpc.go +++ b/codec/jsonrpc/jsonrpc.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type jsonCodec struct { diff --git a/codec/jsonrpc/server.go b/codec/jsonrpc/server.go index e43df15a..68ece687 100644 --- a/codec/jsonrpc/server.go +++ b/codec/jsonrpc/server.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type serverCodec struct { diff --git a/codec/proto/marshaler.go b/codec/proto/marshaler.go index 889e6cbd..0b57f336 100644 --- a/codec/proto/marshaler.go +++ b/codec/proto/marshaler.go @@ -5,7 +5,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/oxtoacart/bpool" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) // create buffer pool with 16 instances each preallocated with 256 bytes. diff --git a/codec/proto/proto.go b/codec/proto/proto.go index e3d3b361..eaef0c36 100644 --- a/codec/proto/proto.go +++ b/codec/proto/proto.go @@ -5,7 +5,7 @@ import ( "io" "github.com/golang/protobuf/proto" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type Codec struct { diff --git a/codec/protorpc/protorpc.go b/codec/protorpc/protorpc.go index f5b66be2..26f1c845 100644 --- a/codec/protorpc/protorpc.go +++ b/codec/protorpc/protorpc.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/golang/protobuf/proto" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type flusher interface { diff --git a/codec/text/text.go b/codec/text/text.go index dda81dcb..93265c53 100644 --- a/codec/text/text.go +++ b/codec/text/text.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) type Codec struct { diff --git a/config/config.go b/config/config.go index 3b2347a0..64d129f1 100644 --- a/config/config.go +++ b/config/config.go @@ -4,10 +4,10 @@ package config import ( "context" - "go-micro.dev/v4/config/loader" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/source" - "go-micro.dev/v4/config/source/file" + "go-micro.dev/v5/config/loader" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/source" + "go-micro.dev/v5/config/source/file" ) // Config is an interface abstraction for dynamic configuration. diff --git a/config/default.go b/config/default.go index 51dc64cb..dfff1268 100644 --- a/config/default.go +++ b/config/default.go @@ -3,11 +3,11 @@ package config import ( "bytes" "fmt" - "go-micro.dev/v4/config/loader" - "go-micro.dev/v4/config/loader/memory" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/reader/json" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/loader" + "go-micro.dev/v5/config/loader/memory" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/reader/json" + "go-micro.dev/v5/config/source" "sync" "time" ) diff --git a/config/default_test.go b/config/default_test.go index 539af557..8d3d72ee 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "go-micro.dev/v4/config/source" - "go-micro.dev/v4/config/source/env" - "go-micro.dev/v4/config/source/file" - "go-micro.dev/v4/config/source/memory" + "go-micro.dev/v5/config/source" + "go-micro.dev/v5/config/source/env" + "go-micro.dev/v5/config/source/file" + "go-micro.dev/v5/config/source/memory" ) func createFileForIssue18(t *testing.T, content string) *os.File { diff --git a/config/encoder/json/json.go b/config/encoder/json/json.go index 8c90b166..10ac6a4b 100644 --- a/config/encoder/json/json.go +++ b/config/encoder/json/json.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "go-micro.dev/v4/config/encoder" + "go-micro.dev/v5/config/encoder" ) type jsonEncoder struct{} diff --git a/config/loader/loader.go b/config/loader/loader.go index a36fd5d5..13479917 100644 --- a/config/loader/loader.go +++ b/config/loader/loader.go @@ -4,8 +4,8 @@ package loader import ( "context" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/source" ) // Loader manages loading sources. diff --git a/config/loader/memory/memory.go b/config/loader/memory/memory.go index 23603665..43fc67c9 100644 --- a/config/loader/memory/memory.go +++ b/config/loader/memory/memory.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "go-micro.dev/v4/config/loader" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/reader/json" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/loader" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/reader/json" + "go-micro.dev/v5/config/source" ) type memory struct { diff --git a/config/loader/memory/options.go b/config/loader/memory/options.go index 65c3feb8..d85d78e5 100644 --- a/config/loader/memory/options.go +++ b/config/loader/memory/options.go @@ -1,9 +1,9 @@ package memory import ( - "go-micro.dev/v4/config/loader" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/loader" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/source" ) // WithSource appends a source to list of sources. diff --git a/config/options.go b/config/options.go index d4994f5c..fdb82e78 100644 --- a/config/options.go +++ b/config/options.go @@ -1,9 +1,9 @@ package config import ( - "go-micro.dev/v4/config/loader" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/loader" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/source" ) // WithLoader sets the loader for manager config. diff --git a/config/reader/json/json.go b/config/reader/json/json.go index 259b14ac..82406559 100644 --- a/config/reader/json/json.go +++ b/config/reader/json/json.go @@ -5,10 +5,10 @@ import ( "time" "github.com/imdario/mergo" - "go-micro.dev/v4/config/encoder" - "go-micro.dev/v4/config/encoder/json" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/encoder" + "go-micro.dev/v5/config/encoder/json" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/source" ) type jsonReader struct { diff --git a/config/reader/json/json_test.go b/config/reader/json/json_test.go index 21171aa7..0c184aa0 100644 --- a/config/reader/json/json_test.go +++ b/config/reader/json/json_test.go @@ -3,7 +3,7 @@ package json import ( "testing" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) func TestReader(t *testing.T) { diff --git a/config/reader/json/values.go b/config/reader/json/values.go index a96194ed..c7d069e9 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" - "go-micro.dev/v4/config/reader" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/reader" + "go-micro.dev/v5/config/source" ) type jsonValues struct { diff --git a/config/reader/json/values_test.go b/config/reader/json/values_test.go index c684f193..258cc789 100644 --- a/config/reader/json/values_test.go +++ b/config/reader/json/values_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) func TestValues(t *testing.T) { diff --git a/config/reader/options.go b/config/reader/options.go index 0c59fcc5..0129dd6f 100644 --- a/config/reader/options.go +++ b/config/reader/options.go @@ -1,8 +1,8 @@ package reader import ( - "go-micro.dev/v4/config/encoder" - "go-micro.dev/v4/config/encoder/json" + "go-micro.dev/v5/config/encoder" + "go-micro.dev/v5/config/encoder/json" ) type Options struct { diff --git a/config/reader/reader.go b/config/reader/reader.go index 9a50462d..6d86c378 100644 --- a/config/reader/reader.go +++ b/config/reader/reader.go @@ -4,7 +4,7 @@ package reader import ( "time" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) // Reader is an interface for merging changesets. diff --git a/config/secrets/box/box.go b/config/secrets/box/box.go index 86256fd8..1d63db66 100644 --- a/config/secrets/box/box.go +++ b/config/secrets/box/box.go @@ -5,7 +5,7 @@ import ( "crypto/rand" "github.com/pkg/errors" - "go-micro.dev/v4/config/secrets" + "go-micro.dev/v5/config/secrets" naclbox "golang.org/x/crypto/nacl/box" ) diff --git a/config/secrets/box/box_test.go b/config/secrets/box/box_test.go index 0c15d4ec..23da17e0 100644 --- a/config/secrets/box/box_test.go +++ b/config/secrets/box/box_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "go-micro.dev/v4/config/secrets" + "go-micro.dev/v5/config/secrets" naclbox "golang.org/x/crypto/nacl/box" ) diff --git a/config/secrets/secretbox/secretbox.go b/config/secrets/secretbox/secretbox.go index 84e2f8fc..7f3f4acf 100644 --- a/config/secrets/secretbox/secretbox.go +++ b/config/secrets/secretbox/secretbox.go @@ -6,7 +6,7 @@ import ( "crypto/rand" "github.com/pkg/errors" - "go-micro.dev/v4/config/secrets" + "go-micro.dev/v5/config/secrets" "golang.org/x/crypto/nacl/secretbox" ) diff --git a/config/secrets/secretbox/secretbox_test.go b/config/secrets/secretbox/secretbox_test.go index 5c1a15ab..7d820653 100644 --- a/config/secrets/secretbox/secretbox_test.go +++ b/config/secrets/secretbox/secretbox_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "go-micro.dev/v4/config/secrets" + "go-micro.dev/v5/config/secrets" ) func TestSecretBox(t *testing.T) { diff --git a/config/source/cli/cli.go b/config/source/cli/cli.go index 3a70f8d6..0357d99a 100644 --- a/config/source/cli/cli.go +++ b/config/source/cli/cli.go @@ -9,8 +9,8 @@ import ( "github.com/imdario/mergo" "github.com/urfave/cli/v2" - "go-micro.dev/v4/config/source" - "go-micro.dev/v4/util/cmd" + "go-micro.dev/v5/config/source" + "go-micro.dev/v5/util/cmd" ) type cliSource struct { diff --git a/config/source/cli/cli_test.go b/config/source/cli/cli_test.go index 26392e59..a813f2c3 100644 --- a/config/source/cli/cli_test.go +++ b/config/source/cli/cli_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/urfave/cli/v2" - "go-micro.dev/v4" - "go-micro.dev/v4/config" - "go-micro.dev/v4/config/source" - "go-micro.dev/v4/util/cmd" + "go-micro.dev/v5" + "go-micro.dev/v5/config" + "go-micro.dev/v5/config/source" + "go-micro.dev/v5/util/cmd" ) func TestCliSourceDefault(t *testing.T) { diff --git a/config/source/cli/options.go b/config/source/cli/options.go index 8ceaa90b..8bd7dac3 100644 --- a/config/source/cli/options.go +++ b/config/source/cli/options.go @@ -4,7 +4,7 @@ import ( "context" "github.com/urfave/cli/v2" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type contextKey struct{} diff --git a/config/source/env/env.go b/config/source/env/env.go index e30b08db..d7c11fd0 100644 --- a/config/source/env/env.go +++ b/config/source/env/env.go @@ -7,7 +7,7 @@ import ( "time" "github.com/imdario/mergo" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) var ( diff --git a/config/source/env/env_test.go b/config/source/env/env_test.go index c5425a72..a2038191 100644 --- a/config/source/env/env_test.go +++ b/config/source/env/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) func TestEnv_Read(t *testing.T) { diff --git a/config/source/env/options.go b/config/source/env/options.go index 123347a0..b2de5c73 100644 --- a/config/source/env/options.go +++ b/config/source/env/options.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type strippedPrefixKey struct{} diff --git a/config/source/env/watcher.go b/config/source/env/watcher.go index 22e1aa71..e9fae081 100644 --- a/config/source/env/watcher.go +++ b/config/source/env/watcher.go @@ -1,7 +1,7 @@ package env import ( - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type watcher struct { diff --git a/config/source/file/file.go b/config/source/file/file.go index b800c5c2..ffb38301 100644 --- a/config/source/file/file.go +++ b/config/source/file/file.go @@ -6,7 +6,7 @@ import ( "io/fs" "os" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type file struct { diff --git a/config/source/file/file_test.go b/config/source/file/file_test.go index d204b1ad..bcaf5669 100644 --- a/config/source/file/file_test.go +++ b/config/source/file/file_test.go @@ -8,8 +8,8 @@ import ( "testing/fstest" "time" - "go-micro.dev/v4/config" - "go-micro.dev/v4/config/source/file" + "go-micro.dev/v5/config" + "go-micro.dev/v5/config/source/file" ) func TestConfig(t *testing.T) { diff --git a/config/source/file/format.go b/config/source/file/format.go index b04f0ff3..e7ba190b 100644 --- a/config/source/file/format.go +++ b/config/source/file/format.go @@ -3,7 +3,7 @@ package file import ( "strings" - "go-micro.dev/v4/config/encoder" + "go-micro.dev/v5/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 2f4177d6..7385a3cf 100644 --- a/config/source/file/format_test.go +++ b/config/source/file/format_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) func TestFormat(t *testing.T) { diff --git a/config/source/file/options.go b/config/source/file/options.go index b28bde33..7d31822e 100644 --- a/config/source/file/options.go +++ b/config/source/file/options.go @@ -4,7 +4,7 @@ import ( "context" "io/fs" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type filePathKey struct{} diff --git a/config/source/file/watcher.go b/config/source/file/watcher.go index 5254a7a3..aa2fa5ec 100644 --- a/config/source/file/watcher.go +++ b/config/source/file/watcher.go @@ -7,7 +7,7 @@ import ( "os" "github.com/fsnotify/fsnotify" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type watcher struct { diff --git a/config/source/file/watcher_linux.go b/config/source/file/watcher_linux.go index 0bebeef0..644d6f5d 100644 --- a/config/source/file/watcher_linux.go +++ b/config/source/file/watcher_linux.go @@ -7,7 +7,7 @@ import ( "os" "github.com/fsnotify/fsnotify" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type watcher struct { diff --git a/config/source/file/watcher_test.go b/config/source/file/watcher_test.go index 177b0f3c..ccc4d197 100644 --- a/config/source/file/watcher_test.go +++ b/config/source/file/watcher_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "go-micro.dev/v4/config/source" - "go-micro.dev/v4/config/source/file" + "go-micro.dev/v5/config/source" + "go-micro.dev/v5/config/source/file" ) // createTestFile a local helper to creates a temporary file with the given data diff --git a/config/source/flag/flag.go b/config/source/flag/flag.go index eda7a6eb..c824e225 100644 --- a/config/source/flag/flag.go +++ b/config/source/flag/flag.go @@ -7,7 +7,7 @@ import ( "time" "github.com/imdario/mergo" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type flagsrc struct { diff --git a/config/source/flag/options.go b/config/source/flag/options.go index 674bef8b..9020d535 100644 --- a/config/source/flag/options.go +++ b/config/source/flag/options.go @@ -3,7 +3,7 @@ package flag import ( "context" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type includeUnsetKey struct{} diff --git a/config/source/memory/memory.go b/config/source/memory/memory.go index 9cfcca45..68e37d06 100644 --- a/config/source/memory/memory.go +++ b/config/source/memory/memory.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type memory struct { diff --git a/config/source/memory/options.go b/config/source/memory/options.go index 988dde26..52c68fa5 100644 --- a/config/source/memory/options.go +++ b/config/source/memory/options.go @@ -3,7 +3,7 @@ package memory import ( "context" - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type changeSetKey struct{} diff --git a/config/source/memory/watcher.go b/config/source/memory/watcher.go index 8d9ef7f8..b8ae6f4b 100644 --- a/config/source/memory/watcher.go +++ b/config/source/memory/watcher.go @@ -1,7 +1,7 @@ package memory import ( - "go-micro.dev/v4/config/source" + "go-micro.dev/v5/config/source" ) type watcher struct { diff --git a/config/source/options.go b/config/source/options.go index 996e6c30..6a523c92 100644 --- a/config/source/options.go +++ b/config/source/options.go @@ -3,9 +3,9 @@ package source import ( "context" - "go-micro.dev/v4/client" - "go-micro.dev/v4/config/encoder" - "go-micro.dev/v4/config/encoder/json" + "go-micro.dev/v5/client" + "go-micro.dev/v5/config/encoder" + "go-micro.dev/v5/config/encoder/json" ) type Options struct { diff --git a/config/value.go b/config/value.go index b42d2e87..57093046 100644 --- a/config/value.go +++ b/config/value.go @@ -3,7 +3,7 @@ package config import ( "time" - "go-micro.dev/v4/config/reader" + "go-micro.dev/v5/config/reader" ) type value struct{} diff --git a/debug/handler/debug.go b/debug/handler/debug.go index c5741d66..3fcc4660 100644 --- a/debug/handler/debug.go +++ b/debug/handler/debug.go @@ -7,11 +7,11 @@ import ( "io" "time" - "go-micro.dev/v4/client" - "go-micro.dev/v4/debug/log" - proto "go-micro.dev/v4/debug/proto" - "go-micro.dev/v4/debug/stats" - "go-micro.dev/v4/debug/trace" + "go-micro.dev/v5/client" + "go-micro.dev/v5/debug/log" + proto "go-micro.dev/v5/debug/proto" + "go-micro.dev/v5/debug/stats" + "go-micro.dev/v5/debug/trace" ) // NewHandler returns an instance of the Debug Handler. diff --git a/debug/log/memory/memory.go b/debug/log/memory/memory.go index 8f9c7a85..9dd16333 100644 --- a/debug/log/memory/memory.go +++ b/debug/log/memory/memory.go @@ -4,8 +4,8 @@ package memory import ( "fmt" - "go-micro.dev/v4/debug/log" - "go-micro.dev/v4/util/ring" + "go-micro.dev/v5/debug/log" + "go-micro.dev/v5/util/ring" ) var ( diff --git a/debug/log/memory/memory_test.go b/debug/log/memory/memory_test.go index 25f1191f..e140dd22 100644 --- a/debug/log/memory/memory_test.go +++ b/debug/log/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "go-micro.dev/v4/debug/log" + "go-micro.dev/v5/debug/log" ) func TestLogger(t *testing.T) { diff --git a/debug/log/memory/stream.go b/debug/log/memory/stream.go index 9267a52d..e227c17f 100644 --- a/debug/log/memory/stream.go +++ b/debug/log/memory/stream.go @@ -1,7 +1,7 @@ package memory import ( - "go-micro.dev/v4/debug/log" + "go-micro.dev/v5/debug/log" ) type logStream struct { diff --git a/debug/log/noop/noop.go b/debug/log/noop/noop.go index a4699469..c6b2b2ef 100644 --- a/debug/log/noop/noop.go +++ b/debug/log/noop/noop.go @@ -1,7 +1,7 @@ package noop import ( - "go-micro.dev/v4/debug/log" + "go-micro.dev/v5/debug/log" ) type noop struct{} diff --git a/debug/log/os.go b/debug/log/os.go index 0a880bae..319985e9 100644 --- a/debug/log/os.go +++ b/debug/log/os.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/google/uuid" - "go-micro.dev/v4/util/ring" + "go-micro.dev/v5/util/ring" ) // Should stream from OS. diff --git a/debug/profile/http/http.go b/debug/profile/http/http.go index d28ad12d..16d69b94 100644 --- a/debug/profile/http/http.go +++ b/debug/profile/http/http.go @@ -7,7 +7,7 @@ import ( "net/http/pprof" "sync" - "go-micro.dev/v4/debug/profile" + "go-micro.dev/v5/debug/profile" ) type httpProfile struct { diff --git a/debug/profile/pprof/pprof.go b/debug/profile/pprof/pprof.go index 354fbe6d..a3d41688 100644 --- a/debug/profile/pprof/pprof.go +++ b/debug/profile/pprof/pprof.go @@ -8,7 +8,7 @@ import ( "runtime/pprof" "sync" - "go-micro.dev/v4/debug/profile" + "go-micro.dev/v5/debug/profile" ) type profiler struct { diff --git a/debug/proto/debug.pb.micro.go b/debug/proto/debug.pb.micro.go index 2dd7440f..8935b4b4 100644 --- a/debug/proto/debug.pb.micro.go +++ b/debug/proto/debug.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" + api "go-micro.dev/v5/api" + client "go-micro.dev/v5/client" + server "go-micro.dev/v5/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/debug/stats/default.go b/debug/stats/default.go index 6e547c91..4d9639f4 100644 --- a/debug/stats/default.go +++ b/debug/stats/default.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "go-micro.dev/v4/util/ring" + "go-micro.dev/v5/util/ring" ) type stats struct { diff --git a/debug/trace/default.go b/debug/trace/default.go index c780485d..32b9f450 100644 --- a/debug/trace/default.go +++ b/debug/trace/default.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "go-micro.dev/v4/util/ring" + "go-micro.dev/v5/util/ring" ) type memTracer struct { diff --git a/debug/trace/trace.go b/debug/trace/trace.go index 81d8624a..6e53a096 100644 --- a/debug/trace/trace.go +++ b/debug/trace/trace.go @@ -5,8 +5,8 @@ import ( "context" "time" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/transport/headers" ) var ( diff --git a/event.go b/event.go index 0215d2df..6856d89e 100644 --- a/event.go +++ b/event.go @@ -3,7 +3,7 @@ package micro import ( "context" - "go-micro.dev/v4/client" + "go-micro.dev/v5/client" ) type event struct { diff --git a/events/memory.go b/events/memory.go index e3b19cf8..5a1f78a2 100644 --- a/events/memory.go +++ b/events/memory.go @@ -8,8 +8,8 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/store" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/store" ) // NewStream returns an initialized memory stream. diff --git a/events/options.go b/events/options.go index 176157a9..00c6ef52 100644 --- a/events/options.go +++ b/events/options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) type Options struct { diff --git a/events/store.go b/events/store.go index 7e1dcea9..07398eac 100644 --- a/events/store.go +++ b/events/store.go @@ -5,8 +5,8 @@ import ( "time" "github.com/pkg/errors" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/store" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/store" ) const joinKey = "/" diff --git a/go.mod b/go.mod index a9527780..8e125ad1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go-micro.dev/v4 +module go-micro.dev/v5 go 1.18 diff --git a/logger/default.go b/logger/default.go index 407811b8..d553c344 100644 --- a/logger/default.go +++ b/logger/default.go @@ -10,7 +10,7 @@ import ( "sync" "time" - dlog "go-micro.dev/v4/debug/log" + dlog "go-micro.dev/v5/debug/log" ) func init() { diff --git a/micro.go b/micro.go index df242469..53f365ef 100644 --- a/micro.go +++ b/micro.go @@ -4,8 +4,8 @@ package micro import ( "context" - "go-micro.dev/v4/client" - "go-micro.dev/v4/server" + "go-micro.dev/v5/client" + "go-micro.dev/v5/server" ) type serviceKey struct{} diff --git a/options.go b/options.go index 174155e8..60c6cc14 100644 --- a/options.go +++ b/options.go @@ -5,21 +5,21 @@ import ( "time" "github.com/urfave/cli/v2" - "go-micro.dev/v4/auth" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/cache" - "go-micro.dev/v4/client" - "go-micro.dev/v4/config" - "go-micro.dev/v4/debug/profile" - "go-micro.dev/v4/debug/trace" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/runtime" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/server" - "go-micro.dev/v4/store" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/util/cmd" + "go-micro.dev/v5/auth" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/cache" + "go-micro.dev/v5/client" + "go-micro.dev/v5/config" + "go-micro.dev/v5/debug/profile" + "go-micro.dev/v5/debug/trace" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/runtime" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/server" + "go-micro.dev/v5/store" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/util/cmd" ) // Options for micro service. diff --git a/registry/cache/cache.go b/registry/cache/cache.go index 5cbd051e..33680ffb 100644 --- a/registry/cache/cache.go +++ b/registry/cache/cache.go @@ -9,9 +9,9 @@ import ( "golang.org/x/sync/singleflight" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - util "go-micro.dev/v4/util/registry" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + util "go-micro.dev/v5/util/registry" ) // Cache is the registry cache interface. diff --git a/registry/cache/options.go b/registry/cache/options.go index 38f26dc1..0c8aa806 100644 --- a/registry/cache/options.go +++ b/registry/cache/options.go @@ -3,7 +3,7 @@ package cache import ( "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) // WithTTL sets the cache TTL. diff --git a/registry/mdns_registry.go b/registry/mdns_registry.go index d87324e5..a02ab009 100644 --- a/registry/mdns_registry.go +++ b/registry/mdns_registry.go @@ -16,8 +16,8 @@ import ( "time" "github.com/google/uuid" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/util/mdns" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/util/mdns" ) var ( diff --git a/registry/memory.go b/registry/memory.go index bd15aeb1..b2b116d8 100644 --- a/registry/memory.go +++ b/registry/memory.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - log "go-micro.dev/v4/logger" + log "go-micro.dev/v5/logger" ) var ( diff --git a/registry/options.go b/registry/options.go index 932706df..7bd3b3da 100644 --- a/registry/options.go +++ b/registry/options.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) type Options struct { diff --git a/runtime/default.go b/runtime/default.go index 9b4ceb0a..88c3e69c 100644 --- a/runtime/default.go +++ b/runtime/default.go @@ -13,8 +13,8 @@ import ( "time" "github.com/nxadm/tail" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/runtime/local/git" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/runtime/local/git" ) // defaultNamespace to use if not provided as an option. diff --git a/runtime/kubernetes/kubernetes.go b/runtime/kubernetes/kubernetes.go index 50e44c13..ad3632bd 100644 --- a/runtime/kubernetes/kubernetes.go +++ b/runtime/kubernetes/kubernetes.go @@ -6,9 +6,9 @@ import ( "sync" "time" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/runtime" - "go-micro.dev/v4/util/kubernetes/client" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/runtime" + "go-micro.dev/v5/util/kubernetes/client" ) // action to take on runtime service. diff --git a/runtime/kubernetes/logs.go b/runtime/kubernetes/logs.go index 0d9af67a..93fdf26a 100644 --- a/runtime/kubernetes/logs.go +++ b/runtime/kubernetes/logs.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/runtime" - "go-micro.dev/v4/util/kubernetes/client" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/runtime" + "go-micro.dev/v5/util/kubernetes/client" ) type klog struct { diff --git a/runtime/kubernetes/service.go b/runtime/kubernetes/service.go index dbefbc30..0f7e3e4e 100644 --- a/runtime/kubernetes/service.go +++ b/runtime/kubernetes/service.go @@ -5,10 +5,10 @@ import ( "strings" "time" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/runtime" - "go-micro.dev/v4/util/kubernetes/api" - "go-micro.dev/v4/util/kubernetes/client" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/runtime" + "go-micro.dev/v5/util/kubernetes/api" + "go-micro.dev/v5/util/kubernetes/client" ) type service struct { diff --git a/runtime/local/build/build.go b/runtime/local/build/build.go index 0c518d6d..fda9bfaa 100644 --- a/runtime/local/build/build.go +++ b/runtime/local/build/build.go @@ -2,7 +2,7 @@ package build import ( - "go-micro.dev/v4/runtime/local/source" + "go-micro.dev/v5/runtime/local/source" ) // Builder builds binaries. diff --git a/runtime/local/build/docker/docker.go b/runtime/local/build/docker/docker.go index e6d16df0..7ddaf5d3 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" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/runtime/local/build" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/runtime/local/build" ) type Builder struct { diff --git a/runtime/local/build/go/golang.go b/runtime/local/build/go/golang.go index 92f63f0a..ed84f8ad 100644 --- a/runtime/local/build/go/golang.go +++ b/runtime/local/build/go/golang.go @@ -6,7 +6,7 @@ import ( "os/exec" "path/filepath" - "go-micro.dev/v4/runtime/local/build" + "go-micro.dev/v5/runtime/local/build" ) type Builder struct { diff --git a/runtime/local/local.go b/runtime/local/local.go index f8f10b20..03d39980 100644 --- a/runtime/local/local.go +++ b/runtime/local/local.go @@ -2,7 +2,7 @@ package local import ( - "go-micro.dev/v4/runtime" + "go-micro.dev/v5/runtime" ) // NewRuntime returns a new local runtime. diff --git a/runtime/local/process/os/os.go b/runtime/local/process/os/os.go index e540a79f..7acfe88a 100644 --- a/runtime/local/process/os/os.go +++ b/runtime/local/process/os/os.go @@ -11,7 +11,7 @@ import ( "strconv" "syscall" - "go-micro.dev/v4/runtime/local/process" + "go-micro.dev/v5/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 c94f9517..2d47aaf6 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" - "go-micro.dev/v4/runtime/local/process" + "go-micro.dev/v5/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 520756d8..66418d2e 100644 --- a/runtime/local/process/os/process.go +++ b/runtime/local/process/os/process.go @@ -2,7 +2,7 @@ package os import ( - "go-micro.dev/v4/runtime/local/process" + "go-micro.dev/v5/runtime/local/process" ) type Process struct{} diff --git a/runtime/local/process/process.go b/runtime/local/process/process.go index 2b74fcf2..4f011b55 100644 --- a/runtime/local/process/process.go +++ b/runtime/local/process/process.go @@ -4,7 +4,7 @@ package process import ( "io" - "go-micro.dev/v4/runtime/local/build" + "go-micro.dev/v5/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 74f90a28..9bc89fd1 100644 --- a/runtime/local/source/git/git.go +++ b/runtime/local/source/git/git.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/go-git/go-git/v5" - "go-micro.dev/v4/runtime/local/source" + "go-micro.dev/v5/runtime/local/source" ) // Source retrieves source code diff --git a/runtime/local/source/go/golang.go b/runtime/local/source/go/golang.go index a7a535ef..60b50e8d 100644 --- a/runtime/local/source/go/golang.go +++ b/runtime/local/source/go/golang.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "go-micro.dev/v4/runtime/local/source" + "go-micro.dev/v5/runtime/local/source" ) type Source struct { diff --git a/runtime/options.go b/runtime/options.go index ce5078bd..b14355a2 100644 --- a/runtime/options.go +++ b/runtime/options.go @@ -4,8 +4,8 @@ import ( "context" "io" - "go-micro.dev/v4/client" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/client" + "go-micro.dev/v5/logger" ) type Option func(o *Options) diff --git a/runtime/service.go b/runtime/service.go index dd192617..36fe0ad9 100644 --- a/runtime/service.go +++ b/runtime/service.go @@ -8,10 +8,10 @@ import ( "sync" "time" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/runtime/local/build" - "go-micro.dev/v4/runtime/local/process" - proc "go-micro.dev/v4/runtime/local/process/os" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/runtime/local/build" + "go-micro.dev/v5/runtime/local/process" + proc "go-micro.dev/v5/runtime/local/process/os" ) type service struct { diff --git a/selector/common_test.go b/selector/common_test.go index c2e947c9..0fe5d94e 100644 --- a/selector/common_test.go +++ b/selector/common_test.go @@ -1,7 +1,7 @@ package selector import ( - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) var ( diff --git a/selector/default.go b/selector/default.go index ffcc7925..a84ec3dc 100644 --- a/selector/default.go +++ b/selector/default.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/registry/cache" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/registry/cache" ) type registrySelector struct { diff --git a/selector/default_test.go b/selector/default_test.go index 451e77f2..2c3047d2 100644 --- a/selector/default_test.go +++ b/selector/default_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestRegistrySelector(t *testing.T) { diff --git a/selector/filter.go b/selector/filter.go index 874e5b69..87edb5ae 100644 --- a/selector/filter.go +++ b/selector/filter.go @@ -1,7 +1,7 @@ package selector import ( - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) // FilterEndpoint is an endpoint based Select Filter which will diff --git a/selector/filter_test.go b/selector/filter_test.go index eef4c038..6e2b806e 100644 --- a/selector/filter_test.go +++ b/selector/filter_test.go @@ -3,7 +3,7 @@ package selector import ( "testing" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestFilterEndpoint(t *testing.T) { diff --git a/selector/options.go b/selector/options.go index 264bd4fc..bf47571a 100644 --- a/selector/options.go +++ b/selector/options.go @@ -3,8 +3,8 @@ package selector import ( "context" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" ) type Options struct { diff --git a/selector/selector.go b/selector/selector.go index acd031e0..d6382d75 100644 --- a/selector/selector.go +++ b/selector/selector.go @@ -4,7 +4,7 @@ package selector import ( "errors" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) // Selector builds on the registry as a mechanism to pick nodes diff --git a/selector/strategy.go b/selector/strategy.go index 4253483b..95bbe102 100644 --- a/selector/strategy.go +++ b/selector/strategy.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func init() { diff --git a/selector/strategy_test.go b/selector/strategy_test.go index c672e456..e090ffb9 100644 --- a/selector/strategy_test.go +++ b/selector/strategy_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestStrategies(t *testing.T) { diff --git a/server/extractor.go b/server/extractor.go index 1b460359..ca6a4b9b 100644 --- a/server/extractor.go +++ b/server/extractor.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func extractValue(v reflect.Type, d int) *registry.Value { diff --git a/server/extractor_test.go b/server/extractor_test.go index e97c1b65..78bf8cc0 100644 --- a/server/extractor_test.go +++ b/server/extractor_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) type testHandler struct{} diff --git a/server/mock/mock.go b/server/mock/mock.go index f1093bc2..d4e639dd 100644 --- a/server/mock/mock.go +++ b/server/mock/mock.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/google/uuid" - "go-micro.dev/v4/server" + "go-micro.dev/v5/server" ) type MockServer struct { diff --git a/server/mock/mock_handler.go b/server/mock/mock_handler.go index 1ffdb978..791c8d1f 100644 --- a/server/mock/mock_handler.go +++ b/server/mock/mock_handler.go @@ -1,8 +1,8 @@ package mock import ( - "go-micro.dev/v4/registry" - "go-micro.dev/v4/server" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/server" ) type MockHandler struct { diff --git a/server/mock/mock_subscriber.go b/server/mock/mock_subscriber.go index 7c21cf90..81a1021c 100644 --- a/server/mock/mock_subscriber.go +++ b/server/mock/mock_subscriber.go @@ -1,8 +1,8 @@ package mock import ( - "go-micro.dev/v4/registry" - "go-micro.dev/v4/server" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/server" ) type MockSubscriber struct { diff --git a/server/mock/mock_test.go b/server/mock/mock_test.go index f8e8beae..cc5f731d 100644 --- a/server/mock/mock_test.go +++ b/server/mock/mock_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - "go-micro.dev/v4/server" + "go-micro.dev/v5/server" ) func TestMockServer(t *testing.T) { diff --git a/server/options.go b/server/options.go index f4dc7311..bcb1159f 100644 --- a/server/options.go +++ b/server/options.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/debug/trace" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/debug/trace" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/transport" ) type RouterOptions struct { diff --git a/server/proto/server.pb.micro.go b/server/proto/server.pb.micro.go index b5c8951d..670cd8c0 100644 --- a/server/proto/server.pb.micro.go +++ b/server/proto/server.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" + api "go-micro.dev/v5/api" + client "go-micro.dev/v5/client" + server "go-micro.dev/v5/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 410a62fb..e73b8907 100644 --- a/server/rpc_codec.go +++ b/server/rpc_codec.go @@ -7,15 +7,15 @@ import ( "github.com/oxtoacart/bpool" "github.com/pkg/errors" - "go-micro.dev/v4/codec" - raw "go-micro.dev/v4/codec/bytes" - "go-micro.dev/v4/codec/grpc" - "go-micro.dev/v4/codec/json" - "go-micro.dev/v4/codec/jsonrpc" - "go-micro.dev/v4/codec/proto" - "go-micro.dev/v4/codec/protorpc" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/codec" + raw "go-micro.dev/v5/codec/bytes" + "go-micro.dev/v5/codec/grpc" + "go-micro.dev/v5/codec/json" + "go-micro.dev/v5/codec/jsonrpc" + "go-micro.dev/v5/codec/proto" + "go-micro.dev/v5/codec/protorpc" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/transport/headers" ) type rpcCodec struct { diff --git a/server/rpc_codec_test.go b/server/rpc_codec_test.go index 4c228c43..68770f8e 100644 --- a/server/rpc_codec_test.go +++ b/server/rpc_codec_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/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 c2d3f096..cdd244d0 100644 --- a/server/rpc_event.go +++ b/server/rpc_event.go @@ -1,9 +1,9 @@ package server import ( - "go-micro.dev/v4/broker" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/transport/headers" ) // event is a broker event we handle on the server transport. diff --git a/server/rpc_events.go b/server/rpc_events.go index b2d3df16..04ac3f15 100644 --- a/server/rpc_events.go +++ b/server/rpc_events.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "go-micro.dev/v4/broker" - raw "go-micro.dev/v4/codec/bytes" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/broker" + raw "go-micro.dev/v5/codec/bytes" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/transport/headers" ) // HandleEvent handles inbound messages to the service directly. diff --git a/server/rpc_handler.go b/server/rpc_handler.go index 2064f137..8d8bf450 100644 --- a/server/rpc_handler.go +++ b/server/rpc_handler.go @@ -3,7 +3,7 @@ package server import ( "reflect" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) type RpcHandler struct { diff --git a/server/rpc_helper.go b/server/rpc_helper.go index b0d79a10..8e8f5b70 100644 --- a/server/rpc_helper.go +++ b/server/rpc_helper.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/registry" ) // setRegistered will set the service as registered safely. diff --git a/server/rpc_request.go b/server/rpc_request.go index 7d9deedd..386e6bd4 100644 --- a/server/rpc_request.go +++ b/server/rpc_request.go @@ -3,9 +3,9 @@ package server import ( "bytes" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/util/buf" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/util/buf" ) type rpcRequest struct { diff --git a/server/rpc_response.go b/server/rpc_response.go index 3dc38683..2b71b6fa 100644 --- a/server/rpc_response.go +++ b/server/rpc_response.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/transport" ) type rpcResponse struct { diff --git a/server/rpc_router.go b/server/rpc_router.go index dcb99a9b..7dcb8342 100644 --- a/server/rpc_router.go +++ b/server/rpc_router.go @@ -12,9 +12,9 @@ import ( "unicode" "unicode/utf8" - "go-micro.dev/v4/codec" - merrors "go-micro.dev/v4/errors" - log "go-micro.dev/v4/logger" + "go-micro.dev/v5/codec" + merrors "go-micro.dev/v5/errors" + log "go-micro.dev/v5/logger" ) var ( diff --git a/server/rpc_server.go b/server/rpc_server.go index 7a28bfb8..7c572076 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -13,17 +13,17 @@ import ( "github.com/pkg/errors" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/codec" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/transport/headers" - "go-micro.dev/v4/util/addr" - "go-micro.dev/v4/util/backoff" - mnet "go-micro.dev/v4/util/net" - "go-micro.dev/v4/util/socket" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/codec" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/transport/headers" + "go-micro.dev/v5/util/addr" + "go-micro.dev/v5/util/backoff" + mnet "go-micro.dev/v5/util/net" + "go-micro.dev/v5/util/socket" ) type rpcServer struct { diff --git a/server/rpc_stream.go b/server/rpc_stream.go index 0735ddd6..373f68af 100644 --- a/server/rpc_stream.go +++ b/server/rpc_stream.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "go-micro.dev/v4/codec" + "go-micro.dev/v5/codec" ) // Implements the Streamer interface. diff --git a/server/rpc_stream_test.go b/server/rpc_stream_test.go index 7f034efe..0a146cca 100644 --- a/server/rpc_stream_test.go +++ b/server/rpc_stream_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/golang/protobuf/proto" - "go-micro.dev/v4/codec/json" - protoCodec "go-micro.dev/v4/codec/proto" + "go-micro.dev/v5/codec/json" + protoCodec "go-micro.dev/v5/codec/proto" ) // protoStruct implements proto.Message. diff --git a/server/server.go b/server/server.go index 055bf783..9c7e9107 100644 --- a/server/server.go +++ b/server/server.go @@ -9,10 +9,10 @@ import ( "github.com/google/uuid" - "go-micro.dev/v4/codec" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - signalutil "go-micro.dev/v4/util/signal" + "go-micro.dev/v5/codec" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + signalutil "go-micro.dev/v5/util/signal" ) // Server is a simple micro server abstraction. diff --git a/server/subscriber.go b/server/subscriber.go index 47327257..02c7aec3 100644 --- a/server/subscriber.go +++ b/server/subscriber.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) const ( diff --git a/service.go b/service.go index 55ce4587..a00fbbde 100644 --- a/service.go +++ b/service.go @@ -6,12 +6,12 @@ import ( rtime "runtime" "sync" - "go-micro.dev/v4/client" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/server" - "go-micro.dev/v4/store" - "go-micro.dev/v4/util/cmd" - signalutil "go-micro.dev/v4/util/signal" + "go-micro.dev/v5/client" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/server" + "go-micro.dev/v5/store" + "go-micro.dev/v5/util/cmd" + signalutil "go-micro.dev/v5/util/signal" ) type service struct { diff --git a/store/options.go b/store/options.go index f7ffc477..10ecdd4c 100644 --- a/store/options.go +++ b/store/options.go @@ -4,8 +4,8 @@ import ( "context" "time" - "go-micro.dev/v4/client" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/client" + "go-micro.dev/v5/logger" ) // Options contains configuration for the Store. diff --git a/sync/options.go b/sync/options.go index a59535cf..c6f2d559 100644 --- a/sync/options.go +++ b/sync/options.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) // Nodes sets the addresses to use. diff --git a/sync/sync.go b/sync/sync.go index c81f13bf..1b36d1a5 100644 --- a/sync/sync.go +++ b/sync/sync.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) var ( diff --git a/test/benchmark.go b/test/benchmark.go index 823c4baa..305c57b0 100644 --- a/test/benchmark.go +++ b/test/benchmark.go @@ -3,13 +3,13 @@ package test import ( "testing" - "go-micro.dev/v4" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/client" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/server" - "go-micro.dev/v4/transport" - "go-micro.dev/v4/util/test" + "go-micro.dev/v5" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/client" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/server" + "go-micro.dev/v5/transport" + "go-micro.dev/v5/util/test" ) func BenchmarkService(b *testing.B) { diff --git a/test/service.go b/test/service.go index bbcfd6ee..fd0d05c7 100644 --- a/test/service.go +++ b/test/service.go @@ -12,11 +12,11 @@ import ( proto "github.com/go-micro/plugins/v4/server/grpc/proto" - "go-micro.dev/v4" - "go-micro.dev/v4/client" - "go-micro.dev/v4/debug/handler" + "go-micro.dev/v5" + "go-micro.dev/v5/client" + "go-micro.dev/v5/debug/handler" - pb "go-micro.dev/v4/debug/proto" + pb "go-micro.dev/v5/debug/proto" ) var ( diff --git a/transport/http_client.go b/transport/http_client.go index a051f69d..e43ce151 100644 --- a/transport/http_client.go +++ b/transport/http_client.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/util/buf" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/util/buf" ) type httpTransportClient struct { diff --git a/transport/http_listener.go b/transport/http_listener.go index ab0c7eeb..eb6acb61 100644 --- a/transport/http_listener.go +++ b/transport/http_listener.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - log "go-micro.dev/v4/logger" + log "go-micro.dev/v5/logger" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" diff --git a/transport/http_transport.go b/transport/http_transport.go index 13c8eaae..baecba3c 100644 --- a/transport/http_transport.go +++ b/transport/http_transport.go @@ -6,10 +6,10 @@ import ( "net" "net/http" - "go-micro.dev/v4/logger" - maddr "go-micro.dev/v4/util/addr" - mnet "go-micro.dev/v4/util/net" - mls "go-micro.dev/v4/util/tls" + "go-micro.dev/v5/logger" + maddr "go-micro.dev/v5/util/addr" + mnet "go-micro.dev/v5/util/net" + mls "go-micro.dev/v5/util/tls" ) type httpTransport struct { diff --git a/transport/memory.go b/transport/memory.go index 76a568cb..ebceb168 100644 --- a/transport/memory.go +++ b/transport/memory.go @@ -11,8 +11,8 @@ import ( "sync" "time" - maddr "go-micro.dev/v4/util/addr" - mnet "go-micro.dev/v4/util/net" + maddr "go-micro.dev/v5/util/addr" + mnet "go-micro.dev/v5/util/net" ) type memorySocket struct { diff --git a/transport/options.go b/transport/options.go index 20fef7b8..0c7e343d 100644 --- a/transport/options.go +++ b/transport/options.go @@ -6,8 +6,8 @@ import ( "net" "time" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/logger" ) var ( diff --git a/util/addr/addr_test.go b/util/addr/addr_test.go index 4576ef90..1353a623 100644 --- a/util/addr/addr_test.go +++ b/util/addr/addr_test.go @@ -75,47 +75,47 @@ func TestFindIP(t *testing.T) { }, { addrs: []net.Addr{localhost}, - ip: localhost.IP, + ip: localhost.IP, }, { addrs: []net.Addr{localhost, localhostIPv6}, - ip: localhost.IP, + ip: localhost.IP, }, { addrs: []net.Addr{localhostIPv6}, - ip: localhostIPv6.IP, + ip: localhostIPv6.IP, }, { addrs: []net.Addr{privateIP, localhost}, - ip: privateIP.IP, + ip: privateIP.IP, }, { addrs: []net.Addr{privateIP, publicIP, localhost}, - ip: privateIP.IP, + ip: privateIP.IP, }, { addrs: []net.Addr{publicIP, privateIP, localhost}, - ip: privateIP.IP, + ip: privateIP.IP, }, { addrs: []net.Addr{publicIP, localhost}, - ip: publicIP.IP, + ip: publicIP.IP, }, { addrs: []net.Addr{publicIP, localhostIPv6}, - ip: publicIP.IP, + ip: publicIP.IP, }, { addrs: []net.Addr{localhostIPv6, publicIP}, - ip: publicIP.IP, + ip: publicIP.IP, }, { addrs: []net.Addr{localhostIPv6, publicIPv6, publicIP}, - ip: publicIPv6.IP, + ip: publicIPv6.IP, }, { addrs: []net.Addr{publicIP, publicIPv6}, - ip: publicIP.IP, + ip: publicIP.IP, }, } diff --git a/util/cmd/cmd.go b/util/cmd/cmd.go index 70d4c6a3..670506c1 100644 --- a/util/cmd/cmd.go +++ b/util/cmd/cmd.go @@ -8,22 +8,22 @@ import ( "time" "github.com/urfave/cli/v2" - "go-micro.dev/v4/auth" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/cache" - "go-micro.dev/v4/client" - "go-micro.dev/v4/config" - "go-micro.dev/v4/debug/profile" - "go-micro.dev/v4/debug/profile/http" - "go-micro.dev/v4/debug/profile/pprof" - "go-micro.dev/v4/debug/trace" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/runtime" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/server" - "go-micro.dev/v4/store" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/auth" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/cache" + "go-micro.dev/v5/client" + "go-micro.dev/v5/config" + "go-micro.dev/v5/debug/profile" + "go-micro.dev/v5/debug/profile/http" + "go-micro.dev/v5/debug/profile/pprof" + "go-micro.dev/v5/debug/trace" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/runtime" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/server" + "go-micro.dev/v5/store" + "go-micro.dev/v5/transport" ) type Cmd interface { diff --git a/util/cmd/options.go b/util/cmd/options.go index 0595f5fa..ba2fb6c0 100644 --- a/util/cmd/options.go +++ b/util/cmd/options.go @@ -3,19 +3,19 @@ package cmd import ( "context" - "go-micro.dev/v4/auth" - "go-micro.dev/v4/broker" - "go-micro.dev/v4/cache" - "go-micro.dev/v4/client" - "go-micro.dev/v4/config" - "go-micro.dev/v4/debug/profile" - "go-micro.dev/v4/debug/trace" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/runtime" - "go-micro.dev/v4/selector" - "go-micro.dev/v4/server" - "go-micro.dev/v4/store" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/auth" + "go-micro.dev/v5/broker" + "go-micro.dev/v5/cache" + "go-micro.dev/v5/client" + "go-micro.dev/v5/config" + "go-micro.dev/v5/debug/profile" + "go-micro.dev/v5/debug/trace" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/runtime" + "go-micro.dev/v5/selector" + "go-micro.dev/v5/server" + "go-micro.dev/v5/store" + "go-micro.dev/v5/transport" ) type Options struct { diff --git a/util/ctx/ctx.go b/util/ctx/ctx.go index 9b33f97a..853be441 100644 --- a/util/ctx/ctx.go +++ b/util/ctx/ctx.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "go-micro.dev/v4/metadata" + "go-micro.dev/v5/metadata" ) func FromRequest(r *http.Request) context.Context { diff --git a/util/ctx/ctx_test.go b/util/ctx/ctx_test.go index 9d2b36e8..e183739b 100644 --- a/util/ctx/ctx_test.go +++ b/util/ctx/ctx_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "go-micro.dev/v4/metadata" + "go-micro.dev/v5/metadata" ) func TestRequestToContext(t *testing.T) { diff --git a/util/file/client.go b/util/file/client.go index e94400c0..522d3718 100644 --- a/util/file/client.go +++ b/util/file/client.go @@ -7,9 +7,9 @@ import ( "io" "os" - "go-micro.dev/v4/client" - "go-micro.dev/v4/logger" - proto "go-micro.dev/v4/util/file/proto" + "go-micro.dev/v5/client" + "go-micro.dev/v5/logger" + proto "go-micro.dev/v5/util/file/proto" ) // Client is the client interface to access files. diff --git a/util/file/handler.go b/util/file/handler.go index 3c2fce06..c22fe1af 100644 --- a/util/file/handler.go +++ b/util/file/handler.go @@ -6,10 +6,10 @@ import ( "path/filepath" "sync" - "go-micro.dev/v4/errors" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/server" - proto "go-micro.dev/v4/util/file/proto" + "go-micro.dev/v5/errors" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/server" + proto "go-micro.dev/v5/util/file/proto" "golang.org/x/net/context" ) diff --git a/util/file/proto/file.pb.micro.go b/util/file/proto/file.pb.micro.go index 471fa87d..2b243c94 100644 --- a/util/file/proto/file.pb.micro.go +++ b/util/file/proto/file.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" + api "go-micro.dev/v5/api" + client "go-micro.dev/v5/client" + server "go-micro.dev/v5/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/util/http/http.go b/util/http/http.go index e4e857f2..03d791d3 100644 --- a/util/http/http.go +++ b/util/http/http.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/registry" + "go-micro.dev/v5/selector" ) // Write sets the status and body on a http ResponseWriter. diff --git a/util/http/http_test.go b/util/http/http_test.go index 78fba421..6881de99 100644 --- a/util/http/http_test.go +++ b/util/http/http_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestRoundTripper(t *testing.T) { diff --git a/util/http/options.go b/util/http/options.go index 8e2448f1..dfcad77a 100644 --- a/util/http/options.go +++ b/util/http/options.go @@ -1,7 +1,7 @@ package http import ( - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) type Options struct { diff --git a/util/http/roundtripper.go b/util/http/roundtripper.go index 9c719cb4..6e6934c4 100644 --- a/util/http/roundtripper.go +++ b/util/http/roundtripper.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "go-micro.dev/v4/selector" + "go-micro.dev/v5/selector" ) type roundTripper struct { diff --git a/util/io/io.go b/util/io/io.go index 5ad3d3b8..c605d27c 100644 --- a/util/io/io.go +++ b/util/io/io.go @@ -4,7 +4,7 @@ package io import ( "io" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) type rwc struct { diff --git a/util/kubernetes/api/request.go b/util/kubernetes/api/request.go index 77991307..227754b0 100644 --- a/util/kubernetes/api/request.go +++ b/util/kubernetes/api/request.go @@ -10,7 +10,7 @@ import ( "net/http" "net/url" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" ) // Request is used to construct a http request for the k8s API. diff --git a/util/kubernetes/client/client.go b/util/kubernetes/client/client.go index 2adf19e6..58941101 100644 --- a/util/kubernetes/client/client.go +++ b/util/kubernetes/client/client.go @@ -12,8 +12,8 @@ import ( "regexp" "strings" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/util/kubernetes/api" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/util/kubernetes/api" ) var ( diff --git a/util/kubernetes/client/watch.go b/util/kubernetes/client/watch.go index f3ab63a6..97b9e18d 100644 --- a/util/kubernetes/client/watch.go +++ b/util/kubernetes/client/watch.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "go-micro.dev/v4/util/kubernetes/api" + "go-micro.dev/v5/util/kubernetes/api" ) const ( diff --git a/util/mdns/client.go b/util/mdns/client.go index d2741003..65bb6f60 100644 --- a/util/mdns/client.go +++ b/util/mdns/client.go @@ -9,7 +9,7 @@ import ( "time" "github.com/miekg/dns" - "go-micro.dev/v4/logger" + "go-micro.dev/v5/logger" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" ) diff --git a/util/mdns/server.go b/util/mdns/server.go index 4b2c1f28..c3dbf7c1 100644 --- a/util/mdns/server.go +++ b/util/mdns/server.go @@ -9,7 +9,7 @@ import ( "time" "github.com/miekg/dns" - log "go-micro.dev/v4/logger" + log "go-micro.dev/v5/logger" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" ) diff --git a/util/pool/default.go b/util/pool/default.go index 2ac1212b..4850bc44 100644 --- a/util/pool/default.go +++ b/util/pool/default.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) type pool struct { diff --git a/util/pool/default_test.go b/util/pool/default_test.go index 3a38ce13..df248130 100644 --- a/util/pool/default_test.go +++ b/util/pool/default_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) func testPool(t *testing.T, size int, ttl time.Duration) { diff --git a/util/pool/options.go b/util/pool/options.go index 0772e229..223c7f4b 100644 --- a/util/pool/options.go +++ b/util/pool/options.go @@ -3,7 +3,7 @@ package pool import ( "time" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) type Options struct { diff --git a/util/pool/pool.go b/util/pool/pool.go index 861e522d..67347e02 100644 --- a/util/pool/pool.go +++ b/util/pool/pool.go @@ -4,7 +4,7 @@ package pool import ( "time" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) // Pool is an interface for connection pooling. diff --git a/util/registry/util.go b/util/registry/util.go index 864079e5..7c423a89 100644 --- a/util/registry/util.go +++ b/util/registry/util.go @@ -1,7 +1,7 @@ package registry import ( - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func addNodes(old, neu []*registry.Node) []*registry.Node { diff --git a/util/registry/util_test.go b/util/registry/util_test.go index 0c1cf009..35523283 100644 --- a/util/registry/util_test.go +++ b/util/registry/util_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestRemove(t *testing.T) { diff --git a/util/socket/socket.go b/util/socket/socket.go index d9cb86a8..629788ab 100644 --- a/util/socket/socket.go +++ b/util/socket/socket.go @@ -4,7 +4,7 @@ package socket import ( "io" - "go-micro.dev/v4/transport" + "go-micro.dev/v5/transport" ) // Socket is our pseudo socket for transport.Socket. diff --git a/util/stream/stream.go b/util/stream/stream.go index 3dfec0cb..771d3862 100644 --- a/util/stream/stream.go +++ b/util/stream/stream.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "go-micro.dev/v4/client" - "go-micro.dev/v4/codec" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/server" + "go-micro.dev/v5/client" + "go-micro.dev/v5/codec" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/server" ) type Stream interface { diff --git a/util/sync/manager.go b/util/sync/manager.go index 87e8434a..fa8883e4 100644 --- a/util/sync/manager.go +++ b/util/sync/manager.go @@ -4,7 +4,7 @@ import ( "time" "github.com/pkg/errors" - "go-micro.dev/v4/store" + "go-micro.dev/v5/store" ) type operation struct { diff --git a/util/sync/options.go b/util/sync/options.go index 63941105..c708b928 100644 --- a/util/sync/options.go +++ b/util/sync/options.go @@ -3,7 +3,7 @@ package sync import ( "time" - "go-micro.dev/v4/store" + "go-micro.dev/v5/store" ) // Options represents Sync options. diff --git a/util/sync/sync.go b/util/sync/sync.go index dff7d21d..648edd71 100644 --- a/util/sync/sync.go +++ b/util/sync/sync.go @@ -8,7 +8,7 @@ import ( "github.com/ef-ds/deque" "github.com/pkg/errors" - "go-micro.dev/v4/store" + "go-micro.dev/v5/store" ) // Sync implements a sync in for stores. diff --git a/util/test/test.go b/util/test/test.go index c5ccf780..276c9ceb 100644 --- a/util/test/test.go +++ b/util/test/test.go @@ -1,7 +1,7 @@ package test import ( - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) var ( diff --git a/util/wrapper/wrapper.go b/util/wrapper/wrapper.go index de9ee0df..7b989578 100644 --- a/util/wrapper/wrapper.go +++ b/util/wrapper/wrapper.go @@ -4,13 +4,13 @@ import ( "context" "strings" - "go-micro.dev/v4/auth" - "go-micro.dev/v4/client" - "go-micro.dev/v4/debug/stats" - "go-micro.dev/v4/debug/trace" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/server" - "go-micro.dev/v4/transport/headers" + "go-micro.dev/v5/auth" + "go-micro.dev/v5/client" + "go-micro.dev/v5/debug/stats" + "go-micro.dev/v5/debug/trace" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/server" + "go-micro.dev/v5/transport/headers" ) type fromServiceWrapper struct { diff --git a/util/wrapper/wrapper_test.go b/util/wrapper/wrapper_test.go index d31c065c..a1f11bf7 100644 --- a/util/wrapper/wrapper_test.go +++ b/util/wrapper/wrapper_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "go-micro.dev/v4/auth" - "go-micro.dev/v4/client" - "go-micro.dev/v4/metadata" - "go-micro.dev/v4/server" + "go-micro.dev/v5/auth" + "go-micro.dev/v5/client" + "go-micro.dev/v5/metadata" + "go-micro.dev/v5/server" ) func TestWrapper(t *testing.T) { diff --git a/web/options.go b/web/options.go index 6a6b35ce..3eeef4aa 100644 --- a/web/options.go +++ b/web/options.go @@ -7,9 +7,9 @@ import ( "time" "github.com/urfave/cli/v2" - "go-micro.dev/v4" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" + "go-micro.dev/v5" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" ) // Options for web. diff --git a/web/service.go b/web/service.go index 74bde1f2..35357d89 100644 --- a/web/service.go +++ b/web/service.go @@ -13,15 +13,15 @@ import ( "time" "github.com/urfave/cli/v2" - "go-micro.dev/v4" - log "go-micro.dev/v4/logger" - "go-micro.dev/v4/registry" - maddr "go-micro.dev/v4/util/addr" - "go-micro.dev/v4/util/backoff" - mhttp "go-micro.dev/v4/util/http" - mnet "go-micro.dev/v4/util/net" - signalutil "go-micro.dev/v4/util/signal" - mls "go-micro.dev/v4/util/tls" + "go-micro.dev/v5" + log "go-micro.dev/v5/logger" + "go-micro.dev/v5/registry" + maddr "go-micro.dev/v5/util/addr" + "go-micro.dev/v5/util/backoff" + mhttp "go-micro.dev/v5/util/http" + mnet "go-micro.dev/v5/util/net" + signalutil "go-micro.dev/v5/util/signal" + mls "go-micro.dev/v5/util/tls" ) type service struct { diff --git a/web/service_test.go b/web/service_test.go index f6967a8f..7a266953 100644 --- a/web/service_test.go +++ b/web/service_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "go-micro.dev/v4/registry" + "go-micro.dev/v5/registry" ) func TestService(t *testing.T) { diff --git a/web/web_test.go b/web/web_test.go index 1cefdb44..064eb6d0 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -7,9 +7,9 @@ import ( "time" "github.com/urfave/cli/v2" - "go-micro.dev/v4" - "go-micro.dev/v4/logger" - "go-micro.dev/v4/web" + "go-micro.dev/v5" + "go-micro.dev/v5/logger" + "go-micro.dev/v5/web" ) func TestWeb(t *testing.T) {