Merge pull request #1703 from endocode/dongsu/dynamic-metadata

api,functional: dynamic metadata - fix bugs and add functional tests
coreos · Nov 11, 2016 · 79001ad · 79001ad
2 parents 868a18f + 0823b91
commit 79001ad
Show file tree

Hide file tree

Showing 4 changed files with 491 additions and 10 deletions.
diff --git a/api/machines.go b/api/machines.go
@@ -44,8 +44,10 @@ type machinesResource struct {
 
 type machineMetadataOp struct {
 	Operation string `json:"op"`
-	Path      string
-	Value     string
+	Path      string `json:"path"`
+	Value     struct {
+		Value string `json:"value"`
+	}
 }
 
 func (mr *machinesResource) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
@@ -100,7 +102,7 @@ func (mr *machinesResource) patch(rw http.ResponseWriter, req *http.Request) {
 			return
 		}
 
-		if op.Operation != "remove" && len(op.Value) == 0 {
+		if op.Operation != "remove" && len(op.Value.Value) == 0 {
 			sendError(rw, http.StatusBadRequest, errors.New("invalid value: add and replace require a value"))
 			return
 		}
@@ -119,7 +121,7 @@ func (mr *machinesResource) patch(rw http.ResponseWriter, req *http.Request) {
 				return
 			}
 		} else {
-			err := mr.cAPI.SetMachineMetadata(machID, key, op.Value)
+			err := mr.cAPI.SetMachineMetadata(machID, key, op.Value.Value)
 			if err != nil {
 				sendError(rw, http.StatusInternalServerError, err)
 				return

diff --git a/api/machines_test.go b/api/machines_test.go
@@ -146,8 +146,8 @@ func TestExtractMachinePage(t *testing.T) {
 
 func TestMachinesPatchAddModify(t *testing.T) {
 	reqBody := `
-	[{"op": "add", "path": "/XXX/metadata/foo", "value": "bar"},
-	 {"op": "replace", "path": "/YYY/metadata/ping", "value": "splat"}]
+	[{"op": "add", "path": "/XXX/metadata/foo", "value": { "value": "bar" }},
+	{"op": "replace", "path": "/YYY/metadata/ping", "value": { "value": "splat" }}]
 	`
 
 	resource, rw := fakeMachinesSetup()
@@ -218,7 +218,7 @@ func TestMachinesPatchDelete(t *testing.T) {
 
 func TestMachinesPatchBadOp(t *testing.T) {
 	reqBody := `
-	[{"op": "noop", "path": "/XXX/metadata/foo", "value": "bar"}]
+	[{"op": "noop", "path": "/XXX/metadata/foo", "value": { "value": "bar" }}]
 	`
 
 	resource, rw := fakeMachinesSetup()
@@ -235,7 +235,7 @@ func TestMachinesPatchBadOp(t *testing.T) {
 
 func TestMachinesPatchBadPath(t *testing.T) {
 	reqBody := `
-	[{"op": "add", "path": "/XXX/foo", "value": "bar"}]
+	[{"op": "add", "path": "/XXX/foo", "value": { "value": "bar" }}]
 	`
 
 	resource, rw := fakeMachinesSetup()