From 1f36a195cef2baadc80ce70265619e3d66e38997 Mon Sep 17 00:00:00 2001
From: akihiro-ikezoe <akihiro-ikezoe@cybozu.co.jp>
Date: Mon, 3 Sep 2018 10:52:28 +0900
Subject: [PATCH 1/5] change etcd TLS config

https://github.com/cybozu-go/etcdutil/pull/3
---
 cmd/sabakan/main.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/sabakan/main.go b/cmd/sabakan/main.go
index 4f06bb96..3992af77 100644
--- a/cmd/sabakan/main.go
+++ b/cmd/sabakan/main.go
@@ -64,9 +64,9 @@ func main() {
 		cfg.Etcd.Timeout = *flagEtcdTimeout
 		cfg.Etcd.Username = *flagEtcdUsername
 		cfg.Etcd.Password = *flagEtcdPassword
-		cfg.Etcd.TLSCA = *flagEtcdTLSCA
-		cfg.Etcd.TLSCert = *flagEtcdTLSCert
-		cfg.Etcd.TLSKey = *flagEtcdTLSKey
+		cfg.Etcd.TLSCAFile = *flagEtcdTLSCA
+		cfg.Etcd.TLSCertFile = *flagEtcdTLSCert
+		cfg.Etcd.TLSKeyFile = *flagEtcdTLSKey
 	} else {
 		f, err := os.Open(*flagConfigFile)
 		if err != nil {

From 0ed9fd494fd3ce1e92f9f004e34e02c202e14153 Mon Sep 17 00:00:00 2001
From: akihiro-ikezoe <akihiro-ikezoe@cybozu.co.jp>
Date: Mon, 3 Sep 2018 11:04:33 +0900
Subject: [PATCH 2/5] fix etcd version

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e1fbdc7..05afbf95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,6 +7,9 @@ jobs:
     working_directory: /go/src/github.com/cybozu-go/sabakan
     steps:
       - checkout
+      # TODO use go mod
+      - run: go get -v -t -d ./...
+      - run: (cd /go/src/github.com/coreos/etcd; git checkout v3.3.9)
       - run: go get -v -t -d ./...
       - run: test -z "$(goimports -d . | tee /dev/stderr)"
       - run: golint -set_exit_status ./...

From 80f188df1d7e79213206d0b1205e8f36509e60cc Mon Sep 17 00:00:00 2001
From: akihiro-ikezoe <akihiro-ikezoe@cybozu.co.jp>
Date: Mon, 3 Sep 2018 11:14:02 +0900
Subject: [PATCH 3/5] fix etcd version

---
 mtest/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mtest/Makefile b/mtest/Makefile
index 2e68b16c..3a4227f9 100644
--- a/mtest/Makefile
+++ b/mtest/Makefile
@@ -67,7 +67,7 @@ $(OUTPUT)/etcd $(OUTPUT)/etcdctl: $(ETCD_ARCHIVE)
 
 $(OUTPUT)/sabakan $(OUTPUT)/sabactl:
 	mkdir -p $(OUTPUT)
-	cd ..; go get ./... && GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
+	cd ..; go get -d ./... && GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
 
 $(OUTPUT)/cluster.yml: cluster.yml
 	mkdir -p $(OUTPUT)
@@ -137,6 +137,9 @@ clean:
 
 setup:
 	go get -t -d ./...
+	cd $$GOPATH/src/github.com/coreos/etcd; \
+		git fetch origin && \
+		git checkout v3.3.9
 	go get -u github.com/onsi/ginkgo/ginkgo
 	go get -u github.com/cybozu-go/placemat/...
 

From a9af0ae49f087ea9312e9d459c6fad64b83dbb23 Mon Sep 17 00:00:00 2001
From: akihiro-ikezoe <akihiro-ikezoe@cybozu.co.jp>
Date: Mon, 3 Sep 2018 11:33:29 +0900
Subject: [PATCH 4/5] fix to build sabakan

---
 mtest/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mtest/Makefile b/mtest/Makefile
index 3a4227f9..f9eed86a 100644
--- a/mtest/Makefile
+++ b/mtest/Makefile
@@ -67,7 +67,13 @@ $(OUTPUT)/etcd $(OUTPUT)/etcdctl: $(ETCD_ARCHIVE)
 
 $(OUTPUT)/sabakan $(OUTPUT)/sabactl:
 	mkdir -p $(OUTPUT)
-	cd ..; go get -d ./... && GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
+	cd ..; \
+		go get -d ./... && \
+		cd $$GOPATH/src/github.com/coreos/etcd && \
+		git fetch origin && \
+		git checkout v3.3.9
+	cd ..; \
+		GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
 
 $(OUTPUT)/cluster.yml: cluster.yml
 	mkdir -p $(OUTPUT)
@@ -137,9 +143,6 @@ clean:
 
 setup:
 	go get -t -d ./...
-	cd $$GOPATH/src/github.com/coreos/etcd; \
-		git fetch origin && \
-		git checkout v3.3.9
 	go get -u github.com/onsi/ginkgo/ginkgo
 	go get -u github.com/cybozu-go/placemat/...
 

From ad3ab2c27cc92364c24a0cd965bd0f773f35f0de Mon Sep 17 00:00:00 2001
From: akihiro-ikezoe <akihiro-ikezoe@cybozu.co.jp>
Date: Mon, 3 Sep 2018 11:56:46 +0900
Subject: [PATCH 5/5] fix

---
 mtest/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mtest/Makefile b/mtest/Makefile
index f9eed86a..aac2a9e8 100644
--- a/mtest/Makefile
+++ b/mtest/Makefile
@@ -73,6 +73,7 @@ $(OUTPUT)/sabakan $(OUTPUT)/sabactl:
 		git fetch origin && \
 		git checkout v3.3.9
 	cd ..; \
+		go get -d ./... && \
 		GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
 
 $(OUTPUT)/cluster.yml: cluster.yml