unistack-org
/
micro
3
0
Fork 3
Code Issues 16 Pull Requests 2 Actions Packages Projects Releases 237 Wiki Activity

fix import paths for v2 release 

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-01-30 14:39:00 +03:00
parent 2b1e0a6fd6
commit f23638c036
347 changed files with 864 additions and 820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/input/discord/conn.go
View File

@ -6,8 +6,8 @@ import (
"sync" "sync"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/micro/go-micro/agent/input" "github.com/micro/go-micro/v2/agent/input"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
type discordConn struct { type discordConn struct {

2
agent/input/discord/discord.go
View File

@ -9,7 +9,7 @@ import (
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/micro/cli/v2" "github.com/micro/cli/v2"
"github.com/micro/go-micro/agent/input" "github.com/micro/go-micro/v2/agent/input"
) )
func init() { func init() {

2
agent/input/slack/conn.go
View File

@ -7,7 +7,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/agent/input" "github.com/micro/go-micro/v2/agent/input"
"github.com/nlopes/slack" "github.com/nlopes/slack"
) )

2
agent/input/slack/slack.go
View File

@ -5,7 +5,7 @@ import (
"sync" "sync"
"github.com/micro/cli/v2" "github.com/micro/cli/v2"
"github.com/micro/go-micro/agent/input" "github.com/micro/go-micro/v2/agent/input"
"github.com/nlopes/slack" "github.com/nlopes/slack"
) )

4
agent/input/telegram/conn.go
View File

@ -6,8 +6,8 @@ import (
"sync" "sync"
"github.com/forestgiant/sliceutil" "github.com/forestgiant/sliceutil"
"github.com/micro/go-micro/agent/input" "github.com/micro/go-micro/v2/agent/input"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
tgbotapi "gopkg.in/telegram-bot-api.v4" tgbotapi "gopkg.in/telegram-bot-api.v4"
) )

2
agent/input/telegram/telegram.go
View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"github.com/micro/cli/v2" "github.com/micro/cli/v2"
"github.com/micro/go-micro/agent/input" "github.com/micro/go-micro/v2/agent/input"
tgbotapi "gopkg.in/telegram-bot-api.v4" tgbotapi "gopkg.in/telegram-bot-api.v4"
) )

4
agent/proto/bot.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// source: github.com/micro/go-micro/agent/proto/bot.proto // source: github.com/micro/go-micro/v2/agent/proto/bot.proto
package go_micro_bot package go_micro_bot
@ -192,7 +192,7 @@ func init() {
} }
func init() { func init() {
proto.RegisterFile("github.com/micro/go-micro/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12) proto.RegisterFile("github.com/micro/go-micro/v2/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12)
} }
var fileDescriptor_018e8d5b14a89d12 = []byte{ var fileDescriptor_018e8d5b14a89d12 = []byte{

6
agent/proto/bot.pb.micro.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-micro. DO NOT EDIT. // Code generated by protoc-gen-micro. DO NOT EDIT.
// source: github.com/micro/go-micro/agent/proto/bot.proto // source: github.com/micro/go-micro/v2/agent/proto/bot.proto
package go_micro_bot package go_micro_bot
@ -11,8 +11,8 @@ import (
import ( import (
context "context" context "context"
client "github.com/micro/go-micro/client" client "github.com/micro/go-micro/v2/client"
server "github.com/micro/go-micro/server" server "github.com/micro/go-micro/v2/server"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

4
api/api.go
View File

@ -5,8 +5,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
) )
// Endpoint is a mapping between an RPC method and HTTP endpoint // Endpoint is a mapping between an RPC method and HTTP endpoint

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

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

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

@ -8,9 +8,9 @@ import (
"net/http" "net/http"
"strings" "strings"
api "github.com/micro/go-micro/api/proto" api "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
func requestToProto(r *http.Request) (*api.Request, error) { func requestToProto(r *http.Request) (*api.Request, error) {

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

@ -11,9 +11,9 @@ import (
"time" "time"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
const ( const (

4
api/handler/cloudevents/cloudevents.go
View File

@ -7,8 +7,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/util/ctx" "github.com/micro/go-micro/v2/util/ctx"
) )
type event struct { type event struct {

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

@ -12,9 +12,9 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/v2/api/handler"
proto "github.com/micro/go-micro/api/proto" proto "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/util/ctx" "github.com/micro/go-micro/v2/util/ctx"
) )
type event struct { type event struct {

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

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

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

@ -6,11 +6,11 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/api/router" "github.com/micro/go-micro/v2/api/router"
regRouter "github.com/micro/go-micro/api/router/registry" regRouter "github.com/micro/go-micro/v2/api/router/registry"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/registry/memory" "github.com/micro/go-micro/v2/registry/memory"
) )
func testHttp(t *testing.T, path, service, ns string) { func testHttp(t *testing.T, path, service, ns string) {

4
api/handler/options.go
View File

@ -1,8 +1,8 @@
package handler package handler
import ( import (
"github.com/micro/go-micro" "github.com/micro/go-micro/v2"
"github.com/micro/go-micro/api/router" "github.com/micro/go-micro/v2/api/router"
) )
type Options struct { type Options struct {

4
api/handler/registry/registry.go
View File

@ -9,8 +9,8 @@ import (
"time" "time"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
const ( const (

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

@ -10,17 +10,17 @@ import (
"strings" "strings"
"github.com/joncalhoun/qson" "github.com/joncalhoun/qson"
"github.com/micro/go-micro/api" "github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/v2/api/handler"
proto "github.com/micro/go-micro/api/internal/proto" proto "github.com/micro/go-micro/v2/api/internal/proto"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/codec/jsonrpc" "github.com/micro/go-micro/v2/codec/jsonrpc"
"github.com/micro/go-micro/codec/protorpc" "github.com/micro/go-micro/v2/codec/protorpc"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/util/ctx" "github.com/micro/go-micro/v2/util/ctx"
) )
const ( const (

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

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
go_api "github.com/micro/go-micro/api/proto" go_api "github.com/micro/go-micro/v2/api/proto"
) )
func TestRequestPayloadFromRequest(t *testing.T) { func TestRequestPayloadFromRequest(t *testing.T) {

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

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

4
api/proto/api.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// source: github.com/micro/go-micro/api/proto/api.proto // source: github.com/micro/go-micro/v2/api/proto/api.proto
package go_api package go_api
@ -304,7 +304,7 @@ func init() {
} }
func init() { func init() {
proto.RegisterFile("github.com/micro/go-micro/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943) proto.RegisterFile("github.com/micro/go-micro/v2/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943)
} }
var fileDescriptor_7b6696ef87ec1943 = []byte{ var fileDescriptor_7b6696ef87ec1943 = []byte{

2
api/proto/api.pb.micro.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-micro. DO NOT EDIT. // Code generated by protoc-gen-micro. DO NOT EDIT.
// source: github.com/micro/go-micro/api/proto/api.proto // source: github.com/micro/go-micro/v2/api/proto/api.proto
package go_api package go_api

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

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

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

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

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

@ -4,7 +4,7 @@ package micro
import ( import (
"net/http" "net/http"
"github.com/micro/go-micro/api/resolver" "github.com/micro/go-micro/v2/api/resolver"
) )
// default resolver for legacy purposes // default resolver for legacy purposes

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

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

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

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

6
api/router/options.go
View File

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

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

@ -11,10 +11,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/api" "github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/api/router" "github.com/micro/go-micro/v2/api/router"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/registry/cache" "github.com/micro/go-micro/v2/registry/cache"
) )
// router is the default router // router is the default router

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

@ -6,7 +6,7 @@ import (
"net/url" "net/url"
"testing" "testing"
"github.com/micro/go-micro/api" "github.com/micro/go-micro/v2/api"
) )
func TestSetNamespace(t *testing.T) { func TestSetNamespace(t *testing.T) {

2
api/router/router.go
View File

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

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

@ -5,7 +5,7 @@ package autocert
import ( import (
"net" "net"
"github.com/micro/go-micro/api/server/acme" "github.com/micro/go-micro/v2/api/server/acme"
"golang.org/x/crypto/acme/autocert" "golang.org/x/crypto/acme/autocert"
) )

2
api/server/acme/certmagic/certmagic.go
View File

@ -9,7 +9,7 @@ import (
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
"github.com/micro/go-micro/api/server/acme" "github.com/micro/go-micro/v2/api/server/acme"
) )
type certmagicProvider struct { type certmagicProvider struct {

6
api/server/acme/certmagic/certmagic_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/go-acme/lego/v3/providers/dns/cloudflare" "github.com/go-acme/lego/v3/providers/dns/cloudflare"
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
"github.com/micro/go-micro/api/server/acme" "github.com/micro/go-micro/v2/api/server/acme"
cfstore "github.com/micro/go-micro/store/cloudflare" cfstore "github.com/micro/go-micro/v2/store/cloudflare"
"github.com/micro/go-micro/sync/lock/memory" "github.com/micro/go-micro/v2/sync/lock/memory"
) )
func TestCertMagic(t *testing.T) { func TestCertMagic(t *testing.T) {

4
api/server/acme/certmagic/storage.go
View File

@ -10,8 +10,8 @@ import (
"time" "time"
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
"github.com/micro/go-micro/store" "github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/sync/lock" "github.com/micro/go-micro/v2/sync/lock"
) )
// File represents a "File" that will be stored in store.Store - the contents and last modified time // File represents a "File" that will be stored in store.Store - the contents and last modified time

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

@ -9,8 +9,8 @@ import (
"sync" "sync"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/micro/go-micro/api/server" "github.com/micro/go-micro/v2/api/server"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
type httpServer struct { type httpServer struct {

2
api/server/options.go
View File

@ -3,7 +3,7 @@ package server
import ( import (
"crypto/tls" "crypto/tls"
"github.com/micro/go-micro/api/server/acme" "github.com/micro/go-micro/v2/api/server/acme"
) )
type Option func(o *Options) type Option func(o *Options)

8
broker/default.go
View File

@ -10,10 +10,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/codec/json" "github.com/micro/go-micro/v2/codec/json"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/util/addr" "github.com/micro/go-micro/v2/util/addr"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
"github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats-server/v2/server"
nats "github.com/nats-io/nats.go" nats "github.com/nats-io/nats.go"
) )

6
broker/memory/memory.go
View File

@ -8,9 +8,9 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
maddr "github.com/micro/go-micro/util/addr" maddr "github.com/micro/go-micro/v2/util/addr"
mnet "github.com/micro/go-micro/util/net" mnet "github.com/micro/go-micro/v2/util/net"
) )
type memoryBroker struct { type memoryBroker struct {

2
broker/memory/memory_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
) )
func TestMemoryBroker(t *testing.T) { func TestMemoryBroker(t *testing.T) {

2
broker/nats/context.go
View File

@ -3,7 +3,7 @@ package nats
import ( import (
"context" "context"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
) )
// setSubscribeOption returns a function to setup a context with given value // setSubscribeOption returns a function to setup a context with given value

10
broker/nats/nats.go
View File

@ -11,11 +11,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/codec/json" "github.com/micro/go-micro/v2/codec/json"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/util/addr" "github.com/micro/go-micro/v2/util/addr"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
"github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats-server/v2/server"
nats "github.com/nats-io/nats.go" nats "github.com/nats-io/nats.go"
) )

2
broker/nats/nats_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
nats "github.com/nats-io/nats.go" nats "github.com/nats-io/nats.go"
) )

2
broker/nats/options.go
View File

@ -1,7 +1,7 @@
package nats package nats
import ( import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
nats "github.com/nats-io/nats.go" nats "github.com/nats-io/nats.go"
) )

4
broker/options.go
View File

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

4
broker/service/proto/broker.pb.micro.go
View File

@ -11,8 +11,8 @@ import (
import ( import (
context "context" context "context"
client "github.com/micro/go-micro/client" client "github.com/micro/go-micro/v2/client"
server "github.com/micro/go-micro/server" server "github.com/micro/go-micro/v2/server"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

8
broker/service/service.go
View File

@ -5,10 +5,10 @@ import (
"context" "context"
"time" "time"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
pb "github.com/micro/go-micro/broker/service/proto" pb "github.com/micro/go-micro/v2/broker/service/proto"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
type serviceBroker struct { type serviceBroker struct {

6
broker/service/subscriber.go
View File

@ -1,9 +1,9 @@
package service package service
import ( import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
pb "github.com/micro/go-micro/broker/service/proto" pb "github.com/micro/go-micro/v2/broker/service/proto"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
type serviceSub struct { type serviceSub struct {

2
client/client.go
View File

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

2
client/common_test.go
View File

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

4
client/grpc/codec.go
View File

@ -9,8 +9,8 @@ import (
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/codec/bytes" "github.com/micro/go-micro/v2/codec/bytes"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

2
client/grpc/error.go
View File

@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )

14
client/grpc/grpc.go
View File

@ -9,13 +9,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
raw "github.com/micro/go-micro/codec/bytes" raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/metadata" "github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"

8
client/grpc/grpc_test.go
View File

@ -5,10 +5,10 @@ import (
"net" "net"
"testing" "testing"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/registry/memory" "github.com/micro/go-micro/v2/registry/memory"
pgrpc "google.golang.org/grpc" pgrpc "google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld" pb "google.golang.org/grpc/examples/helloworld/helloworld"
) )

2
client/grpc/message.go
View File

@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
) )
type grpcEvent struct { type grpcEvent struct {

2
client/grpc/options.go
View File

@ -5,7 +5,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

4
client/grpc/request.go
View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
) )
type grpcRequest struct { type grpcRequest struct {

4
client/grpc/response.go
View File

@ -3,8 +3,8 @@ package grpc
import ( import (
"strings" "strings"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/codec/bytes" "github.com/micro/go-micro/v2/codec/bytes"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

2
client/grpc/stream.go
View File

@ -5,7 +5,7 @@ import (
"io" "io"
"sync" "sync"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
client/mucp/mucp.go
View File

@ -2,7 +2,7 @@
package mucp package mucp
import ( import (
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
) )
// NewClient returns a new micro client interface // NewClient returns a new micro client interface

10
client/options.go
View File

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

2
client/options_test.go
View File

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

2
client/retry.go
View File

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

20
client/rpc_client.go
View File

@ -9,16 +9,16 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
raw "github.com/micro/go-micro/codec/bytes" raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/metadata" "github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/v2/transport"
"github.com/micro/go-micro/util/buf" "github.com/micro/go-micro/v2/util/buf"
"github.com/micro/go-micro/util/pool" "github.com/micro/go-micro/v2/util/pool"
) )
type rpcClient struct { type rpcClient struct {

8
client/rpc_client_test.go
View File

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

20
client/rpc_codec.go
View File

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

2
client/rpc_request.go
View File

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

4
client/rpc_response.go
View File

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

2
client/rpc_stream.go
View File

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

2
client/selector/common_test.go
View File

@ -1,7 +1,7 @@
package selector package selector
import ( import (
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
var ( var (

4
client/selector/default.go
View File

@ -3,8 +3,8 @@ package selector
import ( import (
"time" "time"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/registry/cache" "github.com/micro/go-micro/v2/registry/cache"
) )
type registrySelector struct { type registrySelector struct {

2
client/selector/default_test.go
View File

@ -3,7 +3,7 @@ package selector
import ( import (
"testing" "testing"
"github.com/micro/go-micro/registry/memory" "github.com/micro/go-micro/v2/registry/memory"
) )
func TestRegistrySelector(t *testing.T) { func TestRegistrySelector(t *testing.T) {

4
client/selector/dns/dns.go
View File

@ -6,8 +6,8 @@ import (
"net" "net"
"strconv" "strconv"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
type dnsSelector struct { type dnsSelector struct {

2
client/selector/filter.go
View File

@ -1,7 +1,7 @@
package selector package selector
import ( import (
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
// FilterEndpoint is an endpoint based Select Filter which will // FilterEndpoint is an endpoint based Select Filter which will

2
client/selector/filter_test.go
View File

@ -3,7 +3,7 @@ package selector
import ( import (
"testing" "testing"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
func TestFilterEndpoint(t *testing.T) { func TestFilterEndpoint(t *testing.T) {

2
client/selector/options.go
View File

@ -3,7 +3,7 @@ package selector
import ( import (
"context" "context"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
type Options struct { type Options struct {

2
client/selector/registry/options.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
) )
// Set the registry cache ttl // Set the registry cache ttl

2
client/selector/registry/registry.go
View File

@ -2,7 +2,7 @@
package registry package registry
import ( import (
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
) )
// NewSelector returns a new registry selector // NewSelector returns a new registry selector

10
client/selector/router/router.go
View File

@ -7,11 +7,11 @@ import (
"sort" "sort"
"sync" "sync"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/router" "github.com/micro/go-micro/v2/router"
pb "github.com/micro/go-micro/router/service/proto" pb "github.com/micro/go-micro/v2/router/service/proto"
) )
type routerSelector struct { type routerSelector struct {

2
client/selector/selector.go
View File

@ -4,7 +4,7 @@ package selector
import ( import (
"errors" "errors"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
// Selector builds on the registry as a mechanism to pick nodes // Selector builds on the registry as a mechanism to pick nodes

4
client/selector/static/static.go
View File

@ -2,8 +2,8 @@
package static package static
import ( import (
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
// staticSelector is a static selector // staticSelector is a static selector

2
client/selector/strategy.go
View File

@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
func init() { func init() {

2
client/selector/strategy_test.go
View File

@ -3,7 +3,7 @@ package selector
import ( import (
"testing" "testing"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
func TestStrategies(t *testing.T) { func TestStrategies(t *testing.T) {

4
client/service/proto/client.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// source: github.com/micro/go-micro/client/proto/client.proto // source: github.com/micro/go-micro/v2/client/proto/client.proto
package go_micro_client package go_micro_client
@ -184,7 +184,7 @@ func init() {
} }
func init() { func init() {
proto.RegisterFile("github.com/micro/go-micro/client/proto/client.proto", fileDescriptor_d418333f021a3308) proto.RegisterFile("github.com/micro/go-micro/v2/client/proto/client.proto", fileDescriptor_d418333f021a3308)
} }
var fileDescriptor_d418333f021a3308 = []byte{ var fileDescriptor_d418333f021a3308 = []byte{

6
client/service/proto/client.pb.micro.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-micro. DO NOT EDIT. // Code generated by protoc-gen-micro. DO NOT EDIT.
// source: github.com/micro/go-micro/client/proto/client.proto // source: github.com/micro/go-micro/v2/client/proto/client.proto
package go_micro_client package go_micro_client
@ -11,8 +11,8 @@ import (
import ( import (
context "context" context "context"
client "github.com/micro/go-micro/client" client "github.com/micro/go-micro/v2/client"
server "github.com/micro/go-micro/server" server "github.com/micro/go-micro/v2/server"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

2
client/wrapper.go
View File

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

2
codec/bytes/bytes.go
View File

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

2
codec/grpc/grpc.go
View File

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

2
codec/json/json.go
View File

@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
) )
type Codec struct { type Codec struct {

2
codec/jsonrpc/client.go
View File

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

2
codec/jsonrpc/jsonrpc.go
View File

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

2
codec/jsonrpc/server.go
View File

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

2
codec/proto/proto.go
View File

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

2
codec/protorpc/protorpc.go
View File

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

2
codec/text/text.go
View File

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

62
config/cmd/cmd.go
View File

@ -7,54 +7,54 @@ import (
"strings" "strings"
"time" "time"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/debug/trace" "github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/runtime" "github.com/micro/go-micro/v2/runtime"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/store" "github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/v2/transport"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
// clients // clients
cgrpc "github.com/micro/go-micro/client/grpc" cgrpc "github.com/micro/go-micro/v2/client/grpc"
cmucp "github.com/micro/go-micro/client/mucp" cmucp "github.com/micro/go-micro/v2/client/mucp"
// servers // servers
"github.com/micro/cli/v2" "github.com/micro/cli/v2"
sgrpc "github.com/micro/go-micro/server/grpc" sgrpc "github.com/micro/go-micro/v2/server/grpc"
smucp "github.com/micro/go-micro/server/mucp" smucp "github.com/micro/go-micro/v2/server/mucp"
// brokers // brokers
"github.com/micro/go-micro/broker/memory" "github.com/micro/go-micro/v2/broker/memory"
"github.com/micro/go-micro/broker/nats" "github.com/micro/go-micro/v2/broker/nats"
brokerSrv "github.com/micro/go-micro/broker/service" brokerSrv "github.com/micro/go-micro/v2/broker/service"
// registries // registries
"github.com/micro/go-micro/registry/etcd" "github.com/micro/go-micro/v2/registry/etcd"
kreg "github.com/micro/go-micro/registry/kubernetes" kreg "github.com/micro/go-micro/v2/registry/kubernetes"
"github.com/micro/go-micro/registry/mdns" "github.com/micro/go-micro/v2/registry/mdns"
rmem "github.com/micro/go-micro/registry/memory" rmem "github.com/micro/go-micro/v2/registry/memory"
regSrv "github.com/micro/go-micro/registry/service" regSrv "github.com/micro/go-micro/v2/registry/service"
// selectors // selectors
"github.com/micro/go-micro/client/selector/dns" "github.com/micro/go-micro/v2/client/selector/dns"
"github.com/micro/go-micro/client/selector/router" "github.com/micro/go-micro/v2/client/selector/router"
"github.com/micro/go-micro/client/selector/static" "github.com/micro/go-micro/v2/client/selector/static"
// transports // transports
thttp "github.com/micro/go-micro/transport/http" thttp "github.com/micro/go-micro/v2/transport/http"
tmem "github.com/micro/go-micro/transport/memory" tmem "github.com/micro/go-micro/v2/transport/memory"
// stores // stores
memStore "github.com/micro/go-micro/store/memory" memStore "github.com/micro/go-micro/v2/store/memory"
svcStore "github.com/micro/go-micro/store/service" svcStore "github.com/micro/go-micro/v2/store/service"
// tracers // tracers
// jTracer "github.com/micro/go-micro/debug/trace/jaeger" // jTracer "github.com/micro/go-micro/v2/debug/trace/jaeger"
memTracer "github.com/micro/go-micro/debug/trace/memory" memTracer "github.com/micro/go-micro/v2/debug/trace/memory"
) )
type Cmd interface { type Cmd interface {

18
config/cmd/options.go
View File

@ -3,15 +3,15 @@ package cmd
import ( import (
"context" "context"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/debug/trace" "github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/runtime" "github.com/micro/go-micro/v2/runtime"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/store" "github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/v2/transport"
) )
type Options struct { type Options struct {

8
config/config.go
View File

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

10
config/default.go
View File

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

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