runtimevar/etcdvar: Bring back runtimevar/etcdvar

allmodules

@@ -17,6 +17,6 @@ internal/website             no
 pubsub/kafkapubsub           yes
 pubsub/natspubsub            yes
 pubsub/rabbitpubsub          yes
-#runtimevar/etcdvar           yes
+runtimevar/etcdvar           yes
 samples                      no
 secrets/hashivault           yes

internal/testing/alldeps

@@ -58,6 +58,8 @@ github.com/aws/aws-sdk-go-v2/service/sts
 github.com/aws/smithy-go
 github.com/cenkalti/backoff/v3
 github.com/census-instrumentation/opencensus-proto
+github.com/coreos/go-semver
+github.com/coreos/go-systemd/v22
 github.com/davecgh/go-spew
 github.com/dimchansky/utfbom
 github.com/eapache/go-resiliency
@@ -66,6 +68,7 @@ github.com/eapache/queue
 github.com/fatih/color
 github.com/fsnotify/fsnotify
 github.com/go-sql-driver/mysql
+github.com/gogo/protobuf
 github.com/golang-jwt/jwt/v4
 github.com/golang/groupcache
 github.com/golang/protobuf
@@ -131,6 +134,10 @@ github.com/xdg-go/pbkdf2
 github.com/xdg-go/scram
 github.com/xdg-go/stringprep
 github.com/youmark/pkcs8
+go.etcd.io/etcd
+go.etcd.io/etcd/api/v3
+go.etcd.io/etcd/client/pkg/v3
+go.etcd.io/etcd/client/v3
 go.mongodb.org/mongo-driver
 go.opencensus.io
 go.uber.org/atomic
@@ -142,6 +149,7 @@ gocloud.dev/internal/website
 gocloud.dev/pubsub/kafkapubsub
 gocloud.dev/pubsub/natspubsub
 gocloud.dev/pubsub/rabbitpubsub
+gocloud.dev/runtimevar/etcdvar
 gocloud.dev/samples
 gocloud.dev/secrets/hashivault
 golang.org/x/crypto

runtimevar/etcdvar/etcdvar.go

@@ -41,7 +41,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"gocloud.dev/gcerrors"
 	"gocloud.dev/runtimevar"

runtimevar/etcdvar/etcdvar_test.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"gocloud.dev/internal/testing/setup"
 	"gocloud.dev/runtimevar"

runtimevar/etcdvar/example_test.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"log"
 
-	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/client/v3"
 	"gocloud.dev/runtimevar"
 	"gocloud.dev/runtimevar/etcdvar"
 )

runtimevar/etcdvar/go.mod

@@ -17,30 +17,17 @@ module gocloud.dev/runtimevar/etcdvar
 go 1.12
 
 require (
-	github.com/coreos/bbolt v1.3.2 // indirect
-	github.com/coreos/etcd v3.3.13+incompatible // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/google/go-cmp v0.5.6
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/prometheus/client_golang v0.9.3 // indirect
-	github.com/prometheus/common v0.4.1 // indirect
-	github.com/prometheus/procfs v0.0.2 // indirect
-	github.com/sirupsen/logrus v1.4.2 // indirect
-	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/bbolt v1.3.2 // indirect
-	go.etcd.io/etcd v3.3.13+incompatible
-	gocloud.dev v0.23.0
-	google.golang.org/grpc v1.39.1
-	google.golang.org/grpc/examples v0.0.0-20210805213004-fc30d5b571f5 // indirect
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
+	github.com/google/go-cmp v0.5.8
+	github.com/googleapis/gax-go/v2 v2.5.1 // indirect
+	go.etcd.io/etcd v3.3.27+incompatible
+	go.etcd.io/etcd/client/v3 v3.5.4
+	go.uber.org/zap v1.22.0 // indirect
+	gocloud.dev v0.26.0
+	golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
+	golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
+	google.golang.org/genproto v0.0.0-20220808204814-fd01256a5276 // indirect
+	google.golang.org/grpc v1.48.0
 )
 
 replace gocloud.dev => ../../

runtimevar/etcdvar/localetcd.sh

@@ -21,6 +21,6 @@ set -euo pipefail
 # Clean up and run etcd.
 echo "Starting etcd..."
 docker rm -f etcd &> /dev/null || :
-docker run -d -p 2379:2379 -p 4001:4001 --name etcd quay.io/coreos/etcd:v3.4.14 /usr/local/bin/etcd --advertise-client-urls http://0.0.0.0:2379 --listen-client-urls http://0.0.0.0:2379 &> /dev/null
+docker run -d -p 2379:2379 -p 4001:4001 --name etcd quay.io/coreos/etcd:v3.5.4 /usr/local/bin/etcd --advertise-client-urls http://0.0.0.0:2379 --listen-client-urls http://0.0.0.0:2379 &> /dev/null
 echo "...done. Run \"docker rm -f etcd\" to clean up the container."
 echo