From bc58e02fe8ca839747c71c81b07ee1880da249eb Mon Sep 17 00:00:00 2001 From: Laura Bennett Date: Sat, 8 Oct 2016 20:22:26 -0400 Subject: [PATCH] initial commit to fix empty consistency option issue --- builtin/logical/cassandra/backend_test.go | 13 ++++++++++++- builtin/logical/cassandra/path_roles.go | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/builtin/logical/cassandra/backend_test.go b/builtin/logical/cassandra/backend_test.go index 2c04dc9b71..4dceb74c5b 100644 --- a/builtin/logical/cassandra/backend_test.go +++ b/builtin/logical/cassandra/backend_test.go @@ -35,7 +35,7 @@ func TestBackend_roleCrud(t *testing.T) { Backend: b, Steps: []logicaltest.TestStep{ testAccStepConfig(t), - testAccStepRole(t), + testAccStepRoleWithOptions(t), testAccStepReadRole(t, "test", testRole), testAccStepDeleteRole(t, "test"), testAccStepReadRole(t, "test", ""), @@ -67,6 +67,17 @@ func testAccStepRole(t *testing.T) logicaltest.TestStep { Path: "roles/test", Data: map[string]interface{}{ "creation_cql": testRole, + }, + } +} + +func testAccStepRoleWithOptions(t *testing.T) logicaltest.TestStep { + return logicaltest.TestStep{ + Operation: logical.UpdateOperation, + Path: "roles/test2", + Data: map[string]interface{}{ + "creation_cql": testRole, + "lease": "30s", "consistency": "All", }, } diff --git a/builtin/logical/cassandra/path_roles.go b/builtin/logical/cassandra/path_roles.go index 5226627db9..68087c3f38 100644 --- a/builtin/logical/cassandra/path_roles.go +++ b/builtin/logical/cassandra/path_roles.go @@ -131,6 +131,9 @@ func (b *backend) pathRoleCreate( } consistencyStr := data.Get("consistency").(string) + if consistencyStr == "" { + consistencyStr = "Quorum" + } _, err = gocql.ParseConsistencyWrapper(consistencyStr) if err != nil { return logical.ErrorResponse(fmt.Sprintf(