Merge branch 'master' into pki-csrs

hashicorp · Dec 9, 2015 · 22cb3ae · 22cb3ae
2 parents d6a5a28 + 53b5bbe
commit 22cb3ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -113,6 +113,8 @@ generate them, leading to client errors.
  * secret/generic: Validate given duration at write time, not just read time;
    if stored durations are not parseable, return a warning and the default
    duration rather than an error [GH-718]
+ * secret/generic: Return 400 instead of 500 when `generic` backend is written
+   to with no data fields [GH-825]
  * secret/postgresql: Revoke permissions before dropping a user or revocation
    may fail [GH-699]
 

diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
@@ -1,5 +1,5 @@
 resource "template_file" "install" {
-    filename = "${path.module}/scripts/install.sh.tpl"
+    template = "${file("${path.module}/scripts/install.sh.tpl")}"
 
     vars {
         download_url  = "${var.download-url}"

diff --git a/vault/logical_passthrough.go b/vault/logical_passthrough.go
@@ -149,7 +149,7 @@ func (b *PassthroughBackend) handleWrite(
 	req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 	// Check that some fields are given
 	if len(req.Data) == 0 {
-		return nil, fmt.Errorf("missing data fields")
+		return logical.ErrorResponse("missing data fields"), nil
 	}
 
 	// Check if there is a ttl key; verify parseability if so