resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provider/vault: Support remounting in the vault_mount resource

This commit is contained in:
Will May 2017-05-13 08:49:40 +01:00 committed by Martin Atkins
parent 1d294aeb45
commit 971eabb547
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/providers/vault/resource_mount.go
View File

@ -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 {

4
builtin/providers/vault/resource_mount_test.go
View File

@ -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")
}