From 369c81007255787dceba45d0d790263821f03ea0 Mon Sep 17 00:00:00 2001
From: Gerrit Tamboer <gerrit.tamboer@tamboer.it>
Date: Wed, 8 Feb 2017 13:37:37 +0100
Subject: [PATCH] Updated documentation

---
 builtin/providers/vault/resource_generic_secret.go | 14 ++------------
 .../vault/resource_generic_secret_test.go          |  2 ++
 .../docs/providers/vault/r/generic_secret.html.md  |  9 +++++++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/builtin/providers/vault/resource_generic_secret.go b/builtin/providers/vault/resource_generic_secret.go
index 79aed5afef..cbb8deda07 100644
--- a/builtin/providers/vault/resource_generic_secret.go
+++ b/builtin/providers/vault/resource_generic_secret.go
@@ -43,7 +43,7 @@ func genericSecretResource() *schema.Resource {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     false,
-				Description: "True if the provided token is allowed to read the secret from vault, and therefore canupdate values",
+				Description: "True if the provided token is allowed to read the secret from vault",
 			},
 		},
 	}
@@ -134,16 +134,6 @@ func genericSecretResourceRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.SetId(path)
+	log.Printf("[WARN] vault_generic_secret does not automatically refresh if allow_read is set to false")
 	return nil
-
-	// We don't actually attempt to read back the secret data
-	// here, so that Terraform can be configured with a token
-	// that has only write access to the relevant part of the
-	// store.
-	//
-	// This means that Terraform cannot detect drift for
-	// generic secrets, but detecting drift seems less important
-	// than being able to limit the effect of exposure of
-	// Terraform's Vault token.
-	// log.Printf("[WARN] vault_generic_secret does not automatically refresh")
 }
diff --git a/builtin/providers/vault/resource_generic_secret_test.go b/builtin/providers/vault/resource_generic_secret_test.go
index 7636565cdd..5acaac9b14 100644
--- a/builtin/providers/vault/resource_generic_secret_test.go
+++ b/builtin/providers/vault/resource_generic_secret_test.go
@@ -31,6 +31,7 @@ var testResourceGenericSecret_initialConfig = `
 
 resource "vault_generic_secret" "test" {
     path = "secret/foo"
+    allow_read = true
     data_json = <<EOT
 {
     "zip": "zap"
@@ -77,6 +78,7 @@ var testResourceGenericSecret_updateConfig = `
 
 resource "vault_generic_secret" "test" {
     path = "secret/foo"
+    allow_read = true
     data_json = <<EOT
 {
     "zip": "zoop"
diff --git a/website/source/docs/providers/vault/r/generic_secret.html.md b/website/source/docs/providers/vault/r/generic_secret.html.md
index 39c1030ba0..08fa0680ad 100644
--- a/website/source/docs/providers/vault/r/generic_secret.html.md
+++ b/website/source/docs/providers/vault/r/generic_secret.html.md
@@ -51,6 +51,10 @@ see which endpoints support the `PUT` and `DELETE` methods.
 * `data_json` - (Required) String containing a JSON-encoded object that
 will be written as the secret data at the given path.
 
+* `allow_read` - (Optional) True/false. Set this to true if your vault
+authentication is able to read the data, this allows the resource to be
+compared and updated. Defaults to false.
+
 ## Required Vault Capabilities
 
 Use of this resource requires the `create` or `update` capability
@@ -59,10 +63,11 @@ along with the `delete` capbility if the resource is removed from
 configuration.
 
 This resource does not *read* the secret data back from Terraform
-on refresh. This avoids the need for `read` access on the given
+on refresh by default. This avoids the need for `read` access on the given
 path, but it means that Terraform is not able to detect and repair
 "drift" on this resource should the data be updated or deleted outside
-of Terraform.
+of Terraform. This limitation can be negated by setting `allow_read` to
+true
 
 ## Attributes Reference