From c44836da6df0d3a5e7a22ef169a245898a7ef5b9 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 22 Jun 2021 09:11:39 +0200 Subject: [PATCH] replace unmaintained zk library with drop-in replacement Signed-off-by: Mark Sagi-Kazar --- go.mod | 2 +- go.sum | 4 ++-- sd/zk/client.go | 2 +- sd/zk/client_test.go | 2 +- sd/zk/instancer.go | 2 +- sd/zk/integration_test.go | 2 +- sd/zk/logwrapper.go | 2 +- sd/zk/util_test.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 628c2b4dc..cd3621842 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect github.com/go-logfmt/logfmt v0.5.0 github.com/go-stack/stack v1.8.0 + github.com/go-zookeeper/zk v1.0.2 github.com/golang/protobuf v1.5.2 github.com/google/btree v1.0.0 // indirect github.com/hashicorp/consul/api v1.3.0 @@ -34,7 +35,6 @@ require ( github.com/performancecopilot/speed v3.0.0+incompatible github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.11.0 - github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da github.com/sirupsen/logrus v1.6.0 github.com/smartystreets/goconvey v1.6.4 // indirect github.com/sony/gobreaker v0.4.1 diff --git a/go.sum b/go.sum index b8f5b4c95..01397aa03 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM= +github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -282,8 +284,6 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= diff --git a/sd/zk/client.go b/sd/zk/client.go index 60ac1387e..b88ad1464 100644 --- a/sd/zk/client.go +++ b/sd/zk/client.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/samuel/go-zookeeper/zk" + "github.com/go-zookeeper/zk" "github.com/go-kit/kit/log" ) diff --git a/sd/zk/client_test.go b/sd/zk/client_test.go index e201536d8..05ede2e3d 100644 --- a/sd/zk/client_test.go +++ b/sd/zk/client_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - stdzk "github.com/samuel/go-zookeeper/zk" + stdzk "github.com/go-zookeeper/zk" "github.com/go-kit/kit/log" ) diff --git a/sd/zk/instancer.go b/sd/zk/instancer.go index 631999844..de50eaed1 100644 --- a/sd/zk/instancer.go +++ b/sd/zk/instancer.go @@ -1,7 +1,7 @@ package zk import ( - "github.com/samuel/go-zookeeper/zk" + "github.com/go-zookeeper/zk" "github.com/go-kit/kit/log" "github.com/go-kit/kit/sd" diff --git a/sd/zk/integration_test.go b/sd/zk/integration_test.go index 6a9a7cac6..c1022a5e2 100644 --- a/sd/zk/integration_test.go +++ b/sd/zk/integration_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - stdzk "github.com/samuel/go-zookeeper/zk" + stdzk "github.com/go-zookeeper/zk" ) var ( diff --git a/sd/zk/logwrapper.go b/sd/zk/logwrapper.go index abb7b6dfd..ab7d30928 100644 --- a/sd/zk/logwrapper.go +++ b/sd/zk/logwrapper.go @@ -3,7 +3,7 @@ package zk import ( "fmt" - "github.com/samuel/go-zookeeper/zk" + "github.com/go-zookeeper/zk" "github.com/go-kit/kit/log" ) diff --git a/sd/zk/util_test.go b/sd/zk/util_test.go index 4f975a561..a041cc948 100644 --- a/sd/zk/util_test.go +++ b/sd/zk/util_test.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/samuel/go-zookeeper/zk" + "github.com/go-zookeeper/zk" "github.com/go-kit/kit/endpoint" "github.com/go-kit/kit/log"