go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-12-30 10:10:44 +02:00
Code Issues Releases Activity

go-micro.dev/v4 (#2305)

Browse Source
This commit is contained in:
Asim Aslam 2021-10-12 12:55:53 +01:00 committed by GitHub
parent d9a6faeb7a
commit 1cd7cfaa6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
705 changed files with 1365 additions and 1365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -51,7 +51,7 @@ are pluggable and allows Go Micro to be runtime agnostic. You can plugin any und
To make use of Go Micro
```golang
import "github.com/asim/go-micro/v3"
import "go-micro.dev/v4"
// create a new service
service := micro.NewService(

4
api/api.go
View File

@ -5,8 +5,8 @@ import (
"regexp"
"strings"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/server"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/server"
)
type Api interface {

14
api/handler/api/api.go
View File

@ -4,13 +4,13 @@ package api
import (
"net/http"
goapi "github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/api/handler"
api "github.com/asim/go-micro/v3/api/proto"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/selector"
"github.com/asim/go-micro/v3/util/ctx"
goapi "go-micro.dev/v4/api"
"go-micro.dev/v4/api/handler"
api "go-micro.dev/v4/api/proto"
"go-micro.dev/v4/client"
"go-micro.dev/v4/errors"
"go-micro.dev/v4/selector"
"go-micro.dev/v4/util/ctx"
)
type apiHandler struct {

6
api/handler/api/util.go
View File

@ -7,9 +7,9 @@ import (
"net/http"
"strings"
api "github.com/asim/go-micro/v3/api/proto"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/selector"
api "go-micro.dev/v4/api/proto"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/selector"
"github.com/oxtoacart/bpool"
)

6
api/handler/event/event.go
View File

@ -10,9 +10,9 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/api/handler"
proto "github.com/asim/go-micro/v3/api/proto"
"github.com/asim/go-micro/v3/util/ctx"
"go-micro.dev/v4/api/handler"
proto "go-micro.dev/v4/api/proto"
"go-micro.dev/v4/util/ctx"
"github.com/google/uuid"
"github.com/oxtoacart/bpool"
)

6
api/handler/http/http.go
View File

@ -8,9 +8,9 @@ import (
"net/http/httputil"
"net/url"
"github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/api/handler"
"github.com/asim/go-micro/v3/selector"
"go-micro.dev/v4/api"
"go-micro.dev/v4/api/handler"
"go-micro.dev/v4/selector"
)
const (

12
api/handler/http/http_test.go
View File

@ -6,12 +6,12 @@ import (
"net/http/httptest"
"testing"
"github.com/asim/go-micro/v3/api/handler"
"github.com/asim/go-micro/v3/api/resolver"
"github.com/asim/go-micro/v3/api/resolver/vpath"
"github.com/asim/go-micro/v3/api/router"
regRouter "github.com/asim/go-micro/v3/api/router/registry"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/api/handler"
"go-micro.dev/v4/api/resolver"
"go-micro.dev/v4/api/resolver/vpath"
"go-micro.dev/v4/api/router"
regRouter "go-micro.dev/v4/api/router/registry"
"go-micro.dev/v4/registry"
)
func testHttp(t *testing.T, path, service, ns string) {

4
api/handler/options.go
View File

@ -1,8 +1,8 @@
package handler
import (
"github.com/asim/go-micro/v3/api/router"
"github.com/asim/go-micro/v3/client"
"go-micro.dev/v4/api/router"
"go-micro.dev/v4/client"
)
var (

28
api/handler/rpc/rpc.go
View File

@ -9,20 +9,20 @@ import (
"strconv"
"strings"
"github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/api/handler"
"github.com/asim/go-micro/v3/api/internal/proto"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/v3/codec"
"github.com/asim/go-micro/v3/codec/jsonrpc"
"github.com/asim/go-micro/v3/codec/protorpc"
"github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/logger"
"github.com/asim/go-micro/v3/metadata"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/selector"
"github.com/asim/go-micro/v3/util/ctx"
"github.com/asim/go-micro/v3/util/qson"
"go-micro.dev/v4/api"
"go-micro.dev/v4/api/handler"
"go-micro.dev/v4/api/internal/proto"
"go-micro.dev/v4/client"
"go-micro.dev/v4/codec"
"go-micro.dev/v4/codec/jsonrpc"
"go-micro.dev/v4/codec/protorpc"
"go-micro.dev/v4/errors"
"go-micro.dev/v4/logger"
"go-micro.dev/v4/metadata"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/selector"
"go-micro.dev/v4/util/ctx"
"go-micro.dev/v4/util/qson"
jsonpatch "github.com/evanphx/json-patch/v5"
"github.com/oxtoacart/bpool"
)

2
api/handler/rpc/rpc_test.go
View File

@ -7,7 +7,7 @@ import (
"reflect"
"testing"
go_api "github.com/asim/go-micro/v3/api/proto"
go_api "go-micro.dev/v4/api/proto"
"github.com/golang/protobuf/proto"
)

10
api/handler/rpc/stream.go
View File

@ -9,11 +9,11 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/client"
raw "github.com/asim/go-micro/v3/codec/bytes"
"github.com/asim/go-micro/v3/logger"
"github.com/asim/go-micro/v3/selector"
"go-micro.dev/v4/api"
"go-micro.dev/v4/client"
raw "go-micro.dev/v4/codec/bytes"
"go-micro.dev/v4/logger"
"go-micro.dev/v4/selector"
"github.com/gobwas/httphead"
"github.com/gobwas/ws"
"github.com/gobwas/ws/wsutil"

6
api/handler/web/web.go
View File

@ -11,9 +11,9 @@ import (
"net/url"
"strings"
"github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/api/handler"
"github.com/asim/go-micro/v3/selector"
"go-micro.dev/v4/api"
"go-micro.dev/v4/api/handler"
"go-micro.dev/v4/selector"
)
const (

2
api/resolver/grpc/grpc.go
View File

@ -6,7 +6,7 @@ import (
"net/http"
"strings"
"github.com/asim/go-micro/v3/api/resolver"
"go-micro.dev/v4/api/resolver"
)
type Resolver struct{}

2
api/resolver/host/host.go
View File

@ -4,7 +4,7 @@ package host
import (
"net/http"
"github.com/asim/go-micro/v3/api/resolver"
"go-micro.dev/v4/api/resolver"
)
type Resolver struct {

2
api/resolver/path/path.go
View File

@ -5,7 +5,7 @@ import (
"net/http"
"strings"
"github.com/asim/go-micro/v3/api/resolver"
"go-micro.dev/v4/api/resolver"
)
type Resolver struct {

2
api/resolver/vpath/vpath.go
View File

@ -7,7 +7,7 @@ import (
"regexp"
"strings"
"github.com/asim/go-micro/v3/api/resolver"
"go-micro.dev/v4/api/resolver"
)
func NewResolver(opts ...resolver.Option) resolver.Resolver {

6
api/router/options.go
View File

@ -1,9 +1,9 @@
package router
import (
"github.com/asim/go-micro/v3/api/resolver"
"github.com/asim/go-micro/v3/api/resolver/vpath"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/api/resolver"
"go-micro.dev/v4/api/resolver/vpath"
"go-micro.dev/v4/registry"
)
type Options struct {

14
api/router/registry/registry.go
View File

@ -10,13 +10,13 @@ import (
"sync"
"time"
"github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/api/router"
"github.com/asim/go-micro/v3/api/router/util"
"github.com/asim/go-micro/v3/logger"
"github.com/asim/go-micro/v3/metadata"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/registry/cache"
"go-micro.dev/v4/api"
"go-micro.dev/v4/api/router"
"go-micro.dev/v4/api/router/util"
"go-micro.dev/v4/logger"
"go-micro.dev/v4/metadata"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/registry/cache"
)
// endpoint struct, that holds compiled pcre

2
api/router/registry/registry_test.go
View File

@ -3,7 +3,7 @@ package registry
import (
"testing"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/registry"
"github.com/stretchr/testify/assert"
)

2
api/router/router.go
View File

@ -4,7 +4,7 @@ package router
import (
"net/http"
"github.com/asim/go-micro/v3/api"
"go-micro.dev/v4/api"
)
// Router is used to determine an endpoint for a request

14
api/router/static/static.go
View File

@ -8,13 +8,13 @@ import (
"strings"
"sync"
"github.com/asim/go-micro/v3/api"
"github.com/asim/go-micro/v3/api/router"
"github.com/asim/go-micro/v3/api/router/util"
"github.com/asim/go-micro/v3/logger"
"github.com/asim/go-micro/v3/metadata"
"github.com/asim/go-micro/v3/registry"
rutil "github.com/asim/go-micro/v3/util/registry"
"go-micro.dev/v4/api"
"go-micro.dev/v4/api/router"
"go-micro.dev/v4/api/router/util"
"go-micro.dev/v4/logger"
"go-micro.dev/v4/metadata"
"go-micro.dev/v4/registry"
rutil "go-micro.dev/v4/util/registry"
)
type endpoint struct {

2
api/router/util/parse.go
View File

@ -6,7 +6,7 @@ import (
"fmt"
"strings"
"github.com/asim/go-micro/v3/logger"
"go-micro.dev/v4/logger"
)
// InvalidTemplateError indicates that the path template is not valid.

2
api/router/util/parse_test.go
View File

@ -8,7 +8,7 @@ import (
"reflect"
"testing"
"github.com/asim/go-micro/v3/logger"
"go-micro.dev/v4/logger"
)
func TestTokenize(t *testing.T) {

2
api/router/util/runtime.go
View File

@ -7,7 +7,7 @@ import (
"fmt"
"strings"
"github.com/asim/go-micro/v3/logger"
"go-micro.dev/v4/logger"
)
var (

4
api/server/acme/autocert/autocert.go
View File

@ -7,8 +7,8 @@ import (
"net"
"os"
"github.com/asim/go-micro/v3/api/server/acme"
"github.com/asim/go-micro/v3/logger"
"go-micro.dev/v4/api/server/acme"
"go-micro.dev/v4/logger"
"golang.org/x/crypto/acme/autocert"
)

6
api/server/http/http.go
View File

@ -8,9 +8,9 @@ import (
"os"
"sync"
"github.com/asim/go-micro/v3/api/server"
"github.com/asim/go-micro/v3/api/server/cors"
"github.com/asim/go-micro/v3/logger"
"go-micro.dev/v4/api/server"
"go-micro.dev/v4/api/server/cors"
"go-micro.dev/v4/logger"
"github.com/gorilla/handlers"
)

4
api/server/http/http_test.go
View File

@ -2,8 +2,8 @@ package http
import (
"fmt"
"github.com/asim/go-micro/v3/api/server"
"github.com/asim/go-micro/v3/api/server/cors"
"go-micro.dev/v4/api/server"
"go-micro.dev/v4/api/server/cors"
"io/ioutil"
"net/http"
"testing"

6
api/server/options.go
View File

@ -2,11 +2,11 @@ package server
import (
"crypto/tls"
"github.com/asim/go-micro/v3/api/server/cors"
"go-micro.dev/v4/api/server/cors"
"net/http"
"github.com/asim/go-micro/v3/api/resolver"
"github.com/asim/go-micro/v3/api/server/acme"
"go-micro.dev/v4/api/resolver"
"go-micro.dev/v4/api/server/acme"
)
type Option func(o *Options)

14
broker/http.go
View File

@ -17,13 +17,13 @@ import (
"sync"
"time"
"github.com/asim/go-micro/v3/codec/json"
merr "github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/registry/cache"
maddr "github.com/asim/go-micro/v3/util/addr"
mnet "github.com/asim/go-micro/v3/util/net"
mls "github.com/asim/go-micro/v3/util/tls"
"go-micro.dev/v4/codec/json"
merr "go-micro.dev/v4/errors"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/registry/cache"
maddr "go-micro.dev/v4/util/addr"
mnet "go-micro.dev/v4/util/net"
mls "go-micro.dev/v4/util/tls"
"github.com/google/uuid"
"golang.org/x/net/http2"
)

4
broker/http_test.go
View File

@ -5,8 +5,8 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/registry"
"github.com/google/uuid"
)

4
broker/options.go
View File

@ -4,8 +4,8 @@ import (
"context"
"crypto/tls"
"github.com/asim/go-micro/v3/codec"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/codec"
"go-micro.dev/v4/registry"
)
type Options struct {

2
client/backoff.go
View File

@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/asim/go-micro/v3/util/backoff"
"go-micro.dev/v4/util/backoff"
)
type BackoffFunc func(ctx context.Context, req Request, attempts int) (time.Duration, error)

2
client/cache.go
View File

@ -7,7 +7,7 @@ import (
"hash/fnv"
"time"
"github.com/asim/go-micro/v3/metadata"
"go-micro.dev/v4/metadata"
cache "github.com/patrickmn/go-cache"
)

2
client/cache_test.go
View File

@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/metadata"
"go-micro.dev/v4/metadata"
)
func TestCache(t *testing.T) {

2
client/client.go
View File

@ -5,7 +5,7 @@ import (
"context"
"time"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
// Client is the interface used to make requests to services.

2
client/common_test.go
View File

@ -1,7 +1,7 @@
package client
import (
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/registry"
)
var (

10
client/options.go
View File

@ -4,11 +4,11 @@ import (
"context"
"time"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/codec"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/selector"
"github.com/asim/go-micro/v3/transport"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/codec"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/selector"
"go-micro.dev/v4/transport"
)
type Options struct {

2
client/options_test.go
View File

@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/transport"
"go-micro.dev/v4/transport"
)
func TestCallOptions(t *testing.T) {

2
client/retry.go
View File

@ -3,7 +3,7 @@ package client
import (
"context"
"github.com/asim/go-micro/v3/errors"
"go-micro.dev/v4/errors"
)
// note that returning either false or a non-nil error will result in the call not being retried

22
client/rpc_client.go
View File

@ -6,17 +6,17 @@ import (
"sync/atomic"
"time"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/codec"
raw "github.com/asim/go-micro/v3/codec/bytes"
"github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/metadata"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/selector"
"github.com/asim/go-micro/v3/transport"
"github.com/asim/go-micro/v3/util/buf"
"github.com/asim/go-micro/v3/util/net"
"github.com/asim/go-micro/v3/util/pool"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/codec"
raw "go-micro.dev/v4/codec/bytes"
"go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/selector"
"go-micro.dev/v4/transport"
"go-micro.dev/v4/util/buf"
"go-micro.dev/v4/util/net"
"go-micro.dev/v4/util/pool"
"github.com/google/uuid"
)

6
client/rpc_client_test.go
View File

@ -5,9 +5,9 @@ import (
"fmt"
"testing"
"github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/selector"
"go-micro.dev/v4/errors"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/selector"
)
func newTestRegistry() registry.Registry {

20
client/rpc_codec.go
View File

@ -4,16 +4,16 @@ import (
"bytes"
errs "errors"
"github.com/asim/go-micro/v3/codec"
raw "github.com/asim/go-micro/v3/codec/bytes"
"github.com/asim/go-micro/v3/codec/grpc"
"github.com/asim/go-micro/v3/codec/json"
"github.com/asim/go-micro/v3/codec/jsonrpc"
"github.com/asim/go-micro/v3/codec/proto"
"github.com/asim/go-micro/v3/codec/protorpc"
"github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/transport"
"go-micro.dev/v4/codec"
raw "go-micro.dev/v4/codec/bytes"
"go-micro.dev/v4/codec/grpc"
"go-micro.dev/v4/codec/json"
"go-micro.dev/v4/codec/jsonrpc"
"go-micro.dev/v4/codec/proto"
"go-micro.dev/v4/codec/protorpc"
"go-micro.dev/v4/errors"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/transport"
)
const (

2
client/rpc_request.go
View File

@ -1,7 +1,7 @@
package client
import (
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type rpcRequest struct {

4
client/rpc_response.go
View File

@ -1,8 +1,8 @@
package client
import (
"github.com/asim/go-micro/v3/codec"
"github.com/asim/go-micro/v3/transport"
"go-micro.dev/v4/codec"
"go-micro.dev/v4/transport"
)
type rpcResponse struct {

2
client/rpc_stream.go
View File

@ -5,7 +5,7 @@ import (
"io"
"sync"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
// Implements the streamer interface

2
client/wrapper.go
View File

@ -3,7 +3,7 @@ package client
import (
"context"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/registry"
)
// CallFunc represents the individual call func

32
cmd/cmd.go
View File

@ -7,22 +7,22 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/auth"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/cache"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/v3/config"
"github.com/asim/go-micro/v3/debug/profile"
"github.com/asim/go-micro/v3/debug/profile/http"
"github.com/asim/go-micro/v3/debug/profile/pprof"
"github.com/asim/go-micro/v3/debug/trace"
"github.com/asim/go-micro/v3/logger"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/runtime"
"github.com/asim/go-micro/v3/selector"
"github.com/asim/go-micro/v3/server"
"github.com/asim/go-micro/v3/store"
"github.com/asim/go-micro/v3/transport"
"go-micro.dev/v4/auth"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/cache"
"go-micro.dev/v4/client"
"go-micro.dev/v4/config"
"go-micro.dev/v4/debug/profile"
"go-micro.dev/v4/debug/profile/http"
"go-micro.dev/v4/debug/profile/pprof"
"go-micro.dev/v4/debug/trace"
"go-micro.dev/v4/logger"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/runtime"
"go-micro.dev/v4/selector"
"go-micro.dev/v4/server"
"go-micro.dev/v4/store"
"go-micro.dev/v4/transport"
"github.com/urfave/cli/v2"
)

2
cmd/gomu/README.md
View File

@ -119,7 +119,7 @@ package helloworld
import (
"context"
log "github.com/asim/go-micro/v3/logger"
log "go-micro.dev/v4/logger"
"helloworld/greeter"
pb "helloworld/proto"

4
cmd/gomu/cmd/cli/call/call.go
View File

@ -7,8 +7,8 @@ import (
"strings"
"github.com/asim/go-micro/cmd/gomu/cmd"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/client"
"go-micro.dev/v4"
"go-micro.dev/v4/client"
"github.com/urfave/cli/v2"
)

4
cmd/gomu/cmd/cli/run/run.go
View File

@ -8,8 +8,8 @@ import (
"strings"
"github.com/asim/go-micro/cmd/gomu/cmd"
"github.com/asim/go-micro/v3/runtime"
"github.com/asim/go-micro/v3/runtime/local/git"
"go-micro.dev/v4/runtime"
"go-micro.dev/v4/runtime/local/git"
"github.com/fsnotify/fsnotify"
"github.com/urfave/cli/v2"
)

4
cmd/gomu/cmd/cli/stream/bidi.go
View File

@ -5,8 +5,8 @@ import (
"fmt"
"strings"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/client"
"go-micro.dev/v4"
"go-micro.dev/v4/client"
"github.com/urfave/cli/v2"
)

4
cmd/gomu/cmd/cli/stream/server.go
View File

@ -7,8 +7,8 @@ import (
"io"
"strings"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/client"
"go-micro.dev/v4"
"go-micro.dev/v4/client"
"github.com/urfave/cli/v2"
)

2
cmd/gomu/cmd/cmd.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"os"
mcmd "github.com/asim/go-micro/v3/cmd"
mcmd "go-micro.dev/v4/cmd"
"github.com/urfave/cli/v2"
)

4
cmd/gomu/generator/template/handler.go
View File

@ -6,7 +6,7 @@ var HandlerFNC = `package handler
import (
"context"
log "github.com/asim/go-micro/v3/logger"
log "go-micro.dev/v4/logger"
pb "{{.Vendor}}{{.Service}}/proto"
)
@ -28,7 +28,7 @@ import (
"io"
"time"
log "github.com/asim/go-micro/v3/logger"
log "go-micro.dev/v4/logger"
pb "{{.Vendor}}{{.Service}}/proto"
)

12
cmd/gomu/generator/template/main.go
View File

@ -9,8 +9,8 @@ import (
pb "{{.Vendor}}{{lower .Service}}/proto"
"github.com/asim/go-micro/v3"
log "github.com/asim/go-micro/v3/logger"
"go-micro.dev/v4"
log "go-micro.dev/v4/logger"
)
var (
@ -47,8 +47,8 @@ import (
"{{.Vendor}}{{.Service}}/handler"
{{if .Jaeger}} ot "github.com/asim/go-micro/plugins/wrapper/trace/opentracing/v3"
{{end}} "github.com/asim/go-micro/v3"
log "github.com/asim/go-micro/v3/logger"{{if .Jaeger}}
{{end}} "go-micro.dev/v4"
log "go-micro.dev/v4/logger"{{if .Jaeger}}
"github.com/asim/go-micro/cmd/gomu/debug/trace/jaeger"{{end}}
)
@ -99,8 +99,8 @@ import (
pb "{{.Vendor}}{{.Service}}/proto"
{{if .Jaeger}} ot "github.com/asim/go-micro/plugins/wrapper/trace/opentracing/v3"
{{end}} "github.com/asim/go-micro/v3"
log "github.com/asim/go-micro/v3/logger"{{if .Jaeger}}
{{end}} "go-micro.dev/v4"
log "go-micro.dev/v4/logger"{{if .Jaeger}}
"github.com/asim/go-micro/cmd/gomu/debug/trace/jaeger"{{end}}
)

2
cmd/gomu/go.mod
View File

@ -4,7 +4,7 @@ go 1.16
require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/asim/go-micro/v3 v3.6.1-0.20210831082736-088ccb50019c
go-micro.dev/v4 v4.0.0
github.com/fsnotify/fsnotify v1.4.9
github.com/opentracing/opentracing-go v1.2.0
github.com/uber/jaeger-client-go v2.29.1+incompatible

4
cmd/gomu/go.sum
View File

@ -71,8 +71,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asim/go-micro/v3 v3.6.1-0.20210831082736-088ccb50019c h1:bwjwOyCBbClb9BwnVo8XohDYzA3Huk/PVpxSfqrx3xg=
github.com/asim/go-micro/v3 v3.6.1-0.20210831082736-088ccb50019c/go.mod h1:UQd2JfP/+4goQxddksr2r6ZSaUXNIlVE8hlepbAx/DI=
go-micro.dev/v4 v4.0.0
go-micro.dev/v4 v4.0.0
github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=

26
cmd/options.go
View File

@ -3,19 +3,19 @@ package cmd
import (
"context"
"github.com/asim/go-micro/v3/auth"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/cache"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/v3/config"
"github.com/asim/go-micro/v3/debug/profile"
"github.com/asim/go-micro/v3/debug/trace"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/runtime"
"github.com/asim/go-micro/v3/selector"
"github.com/asim/go-micro/v3/server"
"github.com/asim/go-micro/v3/store"
"github.com/asim/go-micro/v3/transport"
"go-micro.dev/v4/auth"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/cache"
"go-micro.dev/v4/client"
"go-micro.dev/v4/config"
"go-micro.dev/v4/debug/profile"
"go-micro.dev/v4/debug/trace"
"go-micro.dev/v4/registry"
"go-micro.dev/v4/runtime"
"go-micro.dev/v4/selector"
"go-micro.dev/v4/server"
"go-micro.dev/v4/store"
"go-micro.dev/v4/transport"
)
type Options struct {

6
cmd/protoc-gen-micro/examples/greeter/greeter.pb.micro.go
View File

@ -12,9 +12,9 @@ import (
import (
context "context"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
api "go-micro.dev/v4/api"
client "go-micro.dev/v4/client"
server "go-micro.dev/v4/server"
)
// Reference imports to suppress errors if they are not otherwise used.

2
cmd/protoc-gen-micro/go.mod
View File

@ -3,7 +3,7 @@ module github.com/asim/go-micro/cmd/protoc-gen-micro/v3
go 1.16
require (
github.com/asim/go-micro/v3 v3.6.0
go-micro.dev/v4 v4.0.0
google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8
google.golang.org/protobuf v1.27.1
)

4
cmd/protoc-gen-micro/go.sum
View File

@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asim/go-micro/v3 v3.6.0 h1:I6UVJBpBtWNKCjWf0dRpZznRCW9TR4DXjV4wieyGhK0=
github.com/asim/go-micro/v3 v3.6.0/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8=
go-micro.dev/v4 v4.0.0
go-micro.dev/v4 v4.0.0
github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=

6
cmd/protoc-gen-micro/plugin/micro/micro.go
View File

@ -15,10 +15,10 @@ import (
// Paths for packages used by code generated in this file,
// relative to the import_prefix of the generator.Generator.
const (
apiPkgPath = "github.com/asim/go-micro/v3/api"
apiPkgPath = "go-micro.dev/v4/api"
contextPkgPath = "context"
clientPkgPath = "github.com/asim/go-micro/v3/client"
serverPkgPath = "github.com/asim/go-micro/v3/server"
clientPkgPath = "go-micro.dev/v4/client"
serverPkgPath = "go-micro.dev/v4/server"
)
func init() {

2
codec/bytes/bytes.go
View File

@ -6,7 +6,7 @@ import (
"io"
"io/ioutil"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type Codec struct {

2
codec/bytes/marshaler.go
View File

@ -1,7 +1,7 @@
package bytes
import (
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type Marshaler struct{}

2
codec/grpc/grpc.go
View File

@ -8,7 +8,7 @@ import (
"io"
"strings"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
"github.com/golang/protobuf/proto"
)

2
codec/json/json.go
View File

@ -5,7 +5,7 @@ import (
"encoding/json"
"io"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
)

2
codec/jsonrpc/client.go
View File

@ -6,7 +6,7 @@ import (
"io"
"sync"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type clientCodec struct {

2
codec/jsonrpc/jsonrpc.go
View File

@ -7,7 +7,7 @@ import (
"fmt"
"io"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type jsonCodec struct {

2
codec/jsonrpc/server.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"io"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type serverCodec struct {

2
codec/proto/marshaler.go
View File

@ -3,7 +3,7 @@ package proto
import (
"bytes"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
"github.com/golang/protobuf/proto"
"github.com/oxtoacart/bpool"
)

2
codec/proto/proto.go
View File

@ -5,7 +5,7 @@ import (
"io"
"io/ioutil"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
"github.com/golang/protobuf/proto"
)

2
codec/protorpc/protorpc.go
View File

@ -8,7 +8,7 @@ import (
"strconv"
"sync"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
"github.com/golang/protobuf/proto"
)

2
codec/text/text.go
View File

@ -6,7 +6,7 @@ import (
"io"
"io/ioutil"
"github.com/asim/go-micro/v3/codec"
"go-micro.dev/v4/codec"
)
type Codec struct {

8
config/config.go
View File

@ -4,10 +4,10 @@ package config
import (
"context"
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
"github.com/asim/go-micro/v3/config/source/file"
"go-micro.dev/v4/config/loader"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/source"
"go-micro.dev/v4/config/source/file"
)
// Config is an interface abstraction for dynamic configuration

10
config/default.go
View File

@ -5,11 +5,11 @@ import (
"sync"
"time"
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/loader/memory"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/reader/json"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/loader"
"go-micro.dev/v4/config/loader/memory"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/reader/json"
"go-micro.dev/v4/config/source"
)
type config struct {

8
config/default_test.go
View File

@ -9,10 +9,10 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/config/source"
"github.com/asim/go-micro/v3/config/source/env"
"github.com/asim/go-micro/v3/config/source/file"
"github.com/asim/go-micro/v3/config/source/memory"
"go-micro.dev/v4/config/source"
"go-micro.dev/v4/config/source/env"
"go-micro.dev/v4/config/source/file"
"go-micro.dev/v4/config/source/memory"
)
func createFileForIssue18(t *testing.T, content string) *os.File {

2
config/encoder/json/json.go
View File

@ -3,7 +3,7 @@ package json
import (
"encoding/json"
"github.com/asim/go-micro/v3/config/encoder"
"go-micro.dev/v4/config/encoder"
)
type jsonEncoder struct{}

4
config/loader/loader.go
View File

@ -4,8 +4,8 @@ package loader
import (
"context"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/source"
)
// Loader manages loading sources

8
config/loader/memory/memory.go
View File

@ -9,10 +9,10 @@ import (
"sync"
"time"
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/reader/json"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/loader"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/reader/json"
"go-micro.dev/v4/config/source"
)
type memory struct {

6
config/loader/memory/options.go
View File

@ -1,9 +1,9 @@
package memory
import (
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/loader"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/source"
)
// WithSource appends a source to list of sources

6
config/options.go
View File

@ -1,9 +1,9 @@
package config
import (
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/loader"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/source"
)
// WithLoader sets the loader for manager config

8
config/reader/json/json.go
View File

@ -4,10 +4,10 @@ import (
"errors"
"time"
"github.com/asim/go-micro/v3/config/encoder"
"github.com/asim/go-micro/v3/config/encoder/json"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/encoder"
"go-micro.dev/v4/config/encoder/json"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/source"
"github.com/imdario/mergo"
)

2
config/reader/json/json_test.go
View File

@ -3,7 +3,7 @@ package json
import (
"testing"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
func TestReader(t *testing.T) {

4
config/reader/json/values.go
View File

@ -7,8 +7,8 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/reader"
"go-micro.dev/v4/config/source"
simple "github.com/bitly/go-simplejson"
)

2
config/reader/json/values_test.go
View File

@ -4,7 +4,7 @@ import (
"reflect"
"testing"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
func TestValues(t *testing.T) {

4
config/reader/options.go
View File

@ -1,8 +1,8 @@
package reader
import (
"github.com/asim/go-micro/v3/config/encoder"
"github.com/asim/go-micro/v3/config/encoder/json"
"go-micro.dev/v4/config/encoder"
"go-micro.dev/v4/config/encoder/json"
)
type Options struct {

2
config/reader/reader.go
View File

@ -4,7 +4,7 @@ package reader
import (
"time"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
// Reader is an interface for merging changesets

2
config/secrets/box/box.go
View File

@ -2,7 +2,7 @@
package box
import (
"github.com/asim/go-micro/v3/config/secrets"
"go-micro.dev/v4/config/secrets"
"github.com/pkg/errors"
naclbox "golang.org/x/crypto/nacl/box"

2
config/secrets/box/box_test.go
View File

@ -5,7 +5,7 @@ import (
"reflect"
"testing"
"github.com/asim/go-micro/v3/config/secrets"
"go-micro.dev/v4/config/secrets"
naclbox "golang.org/x/crypto/nacl/box"
)

2
config/secrets/secretbox/secretbox.go
View File

@ -3,7 +3,7 @@
package secretbox
import (
"github.com/asim/go-micro/v3/config/secrets"
"go-micro.dev/v4/config/secrets"
"github.com/pkg/errors"
"golang.org/x/crypto/nacl/secretbox"

2
config/secrets/secretbox/secretbox_test.go
View File

@ -5,7 +5,7 @@ import (
"reflect"
"testing"
"github.com/asim/go-micro/v3/config/secrets"
"go-micro.dev/v4/config/secrets"
)
func TestSecretBox(t *testing.T) {

4
config/source/cli/cli.go
View File

@ -7,8 +7,8 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/cmd"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/cmd"
"go-micro.dev/v4/config/source"
"github.com/imdario/mergo"
"github.com/urfave/cli/v2"
)

8
config/source/cli/cli_test.go
View File

@ -5,10 +5,10 @@ import (
"os"
"testing"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/cmd"
"github.com/asim/go-micro/v3/config"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4"
"go-micro.dev/v4/cmd"
"go-micro.dev/v4/config"
"go-micro.dev/v4/config/source"
"github.com/urfave/cli/v2"
)

2
config/source/cli/options.go
View File

@ -3,7 +3,7 @@ package cli
import (
"context"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
"github.com/urfave/cli/v2"
)

2
config/source/env/env.go vendored
View File

@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
"github.com/imdario/mergo"
)

2
config/source/env/env_test.go vendored
View File

@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
func TestEnv_Read(t *testing.T) {

2
config/source/env/options.go vendored
View File

@ -5,7 +5,7 @@ import (
"strings"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
type strippedPrefixKey struct{}

2
config/source/env/watcher.go vendored
View File

@ -1,7 +1,7 @@
package env
import (
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
type watcher struct {

2
config/source/file/file.go
View File

@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"
"github.com/asim/go-micro/v3/config/source"
"go-micro.dev/v4/config/source"
)
type file struct {

4
config/source/file/file_test.go
View File

@ -7,8 +7,8 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/config"
"github.com/asim/go-micro/v3/config/source/file"
"go-micro.dev/v4/config"
"go-micro.dev/v4/config/source/file"
)
func TestConfig(t *testing.T) {

Some files were not shown because too many files have changed in this diff Show More