From cc1155c93b3b58571a8447c7d647e0ee2a5b22e9 Mon Sep 17 00:00:00 2001
From: Xiang Li <xiangli.cs@gmail.com>
Date: Tue, 7 Jun 2016 21:17:32 -0700
Subject: [PATCH] etcdserver: make usernameFromCtx more go style

---
 etcdserver/v3_server.go | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
index 0307798da..09a6263a7 100644
--- a/etcdserver/v3_server.go
+++ b/etcdserver/v3_server.go
@@ -394,20 +394,23 @@ func (s *EtcdServer) RoleDelete(ctx context.Context, r *pb.AuthRoleDeleteRequest
 }
 
 func (s *EtcdServer) usernameFromCtx(ctx context.Context) (string, error) {
-	md, mdexist := metadata.FromContext(ctx)
-	if mdexist {
-		token, texist := md["token"]
-		if texist {
-			username, uexist := s.AuthStore().UsernameFromToken(token[0])
-			if !uexist {
-				plog.Warningf("invalid auth token: %s", token[0])
-				return "", ErrInvalidAuthToken
-			}
-			return username, nil
-		}
+	md, ok := metadata.FromContext(ctx)
+	if !ok {
+		return "", nil
 	}
 
-	return "", nil
+	ts, tok := md["token"]
+	if !tok {
+		return "", nil
+	}
+
+	token := ts[0]
+	username, uok := s.AuthStore().UsernameFromToken(token)
+	if !uok {
+		plog.Warningf("invalid auth token: %s", token)
+		return "", ErrInvalidAuthToken
+	}
+	return username, nil
 }
 
 func (s *EtcdServer) processInternalRaftRequest(ctx context.Context, r pb.InternalRaftRequest) (*applyResult, error) {