From 971eabb5475d401ccc3355274547fa3976d9e65c Mon Sep 17 00:00:00 2001
From: Will May <will.j.may@gmail.com>
Date: Sat, 13 May 2017 08:49:40 +0100
Subject: [PATCH] provider/vault: Support remounting in the vault_mount
 resource

---
 builtin/providers/vault/resource_mount.go      | 18 ++++++++++++++++--
 builtin/providers/vault/resource_mount_test.go |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/builtin/providers/vault/resource_mount.go b/builtin/providers/vault/resource_mount.go
index 72c32fa6e..59481d690 100644
--- a/builtin/providers/vault/resource_mount.go
+++ b/builtin/providers/vault/resource_mount.go
@@ -18,7 +18,7 @@ func mountResource() *schema.Resource {
 			"path": {
 				Type:        schema.TypeString,
 				Required:    true,
-				ForceNew:    true,
+				ForceNew:    false,
 				Description: "Where the secret backend will be mounted",
 			},
 
@@ -70,7 +70,7 @@ func mountWrite(d *schema.ResourceData, meta interface{}) error {
 
 	path := d.Get("path").(string)
 
-	log.Printf("[DEBUG] Writing mount %s to Vault", path)
+	log.Printf("[DEBUG] Creating mount %s in Vault", path)
 
 	if err := client.Sys().Mount(path, info); err != nil {
 		return fmt.Errorf("error writing to Vault: %s", err)
@@ -91,6 +91,20 @@ func mountUpdate(d *schema.ResourceData, meta interface{}) error {
 
 	path := d.Id()
 
+	if d.HasChange("path") {
+		newPath := d.Get("path").(string)
+
+		log.Printf("[DEBUG] Remount %s to %s in Vault", path, newPath)
+
+		err := client.Sys().Remount(d.Id(), newPath)
+		if err != nil {
+			return fmt.Errorf("error remounting in Vault: %s", err)
+		}
+
+		d.SetId(newPath)
+		path = newPath
+	}
+
 	log.Printf("[DEBUG] Updating mount %s in Vault", path)
 
 	if err := client.Sys().TuneMount(path, config); err != nil {
diff --git a/builtin/providers/vault/resource_mount_test.go b/builtin/providers/vault/resource_mount_test.go
index 425d88dc5..61816fc7c 100644
--- a/builtin/providers/vault/resource_mount_test.go
+++ b/builtin/providers/vault/resource_mount_test.go
@@ -86,7 +86,7 @@ func testResourceMount_initialCheck(s *terraform.State) error {
 var testResourceMount_updateConfig = `
 
 resource "vault_mount" "test" {
-	path = "example"
+	path = "remountingExample"
 	type = "generic"
 	description = "Example mount for testing"
 	default_lease_ttl_seconds = 7200
@@ -105,7 +105,7 @@ func testResourceMount_updateCheck(s *terraform.State) error {
 		return fmt.Errorf("id doesn't match path")
 	}
 
-	if path != "example" {
+	if path != "remountingExample" {
 		return fmt.Errorf("unexpected path value")
 	}