From dd7d64dd804c29b5e7f5e051caa49d70e397d457 Mon Sep 17 00:00:00 2001
From: Jonathan Sokolowski <jsok@expert360.com>
Date: Thu, 28 May 2015 09:36:23 +1000
Subject: [PATCH] logical/consul: Combine policy and lease into single storage
 struct

---
 builtin/logical/consul/path_roles.go | 51 ++++++++++++----------------
 builtin/logical/consul/path_token.go | 24 +++++--------
 2 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/builtin/logical/consul/path_roles.go b/builtin/logical/consul/path_roles.go
index 3115f6e93d..6985f6a35a 100644
--- a/builtin/logical/consul/path_roles.go
+++ b/builtin/logical/consul/path_roles.go
@@ -41,30 +41,24 @@ func pathRolesRead(
 	req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
 	name := d.Get("name").(string)
 
-	// Read the policy
-	policy, err := req.Storage.Get("policy/" + name)
+	entry, err := req.Storage.Get("policy/" + name)
 	if err != nil {
-		return nil, fmt.Errorf("error retrieving role: %s", err)
+		return nil, err
 	}
-	if policy == nil {
-		return logical.ErrorResponse(fmt.Sprintf(
-			"Role '%s' not found", name)), nil
+	if entry == nil {
+		return nil, nil
 	}
 
-	leaseRaw, err := req.Storage.Get("policy/" + name + "/lease")
-	if err != nil {
-		return nil, fmt.Errorf("error retrieving lease: %s", err)
-	}
-	lease, err := time.ParseDuration(string(leaseRaw.Value))
-	if err != nil {
-		return nil, fmt.Errorf("error retrieving lease: %s", err)
+	var result roleConfig
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
 	}
 
 	// Generate the response
 	resp := &logical.Response{
 		Data: map[string]interface{}{
-			"policy": base64.StdEncoding.EncodeToString(policy.Value),
-			"lease":  lease.String(),
+			"policy": base64.StdEncoding.EncodeToString([]byte(result.Policy)),
+			"lease":  result.Lease.String(),
 		},
 	}
 	return resp, nil
@@ -78,26 +72,20 @@ func pathRolesWrite(
 		return logical.ErrorResponse(fmt.Sprintf(
 			"Error decoding policy base64: %s", err)), nil
 	}
+	lease, err := time.ParseDuration(d.Get("lease").(string))
+	if err != nil || lease == time.Duration(0) {
+		lease = DefaultLeaseDuration
+	}
 
-	// Write the policy into storage
-	err = req.Storage.Put(&logical.StorageEntry{
-		Key:   "policy/" + name,
-		Value: policyRaw,
+	entry, err := logical.StorageEntryJSON("policy/"+name, roleConfig{
+		Policy: string(policyRaw),
+		Lease:  lease,
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	// Write the policy lease into storage
-	lease, err := time.ParseDuration(d.Get("lease").(string))
-	if err != nil || lease == time.Duration(0) {
-		lease = DefaultLeaseDuration
-	}
-	err = req.Storage.Put(&logical.StorageEntry{
-		Key:   "policy/" + name + "/lease",
-		Value: []byte(lease.String()),
-	})
-	if err != nil {
+	if err := req.Storage.Put(entry); err != nil {
 		return nil, err
 	}
 
@@ -112,3 +100,8 @@ func pathRolesDelete(
 	}
 	return nil, nil
 }
+
+type roleConfig struct {
+	Policy string        `json:"policy"`
+	Lease  time.Duration `json:"lease"`
+}
diff --git a/builtin/logical/consul/path_token.go b/builtin/logical/consul/path_token.go
index 5af73c6247..bab2d98872 100644
--- a/builtin/logical/consul/path_token.go
+++ b/builtin/logical/consul/path_token.go
@@ -29,18 +29,17 @@ func (b *backend) pathTokenRead(
 	req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
 	name := d.Get("name").(string)
 
-	// Read the policy
-	policy, err := req.Storage.Get("policy/" + name)
+	entry, err := req.Storage.Get("policy/" + name)
 	if err != nil {
 		return nil, fmt.Errorf("error retrieving role: %s", err)
 	}
-	if policy == nil {
-		return logical.ErrorResponse(fmt.Sprintf(
-			"Role '%s' not found", name)), nil
+	if entry == nil {
+		return logical.ErrorResponse(fmt.Sprintf("Role '%s' not found", name)), nil
 	}
-	leaseRaw, err := req.Storage.Get("policy/" + name + "/lease")
-	if err != nil {
-		return nil, fmt.Errorf("error retrieving lease: %s", err)
+
+	var result roleConfig
+	if err := entry.DecodeJSON(&result); err != nil {
+		return nil, err
 	}
 
 	// Get the consul client
@@ -55,7 +54,7 @@ func (b *backend) pathTokenRead(
 	token, _, err := c.ACL().Create(&api.ACLEntry{
 		Name:  tokenName,
 		Type:  "client",
-		Rules: string(policy.Value),
+		Rules: result.Policy,
 	}, nil)
 	if err != nil {
 		return logical.ErrorResponse(err.Error()), nil
@@ -63,12 +62,7 @@ func (b *backend) pathTokenRead(
 
 	// Use the helper to create the secret
 	s := b.Secret(SecretTokenType)
-	if leaseRaw != nil {
-		lease, err := time.ParseDuration(string(leaseRaw.Value))
-		if err == nil {
-			s.DefaultDuration = lease
-		}
-	}
+	s.DefaultDuration = result.Lease
 	return s.Response(map[string]interface{}{
 		"token": token,
 	}, nil), nil