Skip to content
This repository was archived by the owner on Jul 4, 2024. It is now read-only.

Commit 0037ddb

Browse files
xpunchxpunch
authored
Merge pull request #7 from pcdummy/main
Fix various dependency errors and go.mod, closes PR #2
2 parents a54bc64 + 5a6385d commit 0037ddb

File tree

23 files changed

+534
-84
lines changed

23 files changed

+534
-84
lines changed

Diff for: ‎broker/consumer/consumer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66

77
"go-micro.dev/v4/broker"
8-
"go-micro.dev/v4/cmd"
8+
"go-micro.dev/v4/util/cmd"
99
// To enable rabbitmq plugin uncomment
1010
//_ "github.com/micro/go-plugins/broker/rabbitmq"
1111
)

Diff for: ‎broker/main.go

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

8+
_ "github.com/go-micro/plugins/v4/broker/nats"
89
"go-micro.dev/v4/broker"
9-
"go-micro.dev/v4/cmd"
10+
"go-micro.dev/v4/util/cmd"
1011
)
1112

1213
var (

Diff for: ‎broker/producer/producer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
"go-micro.dev/v4/broker"
9-
"go-micro.dev/v4/cmd"
9+
"go-micro.dev/v4/util/cmd"
1010
// To enable rabbitmq plugin uncomment
1111
//_ "github.com/micro/go-plugins/broker/rabbitmq"
1212
)

Diff for: ‎client/codegen/codegen.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"fmt"
55

66
"context"
7+
78
example "github.com/go-micro/examples/server/proto/example"
8-
"go-micro.dev/v4/cmd"
9+
"go-micro.dev/v4/util/cmd"
910
)
1011

1112
var (

Diff for: ‎client/dc_filter/dc_filter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"time"
88

99
"go-micro.dev/v4/client"
10-
"go-micro.dev/v4/selector"
11-
"go-micro.dev/v4/cmd"
1210
"go-micro.dev/v4/metadata"
1311
"go-micro.dev/v4/registry"
12+
"go-micro.dev/v4/selector"
13+
"go-micro.dev/v4/util/cmd"
1414

1515
example "github.com/go-micro/examples/server/proto/example"
1616
)

Diff for: ‎client/dc_selector/dc_selector.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"time"
99

1010
"go-micro.dev/v4/client"
11-
"go-micro.dev/v4/selector"
12-
"go-micro.dev/v4/cmd"
1311
"go-micro.dev/v4/registry"
12+
"go-micro.dev/v4/selector"
13+
"go-micro.dev/v4/util/cmd"
1414

1515
example "github.com/go-micro/examples/server/proto/example"
1616
)

Diff for: ‎client/selector/selector.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
example "github.com/go-micro/examples/server/proto/example"
1010
"go-micro.dev/v4/client"
11-
"go-micro.dev/v4/selector"
12-
"go-micro.dev/v4/cmd"
1311
"go-micro.dev/v4/registry"
12+
"go-micro.dev/v4/selector"
13+
"go-micro.dev/v4/util/cmd"
1414
)
1515

1616
func init() {

Diff for: ‎client/wrapper/wrapper.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"time"
66

77
"context"
8+
89
example "github.com/go-micro/examples/server/proto/example"
910
"go-micro.dev/v4/client"
10-
"go-micro.dev/v4/cmd"
1111
"go-micro.dev/v4/metadata"
1212
"go-micro.dev/v4/registry"
13+
"go-micro.dev/v4/util/cmd"
1314
)
1415

1516
// wrapper example code

Diff for: ‎config/grpc/client/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
grpcConfig "github.com/asim/go-micro/plugins/config/source/grpc/v4"
4+
grpcConfig "github.com/go-micro/plugins/v4/config/source/grpc"
55
"go-micro.dev/v4/config"
66
log "go-micro.dev/v4/logger"
77
)

Diff for: ‎config/grpc/srv/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"sync"
1010
"time"
1111

12-
yaml "github.com/asim/go-micro/plugins/config/encoder/yaml/v4"
13-
proto "github.com/asim/go-micro/plugins/config/source/grpc/v4/proto"
12+
yaml "github.com/go-micro/plugins/v4/config/encoder/yaml"
13+
proto "github.com/go-micro/plugins/v4/config/source/grpc/proto"
1414
"go-micro.dev/v4/config"
1515
"go-micro.dev/v4/config/reader"
1616
"go-micro.dev/v4/config/reader/json"

Diff for: ‎config/modify/modify.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"os"
66

7+
"github.com/go-micro/plugins/v4/config/encoder/toml"
78
"go-micro.dev/v4/config"
8-
"github.com/asim/go-micro/plugins/config/encoder/toml/v4"
99
"go-micro.dev/v4/config/source"
1010
"go-micro.dev/v4/config/source/file"
1111
)

Diff for: ‎config/yaml/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"fmt"
55

6-
yaml "github.com/asim/go-micro/plugins/config/encoder/yaml/v4"
6+
yaml "github.com/go-micro/plugins/v4/config/encoder/yaml"
77
"go-micro.dev/v4/config"
88
"go-micro.dev/v4/config/reader"
99
"go-micro.dev/v4/config/reader/json"

Diff for: ‎go.mod

+60-56
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,89 @@
11
module github.com/go-micro/examples
22

3-
go 1.17
4-
5-
replace (
6-
github.com/asim/go-micro/plugins/client/grpc/v4 => ../plugins/client/grpc
7-
github.com/asim/go-micro/plugins/client/http/v4 => ../plugins/client/http
8-
github.com/asim/go-micro/plugins/config/encoder/toml/v4 => ../plugins/config/encoder/toml
9-
github.com/asim/go-micro/plugins/config/encoder/yaml/v4 => ../plugins/config/encoder/yaml
10-
github.com/asim/go-micro/plugins/config/source/grpc/v4 => ../plugins/config/source/grpc
11-
github.com/asim/go-micro/plugins/server/grpc/v4 => ../plugins/server/grpc
12-
github.com/asim/go-micro/plugins/server/http/v4 => ../plugins/server/http
13-
github.com/asim/go-micro/plugins/transport/grpc/v4 => ../plugins/transport/grpc
14-
github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v4 => ../plugins/wrapper/select/roundrobin
15-
github.com/asim/go-micro/plugins/wrapper/select/shard/v4 => ../plugins/wrapper/select/shard
16-
go-micro.dev/v4 => ../../go-micro
17-
)
3+
go 1.18
184

195
require (
20-
github.com/asim/go-micro/plugins/client/grpc/v4 v4.0.0-20211019191242-9edc569e68bb
21-
github.com/asim/go-micro/plugins/client/http/v4 v4.0.0-00010101000000-000000000000
22-
github.com/asim/go-micro/plugins/config/encoder/toml/v4 v4.0.0-00010101000000-000000000000
23-
github.com/asim/go-micro/plugins/config/encoder/yaml/v4 v4.0.0-00010101000000-000000000000
24-
github.com/asim/go-micro/plugins/config/source/grpc/v4 v4.0.0-00010101000000-000000000000
25-
github.com/asim/go-micro/plugins/server/grpc/v4 v4.0.0-00010101000000-000000000000
26-
github.com/asim/go-micro/plugins/server/http/v4 v4.0.0-00010101000000-000000000000
27-
github.com/asim/go-micro/plugins/wrapper/select/roundrobin/v4 v4.0.0-00010101000000-000000000000
28-
github.com/asim/go-micro/plugins/wrapper/select/shard/v4 v4.0.0-00010101000000-000000000000
29-
github.com/gin-gonic/gin v1.7.4
6+
github.com/gin-gonic/gin v1.8.1
7+
github.com/go-micro/plugins/v4/broker/nats v1.1.0
8+
github.com/go-micro/plugins/v4/client/grpc v1.1.0
9+
github.com/go-micro/plugins/v4/client/http v1.1.0
10+
github.com/go-micro/plugins/v4/config/encoder/toml v1.1.0
11+
github.com/go-micro/plugins/v4/config/encoder/yaml v1.1.0
12+
github.com/go-micro/plugins/v4/config/source/grpc v1.1.0
13+
github.com/go-micro/plugins/v4/server/grpc v1.1.1
14+
github.com/go-micro/plugins/v4/server/http v1.1.0
15+
github.com/go-micro/plugins/v4/wrapper/select/roundrobin v1.1.0
16+
github.com/go-micro/plugins/v4/wrapper/select/shard v1.1.0
3017
github.com/golang/glog v1.0.0
3118
github.com/golang/protobuf v1.5.2
3219
github.com/grpc-ecosystem/grpc-gateway v1.16.0
3320
github.com/pborman/uuid v1.2.1
34-
github.com/urfave/cli/v2 v2.3.0
35-
go-micro.dev/v4 v4.3.0
36-
golang.org/x/net v0.0.0-20211020060615-d418f374d309
37-
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c
38-
google.golang.org/grpc v1.42.0
39-
google.golang.org/protobuf v1.27.1
21+
github.com/urfave/cli/v2 v2.11.2
22+
go-micro.dev/v4 v4.8.1
23+
golang.org/x/net v0.0.0-20220812174116-3211cb980234
24+
google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1
25+
google.golang.org/grpc v1.48.0
26+
google.golang.org/protobuf v1.28.1
4027
)
4128

4229
require (
43-
github.com/BurntSushi/toml v0.3.1 // indirect
44-
github.com/Microsoft/go-winio v0.5.0 // indirect
45-
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
30+
github.com/BurntSushi/toml v1.2.0 // indirect
31+
github.com/Microsoft/go-winio v0.5.2 // indirect
32+
github.com/ProtonMail/go-crypto v0.0.0-20220812175011-7fcef0dbe794 // indirect
4633
github.com/acomagu/bufpipe v1.0.3 // indirect
4734
github.com/bitly/go-simplejson v0.5.0 // indirect
48-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
49-
github.com/emirpasic/gods v1.12.0 // indirect
50-
github.com/fsnotify/fsnotify v1.4.9 // indirect
35+
github.com/cloudflare/circl v1.2.0 // indirect
36+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
37+
github.com/emirpasic/gods v1.18.1 // indirect
38+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
39+
github.com/felixge/httpsnoop v1.0.3 // indirect
40+
github.com/fsnotify/fsnotify v1.5.4 // indirect
5141
github.com/ghodss/yaml v1.0.0 // indirect
5242
github.com/gin-contrib/sse v0.1.0 // indirect
43+
github.com/go-acme/lego/v4 v4.8.0 // indirect
5344
github.com/go-git/gcfg v1.5.0 // indirect
5445
github.com/go-git/go-billy/v5 v5.3.1 // indirect
5546
github.com/go-git/go-git/v5 v5.4.2 // indirect
56-
github.com/go-playground/locales v0.13.0 // indirect
57-
github.com/go-playground/universal-translator v0.17.0 // indirect
58-
github.com/go-playground/validator/v10 v10.4.1 // indirect
59-
github.com/google/uuid v1.2.0 // indirect
60-
github.com/imdario/mergo v0.3.12 // indirect
47+
github.com/go-playground/locales v0.14.0 // indirect
48+
github.com/go-playground/universal-translator v0.18.0 // indirect
49+
github.com/go-playground/validator/v10 v10.11.0 // indirect
50+
github.com/gobwas/httphead v0.1.0 // indirect
51+
github.com/gobwas/pool v0.2.1 // indirect
52+
github.com/gobwas/ws v1.1.0 // indirect
53+
github.com/goccy/go-json v0.9.11 // indirect
54+
github.com/google/uuid v1.3.0 // indirect
55+
github.com/gorilla/handlers v1.5.1 // indirect
56+
github.com/imdario/mergo v0.3.13 // indirect
6157
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
62-
github.com/json-iterator/go v1.1.9 // indirect
63-
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
64-
github.com/leodido/go-urn v1.2.0 // indirect
65-
github.com/mattn/go-isatty v0.0.12 // indirect
66-
github.com/miekg/dns v1.1.43 // indirect
58+
github.com/json-iterator/go v1.1.12 // indirect
59+
github.com/kevinburke/ssh_config v1.2.0 // indirect
60+
github.com/leodido/go-urn v1.2.1 // indirect
61+
github.com/mattn/go-isatty v0.0.16 // indirect
62+
github.com/miekg/dns v1.1.50 // indirect
6763
github.com/mitchellh/go-homedir v1.1.0 // indirect
6864
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
69-
github.com/modern-go/reflect2 v1.0.1 // indirect
65+
github.com/modern-go/reflect2 v1.0.2 // indirect
66+
github.com/nats-io/nats.go v1.16.0 // indirect
67+
github.com/nats-io/nkeys v0.3.0 // indirect
68+
github.com/nats-io/nuid v1.0.1 // indirect
7069
github.com/nxadm/tail v1.4.8 // indirect
7170
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
7271
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
72+
github.com/pelletier/go-toml/v2 v2.0.3 // indirect
7373
github.com/pkg/errors v0.9.1 // indirect
74-
github.com/russross/blackfriday/v2 v2.0.1 // indirect
75-
github.com/sergi/go-diff v1.1.0 // indirect
74+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
75+
github.com/sergi/go-diff v1.2.0 // indirect
7676
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
77-
github.com/ugorji/go/codec v1.1.7 // indirect
78-
github.com/xanzy/ssh-agent v0.3.0 // indirect
79-
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
80-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
81-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
82-
golang.org/x/text v0.3.6 // indirect
77+
github.com/ugorji/go/codec v1.2.7 // indirect
78+
github.com/xanzy/ssh-agent v0.3.1 // indirect
79+
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
80+
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 // indirect
81+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
82+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
83+
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
84+
golang.org/x/text v0.3.7 // indirect
85+
golang.org/x/tools v0.1.12 // indirect
86+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
8387
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8488
gopkg.in/warnings.v0 v0.1.2 // indirect
8589
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)