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

@@ -9,8 +9,8 @@ import (
"github.com/imdario/mergo"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/config/cmd"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/cmd"
"github.com/micro/go-micro/v2/config/source"
)
type cliSource struct {

View File

@@ -6,8 +6,8 @@ import (
"testing"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/config/cmd"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/cmd"
"github.com/micro/go-micro/v2/config/source"
)
func test(t *testing.T, withContext bool) {

View File

@@ -4,7 +4,7 @@ import (
"context"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
type contextKey struct{}

View File

@@ -7,7 +7,7 @@ import (
"time"
"github.com/imdario/mergo"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
var (

View File

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

View File

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

View File

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

View File

@@ -8,7 +8,7 @@ import (
cetcd "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
// Currently a single etcd reader

View File

@@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
type addressKey struct{}

View File

@@ -5,7 +5,7 @@ import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb"
"github.com/micro/go-micro/config/encoder"
"github.com/micro/go-micro/v2/config/encoder"
)
func makeEvMap(e encoder.Encoder, data map[string]interface{}, kv []*clientv3.Event, stripPrefix string) map[string]interface{} {

View File

@@ -7,7 +7,7 @@ import (
"time"
cetcd "github.com/coreos/etcd/clientv3"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
type watcher struct {

View File

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

View File

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

View File

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

View File

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

View File

@@ -6,7 +6,7 @@ import (
"os"
"github.com/fsnotify/fsnotify"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
type watcher struct {

View File

@@ -6,7 +6,7 @@ import (
"os"
"github.com/fsnotify/fsnotify"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
type watcher struct {

View File

@@ -4,7 +4,7 @@ import (
"errors"
"flag"
"github.com/imdario/mergo"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
"strings"
"time"
)

View File

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

View File

@@ -6,7 +6,7 @@ import (
"time"
"github.com/google/uuid"
"github.com/micro/go-micro/config/source"
"github.com/micro/go-micro/v2/config/source"
)
type memory struct {

View File

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

View File

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

View File

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

View File

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

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

@@ -3,10 +3,10 @@ package service
import (
"context"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/config/source"
proto "github.com/micro/go-micro/config/source/service/proto"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/config/source"
proto "github.com/micro/go-micro/v2/config/source/service/proto"
"github.com/micro/go-micro/v2/util/log"
)
var (

View File

@@ -3,8 +3,8 @@ package service
import (
"time"
"github.com/micro/go-micro/config/source"
proto "github.com/micro/go-micro/config/source/service/proto"
"github.com/micro/go-micro/v2/config/source"
proto "github.com/micro/go-micro/v2/config/source/service/proto"
)
func toChangeSet(c *proto.ChangeSet) *source.ChangeSet {

View File

@@ -1,8 +1,8 @@
package service
import (
"github.com/micro/go-micro/config/source"
proto "github.com/micro/go-micro/config/source/service/proto"
"github.com/micro/go-micro/v2/config/source"
proto "github.com/micro/go-micro/v2/config/source/service/proto"
)
type watcher struct {