diff --git a/README.md b/README.md index 2626c9cf..73b0672f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Go Micro [![GoDoc](https://godoc.org/github.com/myodc/go-micro?status.svg)](https://godoc.org/github.com/myodc/go-micro) [![Travis CI](https://travis-ci.org/myodc/go-micro.svg?branch=master)](https://travis-ci.org/myodc/go-micro) +# Go Micro [![GoDoc](https://godoc.org/github.com/micro/go-micro?status.svg)](https://godoc.org/github.com/micro/go-micro) [![Travis CI](https://travis-ci.org/micro/go-micro.svg?branch=master)](https://travis-ci.org/micro/go-micro) -Go Micro is a microservices library which provides the fundamental building blocks for writing fault tolerant distributed systems at scale. It is part of the [Micro](https://github.com/myodc/micro) toolchain. +Go Micro is a microservices library which provides the fundamental building blocks for writing fault tolerant distributed systems at scale. It is part of the [Micro](https://github.com/micro/micro) toolchain. An example server can be found in examples/server. @@ -11,11 +11,11 @@ An example server can be found in examples/server. Feature | Package | Description ------- | ------- | --------- -Discovery | [Registry](https://godoc.org/github.com/myodc/go-micro/registry) | A way of locating services to communicate with -Client | [Client](https://godoc.org/github.com/myodc/go-micro/client) | Used to make RPC requests to a service -Server | [Server](https://godoc.org/github.com/myodc/go-micro/server) | Listens and serves RPC requests -Pub/Sub | [Broker](https://godoc.org/github.com/myodc/go-micro/broker) | Publish and Subscribe to events -Transport | [Transport](https://godoc.org/github.com/myodc/go-micro/transport) | Communication mechanism between services +Discovery | [Registry](https://godoc.org/github.com/micro/go-micro/registry) | A way of locating services to communicate with +Client | [Client](https://godoc.org/github.com/micro/go-micro/client) | Used to make RPC requests to a service +Server | [Server](https://godoc.org/github.com/micro/go-micro/server) | Listens and serves RPC requests +Pub/Sub | [Broker](https://godoc.org/github.com/micro/go-micro/broker) | Publish and Subscribe to events +Transport | [Transport](https://godoc.org/github.com/micro/go-micro/transport) | Communication mechanism between services ## Prerequisites @@ -63,7 +63,7 @@ message Response { } ``` -Compile proto `protoc -I$GOPATH/src --go_out=$GOPATH/src $GOPATH/src/github.com/myodc/go-micro/examples/server/proto/example/example.proto` +Compile proto `protoc -I$GOPATH/src --go_out=$GOPATH/src $GOPATH/src/github.com/micro/go-micro/examples/server/proto/example/example.proto` ### Create request handler `go-micro/examples/server/handler/example.go`: @@ -73,9 +73,9 @@ package handler import ( log "github.com/golang/glog" - c "github.com/myodc/go-micro/context" - example "github.com/myodc/go-micro/examples/server/proto/example" - "github.com/myodc/go-micro/server" + c "github.com/micro/go-micro/context" + example "github.com/micro/go-micro/examples/server/proto/example" + "github.com/micro/go-micro/server" "golang.org/x/net/context" ) @@ -98,9 +98,9 @@ package main import ( log "github.com/golang/glog" - "github.com/myodc/go-micro/cmd" - "github.com/myodc/go-micro/examples/server/handler" - "github.com/myodc/go-micro/server" + "github.com/micro/go-micro/cmd" + "github.com/micro/go-micro/examples/server/handler" + "github.com/micro/go-micro/server" ) func main() { diff --git a/broker/http/http.go b/broker/http/http.go index e76c6497..8a8ce540 100644 --- a/broker/http/http.go +++ b/broker/http/http.go @@ -3,7 +3,7 @@ package http // This is a hack import ( - "github.com/myodc/go-micro/broker" + "github.com/micro/go-micro/broker" ) func NewBroker(addrs []string, opt ...broker.Option) broker.Broker { diff --git a/broker/http_broker.go b/broker/http_broker.go index ae9eed40..b9189082 100644 --- a/broker/http_broker.go +++ b/broker/http_broker.go @@ -12,8 +12,8 @@ import ( "sync" log "github.com/golang/glog" - "github.com/myodc/go-micro/errors" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/registry" "github.com/pborman/uuid" ) diff --git a/broker/nats/nats.go b/broker/nats/nats.go index d3b50b89..84f91b96 100644 --- a/broker/nats/nats.go +++ b/broker/nats/nats.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/apcera/nats" - "github.com/myodc/go-micro/broker" + "github.com/micro/go-micro/broker" ) type nbroker struct { diff --git a/broker/rabbitmq/rabbitmq.go b/broker/rabbitmq/rabbitmq.go index 426bf831..cc89f5d1 100644 --- a/broker/rabbitmq/rabbitmq.go +++ b/broker/rabbitmq/rabbitmq.go @@ -1,7 +1,7 @@ package rabbitmq import ( - "github.com/myodc/go-micro/broker" + "github.com/micro/go-micro/broker" "github.com/streadway/amqp" ) diff --git a/client/node_selector.go b/client/node_selector.go index c15f7d65..3a71e8db 100644 --- a/client/node_selector.go +++ b/client/node_selector.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/myodc/go-micro/errors" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/registry" ) func init() { diff --git a/client/node_selector_test.go b/client/node_selector_test.go index 2e4a9321..f1a436b7 100644 --- a/client/node_selector_test.go +++ b/client/node_selector_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" ) func TestNodeSelector(t *testing.T) { diff --git a/client/options.go b/client/options.go index 419c5a57..062e67e5 100644 --- a/client/options.go +++ b/client/options.go @@ -1,9 +1,9 @@ package client import ( - "github.com/myodc/go-micro/broker" - "github.com/myodc/go-micro/registry" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/transport" ) type options struct { diff --git a/client/rpc_client.go b/client/rpc_client.go index 57a5df2a..cc0eff19 100644 --- a/client/rpc_client.go +++ b/client/rpc_client.go @@ -6,11 +6,11 @@ import ( "net/http" "sync" - "github.com/myodc/go-micro/broker" - c "github.com/myodc/go-micro/context" - "github.com/myodc/go-micro/errors" - "github.com/myodc/go-micro/registry" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/broker" + c "github.com/micro/go-micro/context" + "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/transport" rpc "github.com/youtube/vitess/go/rpcplus" diff --git a/client/rpc_codec.go b/client/rpc_codec.go index 650d59c8..655e9056 100644 --- a/client/rpc_codec.go +++ b/client/rpc_codec.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/transport" rpc "github.com/youtube/vitess/go/rpcplus" js "github.com/youtube/vitess/go/rpcplus/jsonrpc" pb "github.com/youtube/vitess/go/rpcplus/pbrpc" diff --git a/cmd/cmd.go b/cmd/cmd.go index 2665126e..1af324c9 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -10,26 +10,26 @@ import ( "text/template" "github.com/codegangsta/cli" - "github.com/myodc/go-micro/broker" - "github.com/myodc/go-micro/client" - "github.com/myodc/go-micro/registry" - "github.com/myodc/go-micro/server" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/client" + "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/server" + "github.com/micro/go-micro/transport" // brokers - "github.com/myodc/go-micro/broker/http" - "github.com/myodc/go-micro/broker/nats" - "github.com/myodc/go-micro/broker/rabbitmq" + "github.com/micro/go-micro/broker/http" + "github.com/micro/go-micro/broker/nats" + "github.com/micro/go-micro/broker/rabbitmq" // registries - "github.com/myodc/go-micro/registry/consul" - "github.com/myodc/go-micro/registry/etcd" - "github.com/myodc/go-micro/registry/memory" + "github.com/micro/go-micro/registry/consul" + "github.com/micro/go-micro/registry/etcd" + "github.com/micro/go-micro/registry/memory" // transport - thttp "github.com/myodc/go-micro/transport/http" - tnats "github.com/myodc/go-micro/transport/nats" - trmq "github.com/myodc/go-micro/transport/rabbitmq" + thttp "github.com/micro/go-micro/transport/http" + tnats "github.com/micro/go-micro/transport/nats" + trmq "github.com/micro/go-micro/transport/rabbitmq" ) var ( diff --git a/examples/client/main.go b/examples/client/main.go index 0c13a4ad..a4fdef71 100644 --- a/examples/client/main.go +++ b/examples/client/main.go @@ -3,10 +3,10 @@ package main import ( "fmt" - "github.com/myodc/go-micro/client" - "github.com/myodc/go-micro/cmd" - c "github.com/myodc/go-micro/context" - example "github.com/myodc/go-micro/examples/server/proto/example" + "github.com/micro/go-micro/client" + "github.com/micro/go-micro/cmd" + c "github.com/micro/go-micro/context" + example "github.com/micro/go-micro/examples/server/proto/example" "golang.org/x/net/context" ) diff --git a/examples/pubsub/main.go b/examples/pubsub/main.go index b531a05e..063b065b 100644 --- a/examples/pubsub/main.go +++ b/examples/pubsub/main.go @@ -5,8 +5,8 @@ import ( "time" log "github.com/golang/glog" - "github.com/myodc/go-micro/broker" - "github.com/myodc/go-micro/cmd" + "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/cmd" ) var ( diff --git a/examples/server/handler/example.go b/examples/server/handler/example.go index 3911409b..6e84cf72 100644 --- a/examples/server/handler/example.go +++ b/examples/server/handler/example.go @@ -2,9 +2,9 @@ package handler import ( log "github.com/golang/glog" - c "github.com/myodc/go-micro/context" - example "github.com/myodc/go-micro/examples/server/proto/example" - "github.com/myodc/go-micro/server" + c "github.com/micro/go-micro/context" + example "github.com/micro/go-micro/examples/server/proto/example" + "github.com/micro/go-micro/server" "golang.org/x/net/context" ) diff --git a/examples/server/main.go b/examples/server/main.go index d94f1444..ef535233 100644 --- a/examples/server/main.go +++ b/examples/server/main.go @@ -2,10 +2,10 @@ package main import ( log "github.com/golang/glog" - "github.com/myodc/go-micro/cmd" - "github.com/myodc/go-micro/examples/server/handler" - "github.com/myodc/go-micro/examples/server/subscriber" - "github.com/myodc/go-micro/server" + "github.com/micro/go-micro/cmd" + "github.com/micro/go-micro/examples/server/handler" + "github.com/micro/go-micro/examples/server/subscriber" + "github.com/micro/go-micro/server" ) func main() { diff --git a/examples/server/subscriber/subscriber.go b/examples/server/subscriber/subscriber.go index 675a3999..2707980f 100644 --- a/examples/server/subscriber/subscriber.go +++ b/examples/server/subscriber/subscriber.go @@ -2,7 +2,7 @@ package subscriber import ( log "github.com/golang/glog" - example "github.com/myodc/go-micro/examples/server/proto/example" + example "github.com/micro/go-micro/examples/server/proto/example" "golang.org/x/net/context" ) diff --git a/registry/consul/consul.go b/registry/consul/consul.go index 03a605d1..e8869b89 100644 --- a/registry/consul/consul.go +++ b/registry/consul/consul.go @@ -3,7 +3,7 @@ package consul // This is a hack import ( - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" ) func NewRegistry(addrs []string, opt ...registry.Option) registry.Registry { diff --git a/registry/etcd/etcd.go b/registry/etcd/etcd.go index 3bca8004..7cda61c3 100644 --- a/registry/etcd/etcd.go +++ b/registry/etcd/etcd.go @@ -8,7 +8,7 @@ import ( "sync" etcd "github.com/coreos/etcd/client" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" "golang.org/x/net/context" ) diff --git a/registry/etcd/watcher.go b/registry/etcd/watcher.go index 0162ccf6..56df64e7 100644 --- a/registry/etcd/watcher.go +++ b/registry/etcd/watcher.go @@ -2,7 +2,7 @@ package etcd import ( etcd "github.com/coreos/etcd/client" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" "golang.org/x/net/context" ) diff --git a/registry/memory/memory.go b/registry/memory/memory.go index d1089247..8afa0e81 100644 --- a/registry/memory/memory.go +++ b/registry/memory/memory.go @@ -8,7 +8,7 @@ import ( log "github.com/golang/glog" "github.com/hashicorp/memberlist" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" "github.com/pborman/uuid" ) diff --git a/registry/memory/memory_test.go b/registry/memory/memory_test.go index d92f6155..f19d1c52 100644 --- a/registry/memory/memory_test.go +++ b/registry/memory/memory_test.go @@ -3,7 +3,7 @@ package memory import ( "testing" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" ) func TestDelServices(t *testing.T) { diff --git a/server/extractor.go b/server/extractor.go index 18404f3b..1dbc3b14 100644 --- a/server/extractor.go +++ b/server/extractor.go @@ -5,7 +5,7 @@ import ( "net" "reflect" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" ) var ( diff --git a/server/extractor_test.go b/server/extractor_test.go index 9e9d091a..b20fb3d5 100644 --- a/server/extractor_test.go +++ b/server/extractor_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" "golang.org/x/net/context" ) diff --git a/server/handler.go b/server/handler.go index 1a50b810..6021caef 100644 --- a/server/handler.go +++ b/server/handler.go @@ -1,7 +1,7 @@ package server import ( - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" ) type Handler interface { diff --git a/server/health_checker.go b/server/health_checker.go index c245645b..3ede5a04 100644 --- a/server/health_checker.go +++ b/server/health_checker.go @@ -1,7 +1,7 @@ package server import ( - "github.com/myodc/go-micro/server/proto/health" + "github.com/micro/go-micro/server/proto/health" "golang.org/x/net/context" ) diff --git a/server/options.go b/server/options.go index 214d7733..7e1e8487 100644 --- a/server/options.go +++ b/server/options.go @@ -1,9 +1,9 @@ package server import ( - "github.com/myodc/go-micro/broker" - "github.com/myodc/go-micro/registry" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/broker" + "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/transport" ) type options struct { diff --git a/server/proto/health/health.pb.go b/server/proto/health/health.pb.go index c5c6b415..889f759e 100644 --- a/server/proto/health/health.pb.go +++ b/server/proto/health/health.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. -// source: github.com/myodc/go-micro/proto/health/health.proto +// source: github.com/micro/go-micro/proto/health/health.proto // DO NOT EDIT! /* Package health is a generated protocol buffer package. It is generated from these files: - github.com/myodc/go-micro/proto/health/health.proto + github.com/micro/go-micro/proto/health/health.proto It has these top-level messages: Request diff --git a/server/rpc_codec.go b/server/rpc_codec.go index 77fe383a..517f6db3 100644 --- a/server/rpc_codec.go +++ b/server/rpc_codec.go @@ -3,7 +3,7 @@ package server import ( "bytes" "fmt" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/transport" rpc "github.com/youtube/vitess/go/rpcplus" js "github.com/youtube/vitess/go/rpcplus/jsonrpc" pb "github.com/youtube/vitess/go/rpcplus/pbrpc" diff --git a/server/rpc_handler.go b/server/rpc_handler.go index b60f0414..bd0d301d 100644 --- a/server/rpc_handler.go +++ b/server/rpc_handler.go @@ -3,7 +3,7 @@ package server import ( "reflect" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/registry" ) type rpcHandler struct { diff --git a/server/rpc_server.go b/server/rpc_server.go index f99a948b..dd6875e6 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -6,10 +6,10 @@ import ( "strings" "sync" - "github.com/myodc/go-micro/broker" - c "github.com/myodc/go-micro/context" - "github.com/myodc/go-micro/registry" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/broker" + c "github.com/micro/go-micro/context" + "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/transport" log "github.com/golang/glog" rpc "github.com/youtube/vitess/go/rpcplus" diff --git a/server/subscriber.go b/server/subscriber.go index 00b65412..9395bc44 100644 --- a/server/subscriber.go +++ b/server/subscriber.go @@ -5,9 +5,9 @@ import ( "reflect" "github.com/golang/protobuf/proto" - "github.com/myodc/go-micro/broker" - c "github.com/myodc/go-micro/context" - "github.com/myodc/go-micro/registry" + "github.com/micro/go-micro/broker" + c "github.com/micro/go-micro/context" + "github.com/micro/go-micro/registry" "golang.org/x/net/context" ) diff --git a/transport/http/http.go b/transport/http/http.go index 9ec56681..30a8b43e 100644 --- a/transport/http/http.go +++ b/transport/http/http.go @@ -3,7 +3,7 @@ package http // This is a hack import ( - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/transport" ) func NewTransport(addrs []string, opt ...transport.Option) transport.Transport { diff --git a/transport/nats/nats.go b/transport/nats/nats.go index 15ccaa92..3cbbc78a 100644 --- a/transport/nats/nats.go +++ b/transport/nats/nats.go @@ -7,7 +7,7 @@ import ( "time" "github.com/apcera/nats" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/transport" ) type ntport struct { diff --git a/transport/rabbitmq/rabbitmq.go b/transport/rabbitmq/rabbitmq.go index c1081751..fd64ee22 100644 --- a/transport/rabbitmq/rabbitmq.go +++ b/transport/rabbitmq/rabbitmq.go @@ -9,7 +9,7 @@ import ( uuid "github.com/nu7hatch/gouuid" "github.com/streadway/amqp" - "github.com/myodc/go-micro/transport" + "github.com/micro/go-micro/transport" ) const (