Skip to content

Commit a2fbf19

Browse files
asimasim
committed
Move sync deps, change uuid to google and update go.mod
1 parent 9e23855 commit a2fbf19

File tree

14 files changed

+9
-765
lines changed

14 files changed

+9
-765
lines changed

‎api/handler/api/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66

77
goapi "github.com/micro/go-micro/api"
88
"github.com/micro/go-micro/api/handler"
9+
api "github.com/micro/go-micro/api/proto"
910
"github.com/micro/go-micro/client"
1011
"github.com/micro/go-micro/errors"
1112
"github.com/micro/go-micro/selector"
1213
"github.com/micro/go-micro/util/ctx"
13-
api "github.com/micro/go-micro/api/proto"
1414
)
1515

1616
type apiHandler struct {

‎api/handler/api/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"net/http"
99
"strings"
1010

11+
api "github.com/micro/go-micro/api/proto"
1112
"github.com/micro/go-micro/registry"
1213
"github.com/micro/go-micro/selector"
13-
api "github.com/micro/go-micro/api/proto"
1414
)
1515

1616
func requestToProto(r *http.Request) (*api.Request, error) {

‎api/handler/cloudevents/event.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"time"
3232
"unicode"
3333

34-
"github.com/pborman/uuid"
34+
"github.com/google/uuid"
3535
"gopkg.in/go-playground/validator.v9"
3636
)
3737

@@ -66,7 +66,7 @@ func New(eventType string, mimeType string, payload interface{}) *Event {
6666
EventType: eventType,
6767
CloudEventsVersion: CloudEventsVersion,
6868
Source: "https://micro.mu",
69-
EventID: uuid.NewUUID().String(),
69+
EventID: uuid.New().String(),
7070
EventTime: &now,
7171
ContentType: mimeType,
7272
Data: payload,

‎api/handler/event/event.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"strings"
1111
"time"
1212

13+
"github.com/google/uuid"
1314
"github.com/micro/go-micro/api/handler"
1415
proto "github.com/micro/go-micro/api/proto"
1516
"github.com/micro/go-micro/util/ctx"
16-
"github.com/pborman/uuid"
1717
)
1818

1919
type event struct {
@@ -73,7 +73,7 @@ func (e *event) ServeHTTP(w http.ResponseWriter, r *http.Request) {
7373
ev := &proto.Event{
7474
Name: action,
7575
// TODO: dedupe event
76-
Id: fmt.Sprintf("%s-%s-%s", topic, action, uuid.NewUUID().String()),
76+
Id: fmt.Sprintf("%s-%s-%s", topic, action, uuid.New().String()),
7777
Header: make(map[string]*proto.Pair),
7878
Timestamp: time.Now().Unix(),
7979
}

‎config/source/memory/memory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"sync"
66
"time"
77

8+
"github.com/google/uuid"
89
"github.com/micro/go-micro/config/source"
9-
"github.com/pborman/uuid"
1010
)
1111

1212
type memory struct {
@@ -29,7 +29,7 @@ func (s *memory) Read() (*source.ChangeSet, error) {
2929

3030
func (s *memory) Watch() (source.Watcher, error) {
3131
w := &watcher{
32-
Id: uuid.NewUUID().String(),
32+
Id: uuid.New().String(),
3333
Updates: make(chan *source.ChangeSet, 100),
3434
Source: s,
3535
}

‎go.mod

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@ require (
66
github.com/BurntSushi/toml v0.3.1
77
github.com/beevik/ntp v0.2.0
88
github.com/bitly/go-simplejson v0.5.0
9-
github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
109
github.com/bwmarrin/discordgo v0.19.0
11-
github.com/coreos/etcd v3.3.13+incompatible
10+
github.com/coreos/etcd v3.3.13+incompatible // indirect
1211
github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c
1312
github.com/fsnotify/fsnotify v1.4.7
1413
github.com/fsouza/go-dockerclient v1.4.1
1514
github.com/ghodss/yaml v1.0.0
1615
github.com/go-log/log v0.1.0
1716
github.com/go-playground/locales v0.12.1 // indirect
1817
github.com/go-playground/universal-translator v0.16.0 // indirect
19-
github.com/go-redsync/redsync v1.2.0
2018
github.com/golang/protobuf v1.3.1
21-
github.com/gomodule/redigo v2.0.0+incompatible
2219
github.com/google/uuid v1.1.1
2320
github.com/gorilla/handlers v1.4.0
2421
github.com/gorilla/websocket v1.4.0
@@ -37,16 +34,13 @@ require (
3734
github.com/modern-go/reflect2 v1.0.1 // indirect
3835
github.com/nats-io/nats.go v1.8.1
3936
github.com/nlopes/slack v0.5.0
40-
github.com/pborman/uuid v1.2.0
4137
github.com/pkg/errors v0.8.1
4238
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
4339
go.etcd.io/etcd v3.3.13+incompatible
4440
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5
4541
golang.org/x/net v0.0.0-20190606173856-1492cefac77f
4642
google.golang.org/grpc v1.21.1
47-
gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a // indirect
4843
gopkg.in/go-playground/validator.v9 v9.29.0
49-
gopkg.in/redis.v3 v3.6.4
5044
gopkg.in/src-d/go-git.v4 v4.11.0
5145
gopkg.in/telegram-bot-api.v4 v4.6.4
5246
)

‎go.sum

-14
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NR
1414
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
1515
github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
1616
github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
17-
github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA=
18-
github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
1917
github.com/bwmarrin/discordgo v0.19.0 h1:kMED/DB0NR1QhRcalb85w0Cu3Ep2OrGAqZH1R5awQiY=
2018
github.com/bwmarrin/discordgo v0.19.0/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
2119
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
@@ -52,8 +50,6 @@ github.com/go-playground/locales v0.12.1 h1:2FITxuFt/xuCNP1Acdhv62OzaCiviiE4kotf
5250
github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
5351
github.com/go-playground/universal-translator v0.16.0 h1:X++omBR/4cE2MNg91AoC3rmGrCjJ8eAeUP/K/EKx4DM=
5452
github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
55-
github.com/go-redsync/redsync v1.2.0 h1:a4y3xKQUOA5092Grjps3F5vaRbjA9uoUB59RVwOMttA=
56-
github.com/go-redsync/redsync v1.2.0/go.mod h1:QClK/s99KRhfKdpxLTMsI5mSu43iLp0NfOneLPie+78=
5753
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
5854
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
5955
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -63,13 +59,10 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
6359
github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
6460
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
6561
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
66-
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
67-
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
6862
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
6963
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
7064
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
7165
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
72-
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7366
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
7467
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7568
github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
@@ -177,8 +170,6 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
177170
github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
178171
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
179172
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
180-
github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
181-
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
182173
github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
183174
github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
184175
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -199,7 +190,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
199190
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
200191
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
201192
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
202-
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
203193
github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM=
204194
github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog=
205195
github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro=
@@ -248,15 +238,11 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXt
248238
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
249239
google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=
250240
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
251-
gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a h1:stTHdEoWg1pQ8riaP5ROrjS6zy6wewH/Q2iwnLCQUXY=
252-
gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610=
253241
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
254242
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
255243
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
256244
gopkg.in/go-playground/validator.v9 v9.29.0 h1:5ofssLNYgAA/inWn6rTZ4juWpRJUwEnXc1LG2IeXwgQ=
257245
gopkg.in/go-playground/validator.v9 v9.29.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
258-
gopkg.in/redis.v3 v3.6.4 h1:u7XgPH1rWwsdZnR+azldXC6x9qDU2luydOIeU/l52fE=
259-
gopkg.in/redis.v3 v3.6.4/go.mod h1:6XeGv/CrsUFDU9aVbUdNykN7k1zVmoeg83KC9RbQfiU=
260246
gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo=
261247
gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk=
262248
gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=

‎sync/data/etcd/etcd.go

-93
This file was deleted.

0 commit comments

Comments
 (0)