integration: rewrite etcd dumper to use new client

Author: mfojtik

test/integration/userclient_test.go

@@ -399,7 +399,7 @@ func TestUserInitialization(t *testing.T) {
 		},
 	}
 
-	oldEtcdClient, err := etcd.MakeNewEtcdClient(masterConfig.EtcdClientInfo)
+	oldEtcdClient, err := etcd.MakeEtcdClient(masterConfig.EtcdClientInfo)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

test/util/etcd.go

@@ -1,20 +1,18 @@
 package util
 
 import (
+	"encoding/json"
 	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"math/rand"
 	"os"
 	goruntime "runtime"
 	"strings"
 	"testing"
 
+	"golang.org/x/net/context"
+
 	"github.com/coreos/pkg/capnslog"
 
-	newetcdclient "github.com/coreos/etcd/client"
-	"github.com/coreos/go-etcd/etcd"
+	etcdclient "github.com/coreos/etcd/client"
 
 	"k8s.io/kubernetes/pkg/capabilities"
 	etcdtest "k8s.io/kubernetes/pkg/storage/etcd/testing"
@@ -46,27 +44,22 @@ func RequireEtcd(t *testing.T) *etcdtest.EtcdTestServer {
 	return s
 }
 
-func NewEtcdClient() *etcd.Client {
-	etcdServers := []string{GetEtcdURL()}
-
-	client := etcd.NewClient(etcdServers)
-	if err := serveretcd.TestEtcdClient(client); err != nil {
-		panic(err)
-	}
+func NewEtcdClient() etcdclient.Client {
+	client, _ := MakeNewEtcdClient()
 	return client
 }
 
-func MakeNewEtcdClient() (newetcdclient.Client, error) {
+func MakeNewEtcdClient() (etcdclient.Client, error) {
 	etcdServers := []string{GetEtcdURL()}
 
-	cfg := newetcdclient.Config{
+	cfg := etcdclient.Config{
 		Endpoints: etcdServers,
 	}
-	client, err := newetcdclient.New(cfg)
+	client, err := etcdclient.New(cfg)
 	if err != nil {
 		return nil, err
 	}
-	return client, serveretcd.TestNewEtcdClient(client)
+	return client, serveretcd.TestEtcdClient(client)
 }
 
 func GetEtcdURL() string {
@@ -76,16 +69,6 @@ func GetEtcdURL() string {
 	return url
 }
 
-func logEtcd() {
-	etcd.SetLogger(log.New(os.Stderr, "go-etcd", log.LstdFlags))
-}
-
-func withEtcdKey(f func(string)) {
-	prefix := fmt.Sprintf("/test-%d", rand.Int63())
-	defer NewEtcdClient().Delete(prefix, true)
-	f(prefix)
-}
-
 func DumpEtcdOnFailure(t *testing.T) {
 	if !t.Failed() {
 		return
@@ -99,16 +82,31 @@ func DumpEtcdOnFailure(t *testing.T) {
 		last = 0
 	}
 	name := f.Name()[last:]
-
 	client := NewEtcdClient()
-	etcdResponse, err := client.RawGet("/", false, true)
+	keyClient := etcdclient.NewKeysAPI(client)
+
+	response, err := keyClient.Get(context.Background(), "/", &etcdclient.GetOptions{Recursive: true, Sort: true})
 	if err != nil {
 		t.Logf("error dumping etcd: %v", err)
 		return
 	}
+	jsonResponse, err := json.Marshal(response.Node)
+	if err != nil {
+		t.Logf("error encoding etcd dump: %v", err)
+		return
+	}
 
-	if err := ioutil.WriteFile(GetBaseDir()+"/etcd-dump-"+name+".json", etcdResponse.Body, os.FileMode(0444)); err != nil {
-		t.Logf("error dumping etcd: %v", err)
+	t.Logf("dumping etcd to %q", GetBaseDir()+"/etcd-dump-"+name+".json")
+	dumpFile, err := os.OpenFile(GetBaseDir()+"/etcd-dump-"+name+".json", os.O_WRONLY|os.O_CREATE, 0444)
+	if err != nil {
+		t.Logf("error writing etcd dump: %v", err)
 		return
 	}
+	defer dumpFile.Close()
+	_, err = dumpFile.Write(jsonResponse)
+	if err != nil {
+		t.Logf("error writing etcd dump: %v", err)
+		return
+	}
+
 }