Skip to content

Commit 88da93f

Browse files
tornado-ssysongshiyuan 00649746
and
songshiyuan 00649746
authored
[fix] fix the transfer of etcdadpt (#68)
Co-authored-by: songshiyuan 00649746 <[email protected]>
1 parent 3525549 commit 88da93f

File tree

4 files changed

+233
-63
lines changed

4 files changed

+233
-63
lines changed

Diff for: db/etcd/etcd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
package etcd
1919

2020
import (
21-
"github.com/little-cui/etcdadpt"
21+
"github.com/go-chassis/etcdadpt"
2222
// support embedded etcd
23-
_ "github.com/little-cui/etcdadpt/embedded"
24-
_ "github.com/little-cui/etcdadpt/remote"
23+
_ "github.com/go-chassis/etcdadpt/embedded"
24+
_ "github.com/go-chassis/etcdadpt/remote"
2525

2626
"github.com/go-chassis/cari/db"
2727
"github.com/go-chassis/cari/db/config"

Diff for: dlock/etcd/dlock.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ package etcd
2020
import (
2121
"sync"
2222

23+
"github.com/go-chassis/etcdadpt"
24+
2325
"github.com/go-chassis/cari/dlock"
24-
"github.com/little-cui/etcdadpt"
2526
)
2627

2728
func init() {

Diff for: go.mod

+18-20
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,28 @@ go 1.18
44

55
require (
66
github.com/deckarep/golang-set v1.7.1
7+
github.com/go-chassis/etcdadpt v0.5.3-0.20240328092602-984e34b756fe
78
github.com/go-chassis/foundation v0.4.0
89
github.com/go-chassis/go-archaius v1.5.1
910
github.com/go-chassis/openlog v1.1.3
1011
github.com/gofrs/uuid v4.0.0+incompatible
1112
github.com/gogo/protobuf v1.3.2
1213
github.com/karlseguin/ccache/v2 v2.0.8
13-
github.com/little-cui/etcdadpt v0.3.2
14-
github.com/stretchr/testify v1.7.0
14+
github.com/stretchr/testify v1.7.2
1515
go.mongodb.org/mongo-driver v1.5.1
1616
)
1717

1818
require (
1919
github.com/aws/aws-sdk-go v1.34.28 // indirect
2020
github.com/beorn7/perks v1.0.1 // indirect
21-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2222
github.com/coreos/go-semver v0.3.0 // indirect
23-
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
2423
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
25-
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
2624
github.com/davecgh/go-spew v1.1.1 // indirect
2725
github.com/dustin/go-humanize v1.0.0 // indirect
2826
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
2927
github.com/fsnotify/fsnotify v1.4.7 // indirect
30-
github.com/go-chassis/go-chassis/v2 v2.3.0 // indirect
28+
github.com/go-chassis/go-chassis/v2 v2.4.0 // indirect
3129
github.com/go-stack/stack v1.8.0 // indirect
3230
github.com/golang/protobuf v1.5.2 // indirect
3331
github.com/golang/snappy v0.0.1 // indirect
@@ -38,17 +36,17 @@ require (
3836
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
3937
github.com/jmespath/go-jmespath v0.4.0 // indirect
4038
github.com/jonboulle/clockwork v0.2.2 // indirect
41-
github.com/json-iterator/go v1.1.11 // indirect
39+
github.com/json-iterator/go v1.1.12 // indirect
4240
github.com/klauspost/compress v1.9.5 // indirect
4341
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
4442
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
45-
github.com/modern-go/reflect2 v1.0.1 // indirect
43+
github.com/modern-go/reflect2 v1.0.2 // indirect
4644
github.com/pkg/errors v0.9.1 // indirect
4745
github.com/pmezard/go-difflib v1.0.0 // indirect
48-
github.com/prometheus/client_golang v1.11.0 // indirect
46+
github.com/prometheus/client_golang v1.12.2 // indirect
4947
github.com/prometheus/client_model v0.2.0 // indirect
50-
github.com/prometheus/common v0.26.0 // indirect
51-
github.com/prometheus/procfs v0.6.0 // indirect
48+
github.com/prometheus/common v0.32.1 // indirect
49+
github.com/prometheus/procfs v0.7.3 // indirect
5250
github.com/sirupsen/logrus v1.7.0 // indirect
5351
github.com/soheilhy/cmux v0.1.5 // indirect
5452
github.com/spf13/cast v1.3.0 // indirect
@@ -60,13 +58,13 @@ require (
6058
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
6159
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
6260
go.etcd.io/bbolt v1.3.6 // indirect
63-
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
64-
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
65-
go.etcd.io/etcd/client/v2 v2.305.0 // indirect
66-
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
67-
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
68-
go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
69-
go.etcd.io/etcd/server/v3 v3.5.0 // indirect
61+
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
62+
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
63+
go.etcd.io/etcd/client/v2 v2.305.4 // indirect
64+
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
65+
go.etcd.io/etcd/pkg/v3 v3.5.4 // indirect
66+
go.etcd.io/etcd/raft/v3 v3.5.4 // indirect
67+
go.etcd.io/etcd/server/v3 v3.5.4 // indirect
7068
go.opentelemetry.io/contrib v0.20.0 // indirect
7169
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
7270
go.opentelemetry.io/otel v0.20.0 // indirect
@@ -80,7 +78,7 @@ require (
8078
go.uber.org/atomic v1.7.0 // indirect
8179
go.uber.org/multierr v1.6.0 // indirect
8280
go.uber.org/zap v1.17.0 // indirect
83-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
81+
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
8482
golang.org/x/net v0.7.0 // indirect
8583
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
8684
golang.org/x/sys v0.5.0 // indirect
@@ -91,6 +89,6 @@ require (
9189
google.golang.org/protobuf v1.26.0 // indirect
9290
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
9391
gopkg.in/yaml.v2 v2.4.0 // indirect
94-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
92+
gopkg.in/yaml.v3 v3.0.1 // indirect
9593
sigs.k8s.io/yaml v1.2.0 // indirect
9694
)

0 commit comments

Comments
 (0)