From 931dfd7da88b8f7fb56bca63e694d9f0e60f5af0 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 18 Dec 2017 14:19:45 -0800
Subject: [PATCH] etcd-dump-logs: take data-dir as argument, add TODO

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 tools/etcd-dump-logs/main.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go
index 17343180a..fb72be100 100644
--- a/tools/etcd-dump-logs/main.go
+++ b/tools/etcd-dump-logs/main.go
@@ -31,13 +31,15 @@ import (
 )
 
 func main() {
-	from := flag.String("data-dir", "", "")
 	snapfile := flag.String("start-snap", "", "The base name of snapshot file to start dumping")
 	index := flag.Uint64("start-index", 0, "The index to start dumping")
 	flag.Parse()
-	if *from == "" {
-		log.Fatal("Must provide -data-dir flag.")
+
+	if len(flag.Args()) != 1 {
+		log.Fatalf("Must provide data-dir argument (got %+v)", flag.Args())
 	}
+	dataDir := flag.Args()[0]
+
 	if *snapfile != "" && *index != 0 {
 		log.Fatal("start-snap and start-index flags cannot be used together.")
 	}
@@ -55,10 +57,10 @@ func main() {
 		walsnap.Index = *index
 	} else {
 		if *snapfile == "" {
-			ss := snap.New(snapDir(*from))
+			ss := snap.New(snapDir(dataDir))
 			snapshot, err = ss.Load()
 		} else {
-			snapshot, err = snap.Read(filepath.Join(snapDir(*from), *snapfile))
+			snapshot, err = snap.Read(filepath.Join(snapDir(dataDir), *snapfile))
 		}
 
 		switch err {
@@ -75,7 +77,7 @@ func main() {
 		fmt.Println("Start dupmping log entries from snapshot.")
 	}
 
-	w, err := wal.OpenForRead(walDir(*from), walsnap)
+	w, err := wal.OpenForRead(walDir(dataDir), walsnap)
 	if err != nil {
 		log.Fatalf("Failed opening WAL: %v", err)
 	}
@@ -104,6 +106,8 @@ func main() {
 				break
 			}
 
+			// TODO: remove sensitive information
+			// (https://github.com/coreos/etcd/issues/7620)
 			var r etcdserverpb.Request
 			if err := r.Unmarshal(e.Data); err == nil {
 				switch r.Method {