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

View File

@@ -7,8 +7,8 @@ import (
"sync"
"time"
"github.com/micro/go-micro/registry"
log "github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/registry"
log "github.com/micro/go-micro/v2/util/log"
)
// Cache is the registry cache interface

View File

@@ -15,8 +15,8 @@ import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/util/log"
hash "github.com/mitchellh/hashstructure"
"go.uber.org/zap"
)

View File

@@ -3,7 +3,7 @@ package etcd
import (
"context"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
"go.uber.org/zap"
)

View File

@@ -6,7 +6,7 @@ import (
"time"
"github.com/coreos/etcd/clientv3"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
type etcdWatcher struct {

View File

@@ -10,8 +10,8 @@ import (
"strings"
"time"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/util/kubernetes/client"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/util/kubernetes/client"
)
type kregistry struct {

View File

@@ -6,9 +6,9 @@ import (
"strings"
"sync"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/util/kubernetes/client"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/util/kubernetes/client"
"github.com/micro/go-micro/v2/util/log"
)
type k8sWatcher struct {

View File

@@ -4,7 +4,7 @@ package mdns
import (
"context"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
// NewRegistry returns a new mdns registry

View File

@@ -7,8 +7,8 @@ import (
"time"
"github.com/google/uuid"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/util/log"
)
var (

View File

@@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
var (

View File

@@ -3,7 +3,7 @@ package memory
import (
"errors"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
type memoryWatcher struct {

View File

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

View File

@@ -3,7 +3,7 @@ package memory
import (
"time"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
func serviceToRecord(s *registry.Service, ttl time.Duration) *record {

View File

@@ -3,7 +3,7 @@ package memory
import (
"errors"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
type Watcher struct {

View File

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

View File

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

View File

@@ -5,10 +5,10 @@ import (
"context"
"time"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/grpc"
"github.com/micro/go-micro/registry"
pb "github.com/micro/go-micro/registry/service/proto"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/client/grpc"
"github.com/micro/go-micro/v2/registry"
pb "github.com/micro/go-micro/v2/registry/service/proto"
)
var (

View File

@@ -1,8 +1,8 @@
package service
import (
"github.com/micro/go-micro/registry"
pb "github.com/micro/go-micro/registry/service/proto"
"github.com/micro/go-micro/v2/registry"
pb "github.com/micro/go-micro/v2/registry/service/proto"
)
func values(v []*registry.Value) []*pb.Value {

View File

@@ -1,8 +1,8 @@
package service
import (
"github.com/micro/go-micro/registry"
pb "github.com/micro/go-micro/registry/service/proto"
"github.com/micro/go-micro/v2/registry"
pb "github.com/micro/go-micro/v2/registry/service/proto"
)
type serviceWatcher struct {