update imports

Author: asim

api/api.go

@@ -23,7 +23,7 @@ import (
 	regRouter "github.com/micro/go-api/router/registry"
 	"github.com/micro/go-api/server"
 	httpapi "github.com/micro/go-api/server/http"
-	"github.com/micro/go-log"
+	"github.com/micro/go-micro/util/log"
 	"github.com/micro/go-micro"
 	"github.com/micro/micro/internal/handler"
 	"github.com/micro/micro/internal/helper"

bot/bot.go

@@ -14,17 +14,17 @@ import (
 	"github.com/micro/cli"
 	"github.com/micro/go-micro"
 
-	"github.com/micro/go-bot/command"
-	"github.com/micro/go-bot/input"
-	"github.com/micro/go-log"
+	"github.com/micro/go-micro/agent/command"
+	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/util/log"
 	botc "github.com/micro/micro/internal/command/bot"
 
-	proto "github.com/micro/go-bot/proto"
+	proto "github.com/micro/go-micro/agent/proto"
 
 	// inputs
-	_ "github.com/micro/go-bot/input/discord"
-	_ "github.com/micro/go-bot/input/slack"
-	_ "github.com/micro/go-bot/input/telegram"
+	_ "github.com/micro/go-micro/agent/input/discord"
+	_ "github.com/micro/go-micro/agent/input/slack"
+	_ "github.com/micro/go-micro/agent/input/telegram"
 )
 
 type bot struct {

bot/bot_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/micro/cli"
-	"github.com/micro/go-bot/command"
-	"github.com/micro/go-bot/input"
+	"github.com/micro/go-micro/agent/command"
+	"github.com/micro/go-micro/agent/input"
 
 	"github.com/micro/go-micro"
 	"github.com/micro/go-micro/registry/memory"

bot/sort.go

@@ -1,7 +1,7 @@
 package bot
 
 import (
-	"github.com/micro/go-bot/command"
+	"github.com/micro/go-micro/agent/command"
 )
 
 type sortedCommands struct {

cmd/health/main.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/micro/cli"
-	"github.com/micro/go-log"
+	"github.com/micro/go-micro/util/log"
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/cmd"
 	proto "github.com/micro/go-micro/server/debug/proto"

go.mod

@@ -1,105 +1,153 @@
 module github.com/micro/micro
 
 require (
-	contrib.go.opencensus.io/exporter/stackdriver v0.11.1 // indirect
-	contrib.go.opencensus.io/resource v0.0.0-20190529194238-c636715d9681 // indirect
+	contrib.go.opencensus.io/exporter/stackdriver v0.12.0 // indirect
 	dmitri.shuralyov.com/app/changes v0.0.0-20190416035755-036c35ce260f // indirect
 	dmitri.shuralyov.com/service/change v0.0.0-20190416035443-a1ef85d7455f // indirect
 	github.com/99designs/gqlgen v0.9.0 // indirect
 	github.com/Azure/azure-sdk-for-go v30.0.0+incompatible // indirect
 	github.com/Azure/azure-service-bus-go v0.7.0 // indirect
+	github.com/Azure/go-autorest v12.1.0+incompatible // indirect
+	github.com/DataDog/dd-trace-go v1.14.0 // indirect
 	github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190507215335-7265f74d826f // indirect
-	github.com/Sirupsen/logrus v1.0.6 // indirect
+	github.com/Jeffail/gabs v1.4.0 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/SAP/go-hdb v0.14.1 // indirect
+	github.com/Shopify/sarama v1.22.1 // indirect
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/aclements/go-moremath v0.0.0-20190506201756-286cc0be6f75 // indirect
-	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190530073359-dfac1ef71ffa // indirect
+	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190531090255-da3a70fec85f // indirect
 	github.com/aliyun/aliyun-oss-go-sdk v1.9.8 // indirect
-	github.com/apache/arrow/go/arrow v0.0.0-20190530080309-c8466cd2e83f // indirect
-	github.com/aws/aws-sdk-go v1.19.40 // indirect
+	github.com/apache/arrow/go/arrow v0.0.0-20190531152918-dbeab70863c4 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
+	github.com/aws/aws-sdk-go v1.19.41 // indirect
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
+	github.com/coredns/coredns v1.5.0 // indirect
+	github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 // indirect
+	github.com/denverdino/aliyungo v0.0.0-20190410085603-611ead8a6fed // indirect
+	github.com/digitalocean/godo v1.15.0 // indirect
 	github.com/dnstap/golang-dnstap v0.1.0 // indirect
 	github.com/eclipse/paho.mqtt.golang v1.2.0 // indirect
+	github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
+	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
+	github.com/envoyproxy/go-control-plane v0.8.0 // indirect
+	github.com/evanphx/json-patch v4.2.0+incompatible // indirect
+	github.com/farsightsec/golang-framestream v0.0.0-20190425193708-fa4b164d59b8 // indirect
+	github.com/gammazero/workerpool v0.0.0-20190521015540-3b91a70bc0a1 // indirect
 	github.com/getkin/kin-openapi v0.2.0 // indirect
 	github.com/gin-gonic/gin v1.4.0 // indirect
-	github.com/gliderlabs/ssh v0.1.4 // indirect
 	github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
 	github.com/go-acme/lego v2.6.0+incompatible // indirect
+	github.com/go-ldap/ldap v3.0.3+incompatible // indirect
+	github.com/go-ole/go-ole v1.2.4 // indirect
+	github.com/go-openapi/jsonpointer v0.19.0 // indirect
+	github.com/go-openapi/jsonreference v0.19.0 // indirect
+	github.com/go-openapi/spec v0.19.0 // indirect
+	github.com/go-openapi/swag v0.19.0 // indirect
+	github.com/go-stomp/stomp v2.0.3+incompatible // indirect
 	github.com/gocql/gocql v0.0.0-20190523124812-0680bfb96414 // indirect
 	github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721 // indirect
 	github.com/golang/lint v0.0.0-20190409202823-959b441ac422 // indirect
 	github.com/golang/protobuf v1.3.1
-	github.com/google/go-github/v25 v25.1.0 // indirect
+	github.com/google/go-github/v25 v25.1.1 // indirect
+	github.com/google/gofuzz v1.0.0 // indirect
 	github.com/google/uuid v1.1.1
 	github.com/gophercloud/gophercloud v0.1.0 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
 	github.com/goreleaser/goreleaser v0.108.0 // indirect
 	github.com/gorilla/mux v1.7.2
-	github.com/hashicorp/consul v1.5.1 // indirect
+	github.com/hashicorp/consul v1.5.1
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-discover v0.0.0-20190522154730-8aba54d36e17 // indirect
+	github.com/hashicorp/go-hclog v0.9.2 // indirect
 	github.com/hashicorp/go-memdb v1.0.3 // indirect
+	github.com/hashicorp/go-version v1.2.0 // indirect
+	github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
 	github.com/hashicorp/nomad v0.9.1 // indirect
-	github.com/hashicorp/nomad/api v0.0.0-20190529164939-86a6569933bd // indirect
 	github.com/hashicorp/raft v1.1.0 // indirect
+	github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea // indirect
+	github.com/hashicorp/vault v1.1.2 // indirect
+	github.com/hashicorp/vault-plugin-auth-alicloud v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-auth-azure v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-auth-centrify v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-auth-jwt v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-auth-kubernetes v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-secrets-ad v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-secrets-alicloud v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-secrets-azure v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-secrets-gcp v0.5.2 // indirect
+	github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.1 // indirect
+	github.com/hashicorp/vault-plugin-secrets-kv v0.5.1 // indirect
+	github.com/hashicorp/vault/api v1.0.2 // indirect
+	github.com/hashicorp/vault/sdk v0.1.11 // indirect
 	github.com/influxdata/flux v0.31.1 // indirect
+	github.com/influxdata/influxdb v1.7.6 // indirect
 	github.com/influxdata/influxql v1.0.0 // indirect
 	github.com/influxdata/line-protocol v0.0.0-20190509173118-5712a8124a9a // indirect
+	github.com/jarcoal/httpmock v1.0.4 // indirect
 	github.com/kamilsk/retry/v4 v4.1.0 // indirect
+	github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757 // indirect
+	github.com/klauspost/cpuid v1.2.1 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/lib/pq v1.1.1 // indirect
 	github.com/linode/linodego v0.9.0 // indirect
-	github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018 // indirect
+	github.com/lucas-clemente/quic-go v0.11.2 // indirect
+	github.com/lyft/protoc-gen-validate v0.0.14 // indirect
 	github.com/magiconair/properties v1.8.1 // indirect
-	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 // indirect
 	github.com/mattn/go-tty v0.0.0-20190424173100-523744f04859 // indirect
+	github.com/mholt/caddy v1.0.0 // indirect
+	github.com/mholt/certmagic v0.5.1 // indirect
 	github.com/micro/cli v0.2.0
 	github.com/micro/go-api v0.7.0
-	github.com/micro/go-bot v1.1.0
+	github.com/micro/go-bot v1.1.0 // indirect
 	github.com/micro/go-grpc v1.0.1 // indirect
-	github.com/micro/go-log v0.1.0
-	github.com/micro/go-micro v1.2.0
+	github.com/micro/go-micro v1.3.0
 	github.com/micro/go-proxy v0.2.0
-	github.com/miekg/dns v1.1.13 // indirect
 	github.com/mitchellh/gox v1.0.1 // indirect
+	github.com/mitchellh/pointerstructure v0.0.0-20190430161007-f252a8fd71c8 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
 	github.com/nats-io/go-nats-streaming v0.4.5 // indirect
 	github.com/nats-io/nats-streaming-server v0.14.2 // indirect
+	github.com/openzipkin/zipkin-go-opentracing v0.3.5 // indirect
 	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/prometheus/procfs v0.0.0-20190529155944-65bdadfa96ae // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7 // indirect
 	github.com/segmentio/kafka-go v0.2.4 // indirect
 	github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516
+	github.com/shirou/gopsutil v2.18.12+incompatible // indirect
 	github.com/shurcooL/home v0.0.0-20190518200933-17791dca3219 // indirect
 	github.com/shurcooL/htmlg v0.0.0-20190503024804-b6326af49ef6 // indirect
 	github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b // indirect
 	github.com/shurcooL/webdavfs v0.0.0-20190527155401-0680c3c63e3c // indirect
+	github.com/softlayer/softlayer-go v0.0.0-20190508182157-7c592eb2559c // indirect
 	github.com/sony/gobreaker v0.4.1 // indirect
 	github.com/spf13/cobra v0.0.4 // indirect
 	github.com/spf13/viper v1.4.0 // indirect
 	github.com/testcontainers/testcontainer-go v0.0.4 // indirect
 	github.com/uber-go/atomic v1.4.0 // indirect
 	github.com/ugorji/go v1.1.5-pre // indirect
 	github.com/vektah/dataloaden v0.3.0 // indirect
+	github.com/vmware/govmomi v0.20.1 // indirect
 	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca
-	go.etcd.io/etcd v3.3.13+incompatible // indirect
 	go.mongodb.org/mongo-driver v1.0.2 // indirect
-	gocloud.dev v0.14.0 // indirect
-	golang.org/x/build v0.0.0-20190529223741-d1024a741590 // indirect
+	gocloud.dev v0.15.0 // indirect
+	golang.org/x/build v0.0.0-20190530221331-2759dfe1c117 // indirect
 	golang.org/x/exp/errors v0.0.0-20190510132918-efd6b22b2522 // indirect
-	golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff // indirect
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
-	golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect
 	golang.org/x/perf v0.0.0-20190501051839-6835260b7148 // indirect
-	golang.org/x/sys v0.0.0-20190529164535-6a60838ec259 // indirect
-	golang.org/x/tools v0.0.0-20190530043710-12d73424210d // indirect
 	golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522 // indirect
 	gonum.org/v1/gonum v0.0.0-20190520094443-a5f8f3a4840b // indirect
-	google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 // indirect
 	google.golang.org/grpc v1.21.0
 	gopkg.in/DataDog/dd-trace-go.v1 v1.14.0 // indirect
 	gopkg.in/go-playground/validator.v9 v9.29.0 // indirect
-	gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 // indirect
-	gopkg.in/src-d/go-git.v4 v4.11.0 // indirect
-	honnef.co/go/tools v0.0.0-20190530105301-1da3061645b4 // indirect
-	k8s.io/api v0.0.0-20190528154508-67ef80593b24 // indirect
-	k8s.io/klog v0.3.2 // indirect
+	honnef.co/go/tools v0.0.0-20190531162725-42df64e2171a // indirect
+	k8s.io/api v0.0.0-20190531161417-40a36c6fb216 // indirect
+	k8s.io/apimachinery v0.0.0-20190531161113-d9689afd32c1 // indirect
+	k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
+	k8s.io/kube-openapi v0.0.0-20190530181030-b52b5b0f5a7c // indirect
 	k8s.io/utils v0.0.0-20190529001817-6999998975a7 // indirect
-	sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e // indirect
+	layeh.com/radius v0.0.0-20190322222518-890bc1058917 // indirect
 )
 
 exclude (