go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2025-08-04 21:42:57 +02:00
Code Issues Releases Activity

v3 (#2104)

Browse Source 
* v3

* revert plugins

* fixup some issues
This commit is contained in:
Asim Aslam
2021-01-20 13:54:31 +00:00
committed by GitHub
parent bf4ab679e1
commit d94936f6c9
369 changed files with 1442 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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/github.com/micro/go-micro/v2?tab=doc) [![Travis CI](https://api.travis-ci.org/micro/go-micro.svg?branch=master)](https://travis-ci.org/micro/go-micro) [![Go Report Card](https://goreportcard.com/badge/micro/go-micro)](https://goreportcard.com/report/github.com/micro/go-micro)
# 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/github.com/asim/go-micro/v3?tab=doc) [![Travis CI](https://api.travis-ci.org/micro/go-micro.svg?branch=master)](https://travis-ci.org/micro/go-micro) [![Go Report Card](https://goreportcard.com/badge/micro/go-micro)](https://goreportcard.com/report/github.com/micro/go-micro)
Go Micro is a framework for distributed systems development.
@ -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/micro/go-micro/v2"
import "github.com/asim/go-micro/v3"
// create a new service
service := micro.NewService(

4
api/api.go
View File

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

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

@ -4,13 +4,13 @@ package api
import (
"net/http"
goapi "github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/handler"
api "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/selector"
"github.com/micro/go-micro/v2/util/ctx"
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"
)
type apiHandler struct {

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

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

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

@ -10,10 +10,10 @@ 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"
"github.com/google/uuid"
"github.com/micro/go-micro/v2/api/handler"
proto "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/v2/util/ctx"
"github.com/oxtoacart/bpool"
)

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

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

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

@ -6,12 +6,12 @@ import (
"net/http/httptest"
"testing"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/api/resolver"
"github.com/micro/go-micro/v2/api/resolver/vpath"
"github.com/micro/go-micro/v2/api/router"
regRouter "github.com/micro/go-micro/v2/api/router/registry"
"github.com/micro/go-micro/v2/registry"
"github.com/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"
)
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/micro/go-micro/v2/api/router"
"github.com/micro/go-micro/v2/client"
"github.com/asim/go-micro/v3/api/router"
"github.com/asim/go-micro/v3/client"
)
var (

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

@ -9,21 +9,21 @@ 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"
jsonpatch "github.com/evanphx/json-patch/v5"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/api/internal/proto"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/codec/jsonrpc"
"github.com/micro/go-micro/v2/codec/protorpc"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/logger"
"github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/selector"
"github.com/micro/go-micro/v2/util/ctx"
"github.com/micro/go-micro/v2/util/qson"
"github.com/oxtoacart/bpool"
)

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

@ -6,8 +6,8 @@ import (
"net/http"
"testing"
go_api "github.com/asim/go-micro/v3/api/proto"
"github.com/golang/protobuf/proto"
go_api "github.com/micro/go-micro/v2/api/proto"
)
func TestRequestPayloadFromRequest(t *testing.T) {

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

@ -9,14 +9,14 @@ 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"
"github.com/gobwas/httphead"
"github.com/gobwas/ws"
"github.com/gobwas/ws/wsutil"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/client"
raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v2/logger"
"github.com/micro/go-micro/v2/selector"
)
// serveWebsocket will stream rpc back over websockets assuming json

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

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

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

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

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

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

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

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

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

@ -7,7 +7,7 @@ import (
"regexp"
"strings"
"github.com/micro/go-micro/v2/api/resolver"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/api/resolver"
"github.com/micro/go-micro/v2/api/resolver/vpath"
"github.com/micro/go-micro/v2/registry"
"github.com/asim/go-micro/v3/api/resolver"
"github.com/asim/go-micro/v3/api/resolver/vpath"
"github.com/asim/go-micro/v3/registry"
)
type Options struct {

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

@ -10,13 +10,13 @@ import (
"sync"
"time"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/router"
"github.com/micro/go-micro/v2/api/router/util"
"github.com/micro/go-micro/v2/logger"
"github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/cache"
"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"
)
// 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/micro/go-micro/v2/registry"
"github.com/asim/go-micro/v3/registry"
"github.com/stretchr/testify/assert"
)

2
api/router/router.go
View File

@ -4,7 +4,7 @@ package router
import (
"net/http"
"github.com/micro/go-micro/v2/api"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/router"
"github.com/micro/go-micro/v2/api/router/util"
"github.com/micro/go-micro/v2/logger"
"github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/v2/registry"
rutil "github.com/micro/go-micro/v2/util/registry"
"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"
)
type endpoint struct {

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

@ -6,7 +6,7 @@ import (
"fmt"
"strings"
"github.com/micro/go-micro/v2/logger"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/logger"
"github.com/asim/go-micro/v3/logger"
)
func TestTokenize(t *testing.T) {

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

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

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

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

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

@ -8,10 +8,10 @@ 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"
"github.com/gorilla/handlers"
"github.com/micro/go-micro/v2/api/server"
"github.com/micro/go-micro/v2/api/server/cors"
"github.com/micro/go-micro/v2/logger"
)
type httpServer struct {

4
api/server/options.go
View File

@ -4,8 +4,8 @@ import (
"crypto/tls"
"net/http"
"github.com/micro/go-micro/v2/api/resolver"
"github.com/micro/go-micro/v2/api/server/acme"
"github.com/asim/go-micro/v3/api/resolver"
"github.com/asim/go-micro/v3/api/server/acme"
)
type Option func(o *Options)

14
broker/http.go
View File

@ -17,14 +17,14 @@ 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"
"github.com/google/uuid"
"github.com/micro/go-micro/v2/codec/json"
merr "github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/cache"
maddr "github.com/micro/go-micro/v2/util/addr"
mnet "github.com/micro/go-micro/v2/util/net"
mls "github.com/micro/go-micro/v2/util/tls"
"golang.org/x/net/http2"
)

4
broker/http_test.go
View File

@ -5,9 +5,9 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/registry"
"github.com/google/uuid"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/registry"
)
var (

4
broker/options.go
View File

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

2
client/backoff.go
View File

@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/micro/go-micro/v2/util/backoff"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/metadata"
"github.com/asim/go-micro/v3/metadata"
cache "github.com/patrickmn/go-cache"
)

2
client/cache_test.go
View File

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

2
client/client.go
View File

@ -5,7 +5,7 @@ import (
"context"
"time"
"github.com/micro/go-micro/v2/codec"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/registry"
"github.com/asim/go-micro/v3/registry"
)
var (

10
client/options.go
View File

@ -4,11 +4,11 @@ import (
"context"
"time"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/selector"
"github.com/micro/go-micro/v2/transport"
"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"
)
type Options struct {

2
client/options_test.go
View File

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

2
client/retry.go
View File

@ -3,7 +3,7 @@ package client
import (
"context"
"github.com/micro/go-micro/v2/errors"
"github.com/asim/go-micro/v3/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,18 +6,18 @@ 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"
"github.com/google/uuid"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/codec"
raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/selector"
"github.com/micro/go-micro/v2/transport"
"github.com/micro/go-micro/v2/util/buf"
"github.com/micro/go-micro/v2/util/net"
"github.com/micro/go-micro/v2/util/pool"
)
type rpcClient struct {

6
client/rpc_client_test.go
View File

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

20
client/rpc_codec.go
View File

@ -4,16 +4,16 @@ import (
"bytes"
errs "errors"
"github.com/micro/go-micro/v2/codec"
raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v2/codec/grpc"
"github.com/micro/go-micro/v2/codec/json"
"github.com/micro/go-micro/v2/codec/jsonrpc"
"github.com/micro/go-micro/v2/codec/proto"
"github.com/micro/go-micro/v2/codec/protorpc"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/transport"
"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"
)
const (

2
client/rpc_request.go
View File

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

4
client/rpc_response.go
View File

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

2
client/rpc_stream.go
View File

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

2
client/wrapper.go
View File

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

26
cmd/cmd.go
View File

@ -9,19 +9,19 @@ import (
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2/auth"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/config"
"github.com/micro/go-micro/v2/debug/profile"
"github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/v2/logger"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/runtime"
"github.com/micro/go-micro/v2/selector"
"github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/v2/transport"
"github.com/asim/go-micro/v3/auth"
"github.com/asim/go-micro/v3/broker"
"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/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"
)
type Cmd interface {

24
cmd/options.go
View File

@ -3,18 +3,18 @@ package cmd
import (
"context"
"github.com/micro/go-micro/v2/auth"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/config"
"github.com/micro/go-micro/v2/debug/profile"
"github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/runtime"
"github.com/micro/go-micro/v2/selector"
"github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/v2/transport"
"github.com/asim/go-micro/v3/auth"
"github.com/asim/go-micro/v3/broker"
"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"
)
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/micro/go-micro/v2/api"
client "github.com/micro/go-micro/v2/client"
server "github.com/micro/go-micro/v2/server"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
)
// Reference imports to suppress errors if they are not otherwise used.

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

@ -4,6 +4,6 @@ go 1.13
require (
github.com/golang/protobuf v1.3.5
github.com/micro/go-micro/v2 v2.4.1-0.20200414211455-9a5b8ff50d31
github.com/asim/go-micro/v3 v2.4.1-0.20200414211455-9a5b8ff50d31
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1
)

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

@ -253,8 +253,8 @@ github.com/mholt/certmagic v0.9.3/go.mod h1:nu8jbsbtwK4205EDH/ZUMTKsfYpJA1Q7MKXH
github.com/micro/cli/v2 v2.1.2 h1:43J1lChg/rZCC1rvdqZNFSQDrGT7qfMrtp6/ztpIkEM=
github.com/micro/cli/v2 v2.1.2/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg=
github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E=
github.com/micro/go-micro/v2 v2.4.1-0.20200414211455-9a5b8ff50d31 h1:WHma0yvZF/QjH72IxGHV+oYui3AhvgL9Xy5WKK06Fb8=
github.com/micro/go-micro/v2 v2.4.1-0.20200414211455-9a5b8ff50d31/go.mod h1:E9E3RGlgxMl5yv7/IITu5jHAxWveL8rLR9kim8EzDJI=
github.com/asim/go-micro/v3 v2.4.1-0.20200414211455-9a5b8ff50d31 h1:WHma0yvZF/QjH72IxGHV+oYui3AhvgL9Xy5WKK06Fb8=
github.com/asim/go-micro/v3 v2.4.1-0.20200414211455-9a5b8ff50d31/go.mod h1:E9E3RGlgxMl5yv7/IITu5jHAxWveL8rLR9kim8EzDJI=
github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=

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/micro/go-micro/v2/api"
apiPkgPath = "github.com/asim/go-micro/v3/api"
contextPkgPath = "context"
clientPkgPath = "github.com/micro/go-micro/v2/client"
serverPkgPath = "github.com/micro/go-micro/v2/server"
clientPkgPath = "github.com/asim/go-micro/v3/client"
serverPkgPath = "github.com/asim/go-micro/v3/server"
)
func init() {

2
codec/bytes/bytes.go
View File

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

2
codec/bytes/marshaler.go
View File

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

2
codec/grpc/grpc.go
View File

@ -8,8 +8,8 @@ import (
"io"
"strings"
"github.com/asim/go-micro/v3/codec"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/v2/codec"
)
type Codec struct {

2
codec/json/json.go
View File

@ -5,9 +5,9 @@ import (
"encoding/json"
"io"
"github.com/asim/go-micro/v3/codec"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/v2/codec"
)
type Codec struct {

2
codec/jsonrpc/client.go
View File

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

2
codec/jsonrpc/jsonrpc.go
View File

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

2
codec/jsonrpc/server.go
View File

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

2
codec/proto/marshaler.go
View File

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

2
codec/proto/proto.go
View File

@ -5,8 +5,8 @@ import (
"io"
"io/ioutil"
"github.com/asim/go-micro/v3/codec"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/v2/codec"
)
type Codec struct {

2
codec/protorpc/protorpc.go
View File

@ -8,8 +8,8 @@ import (
"strconv"
"sync"
"github.com/asim/go-micro/v3/codec"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/v2/codec"
)
type flusher interface {

2
codec/text/text.go
View File

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

8
config/config.go
View File

@ -4,10 +4,10 @@ package config
import (
"context"
"github.com/micro/go-micro/v2/config/loader"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/source"
"github.com/micro/go-micro/v2/config/source/file"
"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"
)
// Config is an interface abstraction for dynamic configuration

10
config/default.go
View File

@ -5,11 +5,11 @@ import (
"sync"
"time"
"github.com/micro/go-micro/v2/config/loader"
"github.com/micro/go-micro/v2/config/loader/memory"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/reader/json"
"github.com/micro/go-micro/v2/config/source"
"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"
)
type config struct {

8
config/default_test.go
View File

@ -9,10 +9,10 @@ import (
"testing"
"time"
"github.com/micro/go-micro/v2/config/source"
"github.com/micro/go-micro/v2/config/source/env"
"github.com/micro/go-micro/v2/config/source/file"
"github.com/micro/go-micro/v2/config/source/memory"
"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"
)
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/micro/go-micro/v2/config/encoder"
"github.com/asim/go-micro/v3/config/encoder"
)
type jsonEncoder struct{}

4
config/loader/loader.go
View File

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

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

@ -9,10 +9,10 @@ import (
"sync"
"time"
"github.com/micro/go-micro/v2/config/loader"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/reader/json"
"github.com/micro/go-micro/v2/config/source"
"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"
)
type memory struct {

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

@ -1,9 +1,9 @@
package memory
import (
"github.com/micro/go-micro/v2/config/loader"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/config/loader"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/loader"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
)
// WithLoader sets the loader for manager config

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

@ -4,11 +4,11 @@ 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"
"github.com/imdario/mergo"
"github.com/micro/go-micro/v2/config/encoder"
"github.com/micro/go-micro/v2/config/encoder/json"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/source"
)
type jsonReader struct {

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

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

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

@ -7,9 +7,9 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/config/reader"
"github.com/asim/go-micro/v3/config/source"
simple "github.com/bitly/go-simplejson"
"github.com/micro/go-micro/v2/config/reader"
"github.com/micro/go-micro/v2/config/source"
)
type jsonValues struct {

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

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

4
config/reader/options.go
View File

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

2
config/reader/reader.go
View File

@ -4,7 +4,7 @@ package reader
import (
"time"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/config/secrets"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/config/secrets"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/config/secrets"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/config/secrets"
"github.com/asim/go-micro/v3/config/secrets"
)
func TestSecretBox(t *testing.T) {

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

@ -7,10 +7,10 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/cmd"
"github.com/asim/go-micro/v3/config/source"
"github.com/imdario/mergo"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2/cmd"
"github.com/micro/go-micro/v2/config/source"
)
type cliSource struct {

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

@ -5,11 +5,11 @@ 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"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2"
"github.com/micro/go-micro/v2/cmd"
"github.com/micro/go-micro/v2/config"
"github.com/micro/go-micro/v2/config/source"
)
func TestCliSourceDefault(t *testing.T) {

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

@ -3,8 +3,8 @@ package cli
import (
"context"
"github.com/asim/go-micro/v3/config/source"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2/config/source"
)
type contextKey struct{}

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

@ -6,8 +6,8 @@ import (
"strings"
"time"
"github.com/asim/go-micro/v3/config/source"
"github.com/imdario/mergo"
"github.com/micro/go-micro/v2/config/source"
)
var (

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

@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/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/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/source"
)
type strippedPrefixKey struct{}

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

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

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

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

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

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

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

@ -3,7 +3,7 @@ package file
import (
"strings"
"github.com/micro/go-micro/v2/config/encoder"
"github.com/asim/go-micro/v3/config/encoder"
)
func format(p string, e encoder.Encoder) string {

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

@ -3,7 +3,7 @@ package file
import (
"testing"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/source"
)
func TestFormat(t *testing.T) {

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

@ -3,7 +3,7 @@ package file
import (
"context"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/source"
)
type filePathKey struct{}

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

@ -5,8 +5,8 @@ package file
import (
"os"
"github.com/asim/go-micro/v3/config/source"
"github.com/fsnotify/fsnotify"
"github.com/micro/go-micro/v2/config/source"
)
type watcher struct {

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

@ -5,8 +5,8 @@ package file
import (
"os"
"github.com/asim/go-micro/v3/config/source"
"github.com/fsnotify/fsnotify"
"github.com/micro/go-micro/v2/config/source"
)
type watcher struct {

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

@ -3,8 +3,8 @@ package flag
import (
"errors"
"flag"
"github.com/asim/go-micro/v3/config/source"
"github.com/imdario/mergo"
"github.com/micro/go-micro/v2/config/source"
"strings"
"time"
)

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

@ -3,7 +3,7 @@ package flag
import (
"context"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/source"
)
type includeUnsetKey struct{}

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

@ -5,8 +5,8 @@ import (
"sync"
"time"
"github.com/asim/go-micro/v3/config/source"
"github.com/google/uuid"
"github.com/micro/go-micro/v2/config/source"
)
type memory struct {

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

@ -3,7 +3,7 @@ package memory
import (
"context"
"github.com/micro/go-micro/v2/config/source"
"github.com/asim/go-micro/v3/config/source"
)
type changeSetKey struct{}

2
config/source/memory/watcher.go
View File

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

6
config/source/options.go
View File

@ -3,9 +3,9 @@ package source
import (
"context"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/config/encoder"
"github.com/micro/go-micro/v2/config/encoder/json"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/v3/config/encoder"
"github.com/asim/go-micro/v3/config/encoder/json"
)
type Options struct {

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