command/write: new format

command/write_test.go

@@ -2,6 +2,8 @@ package command
 
 import (
 	"io"
+	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/vault/http"
@@ -25,7 +27,7 @@ func TestWrite(t *testing.T) {
 	args := []string{
 		"-address", addr,
 		"secret/foo",
-		"bar",
+		"value=bar",
 	}
 	if code := c.Run(args); code != 0 {
 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
@@ -41,7 +43,7 @@ func TestWrite(t *testing.T) {
 		t.Fatalf("err: %s", err)
 	}
 
-	if resp.Data[DefaultDataKey] != "bar" {
+	if resp.Data["value"] != "bar" {
 		t.Fatalf("bad: %#v", resp)
 	}
 }
@@ -90,3 +92,130 @@ func TestWrite_arbitrary(t *testing.T) {
 		t.Fatalf("bad: %#v", resp)
 	}
 }
+
+func TestWrite_escaped(t *testing.T) {
+	core, _, token := vault.TestCoreUnsealed(t)
+	ln, addr := http.TestServer(t, core)
+	defer ln.Close()
+
+	ui := new(cli.MockUi)
+	c := &WriteCommand{
+		Meta: Meta{
+			ClientToken: token,
+			Ui:          ui,
+		},
+	}
+
+	args := []string{
+		"-address", addr,
+		"secret/foo",
+		"value=\\@bar",
+	}
+	if code := c.Run(args); code != 0 {
+		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
+	}
+
+	client, err := c.Client()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	resp, err := client.Logical().Read("secret/foo")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if resp.Data["value"] != "@bar" {
+		t.Fatalf("bad: %#v", resp)
+	}
+}
+
+func TestWrite_file(t *testing.T) {
+	tf, err := ioutil.TempFile("", "vault")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	tf.Write([]byte(`{"foo":"bar"}`))
+	tf.Close()
+	defer os.Remove(tf.Name())
+
+	core, _, token := vault.TestCoreUnsealed(t)
+	ln, addr := http.TestServer(t, core)
+	defer ln.Close()
+
+	ui := new(cli.MockUi)
+	c := &WriteCommand{
+		Meta: Meta{
+			ClientToken: token,
+			Ui:          ui,
+		},
+	}
+
+	args := []string{
+		"-address", addr,
+		"secret/foo",
+		"@" + tf.Name(),
+	}
+	if code := c.Run(args); code != 0 {
+		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
+	}
+
+	client, err := c.Client()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	resp, err := client.Logical().Read("secret/foo")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if resp.Data["foo"] != "bar" {
+		t.Fatalf("bad: %#v", resp)
+	}
+}
+
+func TestWrite_fileValue(t *testing.T) {
+	tf, err := ioutil.TempFile("", "vault")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	tf.Write([]byte("foo"))
+	tf.Close()
+	defer os.Remove(tf.Name())
+
+	core, _, token := vault.TestCoreUnsealed(t)
+	ln, addr := http.TestServer(t, core)
+	defer ln.Close()
+
+	ui := new(cli.MockUi)
+	c := &WriteCommand{
+		Meta: Meta{
+			ClientToken: token,
+			Ui:          ui,
+		},
+	}
+
+	args := []string{
+		"-address", addr,
+		"secret/foo",
+		"value=@" + tf.Name(),
+	}
+	if code := c.Run(args); code != 0 {
+		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
+	}
+
+	client, err := c.Client()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	resp, err := client.Logical().Read("secret/foo")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if resp.Data["value"] != "foo" {
+		t.Fatalf("bad: %#v", resp)
+	}
+}