added cas support for consul_keys resource

consul/key_client.go

@@ -75,6 +75,19 @@ func (c *keyClient) Put(path, value string, flags int) error {
 	return nil
 }
 
+func (c *keyClient) Cas(path, value string, flags int, cas int) (bool, error) {
+	log.Printf(
+		"[DEBUG] Setting key '%s' to '%v' with cas %d in %s",
+		path, value, cas, c.wOpts.Datacenter,
+	)
+	pair := consulapi.KVPair{Key: path, Value: []byte(value), Flags: uint64(flags), ModifyIndex: uint64(cas)}
+	written, _, err := c.client.CAS(&pair, c.wOpts)
+	if err != nil {
+		return false, fmt.Errorf("failed to write Consul key '%s': %s", path, err)
+	}
+	return written, nil
+}
+
 func (c *keyClient) Delete(path string) error {
 	log.Printf(
 		"[DEBUG] Deleting key '%s' in %s",

consul/resource_consul_keys.go

@@ -70,7 +70,11 @@ func resourceConsulKeys() *schema.Resource {
 							Optional: true,
 							Default:  0,
 						},
-
+						"cas": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Default:  -1,
+						},
 						"default": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -111,7 +115,6 @@ func resourceConsulKeys() *schema.Resource {
 
 func resourceConsulKeysCreateUpdate(d *schema.ResourceData, meta interface{}) error {
 	keyClient := newKeyClient(d, meta)
-
 	if d.HasChange("key") {
 		o, n := d.GetChange("key")
 		if o == nil {
@@ -154,7 +157,15 @@ func resourceConsulKeysCreateUpdate(d *schema.ResourceData, meta interface{}) er
 			}
 
 			flags := sub["flags"].(int)
-
+			cas := sub["cas"].(int)
+			if cas != -1 {
+				_, err := keyClient.Cas(path, value, flags, cas)
+				if err != nil {
+					return err
+				}
+				addedPaths[path] = true
+				continue
+			}
 			if err := keyClient.Put(path, value, flags); err != nil {
 				return err
 			}

consul/resource_consul_keys_migrate_test.go

@@ -35,17 +35,19 @@ func TestConsulKeysMigrateState(t *testing.T) {
 			},
 			Expected: map[string]string{
 				"key.#":                  "2",
-				"key.3630941097.default": "",
-				"key.3630941097.delete":  "true",
-				"key.3630941097.name":    "temp",
-				"key.3630941097.path":    "foo/foo",
-				"key.3630941097.value":   "",
-				"key.3975462262.path":    "foo/bar",
-				"key.3975462262.default": "",
-				"key.3975462262.delete":  "false",
-				"key.3975462262.name":    "hello",
-				"key.3975462262.value":   "world",
-				"key.3975462262.flags":   "0",
+				"key.1529757638.default": "",
+				"key.1529757638.delete":  "true",
+				"key.3609964659.name":    "hello",
+				"key.1529757638.path":    "foo/foo",
+				"key.1529757638.value":   "",
+				"key.1529757638.flags":   "0",
+				"key.1529757638.cas":     "0",
+				"key.3609964659.path":    "foo/bar",
+				"key.3609964659.default": "",
+				"key.3609964659.delete":  "false",
+				"key.1529757638.name":    "temp",
+				"key.3609964659.value":   "world",
+				"key.3609964659.cas":     "0",
 			},
 		},
 	}

consul/resource_consul_keys_test.go

@@ -26,7 +26,7 @@ func TestAccConsulKeys_basic(t *testing.T) {
 					testAccCheckConsulKeysValue("consul_keys.app", "enabled", "true"),
 					testAccCheckConsulKeysValue("consul_keys.app", "set", "acceptance"),
 					testAccCheckConsulKeysValue("consul_keys.app", "remove_one", "hello"),
-					resource.TestCheckResourceAttr("consul_keys.app", "key.4258512057.flags", "0"),
+					resource.TestCheckResourceAttr("consul_keys.app", "key.3606807749.flags", "0"),
 				),
 			},
 			{
@@ -42,6 +42,24 @@ func TestAccConsulKeys_basic(t *testing.T) {
 	})
 }
 
+func TestAccConsulKeys_Cas(t *testing.T) {
+	providers, _ := startTestServer(t)
+
+	resource.Test(t, resource.TestCase{
+		Providers: providers,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccConsulKeysConfig_Cas,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("consul_keys.app", "key.2637474718.value", "testVal"),
+					resource.TestCheckResourceAttr("consul_keys.app", "key.2637474718.path", "test/testKey"),
+					resource.TestCheckResourceAttr("consul_keys.app", "key.2637474718.cas", "0"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccConsulKeys_EmptyValue(t *testing.T) {
 	providers, client := startTestServer(t)
 
@@ -286,3 +304,14 @@ resource "consul_keys" "dc2" {
 	}
 }
 `
+
+const testAccConsulKeysConfig_Cas = `
+resource "consul_keys" "app" {
+	datacenter = "dc1"
+	key {
+		path = "test/testKey"
+		value = "testVal"
+		cas = 0
+	}
+}
+`