From 3886d68de3de7a42cf48aa8142ee613db4a623b6 Mon Sep 17 00:00:00 2001
From: Eyal Lupu <elupu@websense.com>
Date: Fri, 19 Feb 2016 12:19:01 +0000
Subject: [PATCH] 1. gofmt 2. Change if expr syntax to be consist with the rest
 of Vault code 3. More details on error message

---
 physical/zookeeper.go | 86 +++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/physical/zookeeper.go b/physical/zookeeper.go
index bc177a8936..64dc4afdb0 100644
--- a/physical/zookeeper.go
+++ b/physical/zookeeper.go
@@ -26,7 +26,7 @@ const (
 type ZookeeperBackend struct {
 	path   string
 	client *zk.Conn
-    acl     []zk.ACL
+	acl    []zk.ACL
 }
 
 // newZookeeperBackend constructs a Zookeeper backend using the given API client
@@ -53,43 +53,41 @@ func newZookeeperBackend(conf map[string]string) (Backend, error) {
 		machines = "localhost:2181"
 	}
 
-    // zNode owner and schema.
-    var owner string
-    var schema string
-    var schemaAndOwner string
-    schemaAndOwner, ok = conf["znode_owner"]
-    if !ok {
-        owner = "anyone"
-        schema = "world"
-    } else {
-        parsedSchemaAndOwner := strings.SplitN(schemaAndOwner, ":", 2)
-        if !(len(parsedSchemaAndOwner)==2) {
-            return nil, fmt.Errorf("znode_owner expected format is 'schema:owner'")
-        } else {
-            schema = parsedSchemaAndOwner[0]
-            owner = parsedSchemaAndOwner[1]
-        }
-    }
+	// zNode owner and schema.
+	var owner string
+	var schema string
+	var schemaAndOwner string
+	schemaAndOwner, ok = conf["znode_owner"]
+	if !ok {
+		owner = "anyone"
+		schema = "world"
+	} else {
+		parsedSchemaAndOwner := strings.SplitN(schemaAndOwner, ":", 2)
+		if len(parsedSchemaAndOwner) != 2 {
+			return nil, fmt.Errorf("znode_owner expected format is 'schema:owner'")
+		} else {
+			schema = parsedSchemaAndOwner[0]
+			owner = parsedSchemaAndOwner[1]
+		}
+	}
 
-    acl := []zk.ACL{{zk.PermAll, schema, owner}} 
-
-
-    // Authnetication info
-    var schemaAndUser string
-    schemaAndUser, ok = conf["auth_info"]
-    if !ok {
-        owner = ""
-        schema = ""
-    } else {
-        parsedSchemaAndUser := strings.SplitN(schemaAndUser, ":", 2)
-        if !(len(parsedSchemaAndUser)==2) {
-            return nil, fmt.Errorf("auth_info expected format is 'schema:auth'")
-        } else {
-            schema = parsedSchemaAndUser[0]
-            owner = parsedSchemaAndUser[1]
-        }
-    }   
+	acl := []zk.ACL{{zk.PermAll, schema, owner}}
 
+	// Authnetication info
+	var schemaAndUser string
+	schemaAndUser, ok = conf["auth_info"]
+	if !ok {
+		owner = ""
+		schema = ""
+	} else {
+		parsedSchemaAndUser := strings.SplitN(schemaAndUser, ":", 2)
+		if len(parsedSchemaAndUser) != 2 {
+			return nil, fmt.Errorf("auth_info expected format is 'schema:auth'")
+		} else {
+			schema = parsedSchemaAndUser[0]
+			owner = parsedSchemaAndUser[1]
+		}
+	}
 
 	// Attempt to create the ZK client
 	client, _, err := zk.Connect(strings.Split(machines, ","), time.Second)
@@ -97,19 +95,19 @@ func newZookeeperBackend(conf map[string]string) (Backend, error) {
 		return nil, fmt.Errorf("client setup failed: %v", err)
 	}
 
-    // If auth_info provided - attempt to authenticate 
-    if owner != "" {
-        err = client.AddAuth(schema, []byte(owner))
-        if err != nil {
-            return nil, fmt.Errorf("Zookeeper rejected authentication information provided at auth_info")
-        }
-    }
+	// If auth_info provided - attempt to authenticate
+	if owner != "" {
+		err = client.AddAuth(schema, []byte(owner))
+		if err != nil {
+			return nil, fmt.Errorf("Zookeeper rejected authentication information provided at auth_info: %v", err)
+		}
+	}
 
 	// Setup the backend
 	c := &ZookeeperBackend{
 		path:   path,
 		client: client,
-        acl:    acl,
+		acl:    acl,
 	}
 	return c, nil
 }