Merge pull request #19 from davidweterings/master

Add id_attribute json list support

Author: DRuggeri

README.md

@@ -24,7 +24,7 @@ Have a look at the [examples directory](examples) for some use cases
 - `password` (string, optional): When set, will use this password for BASIC auth to the API.
 - `headers` (hash of strings, optional): A map of header names and values to set on all outbound requests. This is useful if you want to use a script via the 'external' provider or provide a pre-approved token or change Content-Type from `application/json`. If `username` and `password` are set and Authorization is one of the headers defined here, the BASIC auth credentials take precedence.
 - `timeout` (integer, optional): When set, will cause requests taking longer than this time (in seconds) to be aborted. Default is `0` which means no timeout is set.
-- `id_attribute` (string, optional): Defaults to `id`. When set, this key will be used to operate on REST objects. For example, if the ID is set to 'name', changes to the API object will be to http://foo.com/bar/VALUE_OF_NAME. This value may also be a '/'-delimeted path to the id attribute if it is multple levels deep in the data (such as `attributes/id` in the case of an object `{ \"attributes\": { \"id\": 1234 }, \"config\": { \"name\": \"foo\", \"something\": \"bar\"}}`
+- `id_attribute` (string, optional): Defaults to `id`. When set, this key will be used to operate on REST objects. For example, if the ID is set to 'name', changes to the API object will be to http://foo.com/bar/VALUE_OF_NAME. This value may also be a '/'-delimeted path to the id attribute if it is multple levels deep in the data (such as `attributes/id` in the case of an object `{ \"attributes\": { \"id\": 1234 }, \"config\": { \"name\": \"foo\", \"something\": \"bar\"}}`. Lists are also supported, f.e. `attributes/items/0/id` in case of an object `{ \"attributes\": { \"items\": [{"id": 1234}] } }`.
 - `copy_keys` (array of strings, optional): When set, any `PUT` to the API for an object will copy these keys from the data the provider has gathered about the object. This is useful if internal API information must also be provided with updates, such as the revision of the object.
 - `write_returns_object` (boolean, optional): Set this when the API returns the object created on all write operations (`POST`, `PUT`). This is used by the provider to refresh internal data structures.
 - `create_returns_object` (boolean, optional): Set this when the API returns the object created only on creation operations (`POST`). This is used by the provider to refresh internal data structures.

restapi/common.go

@@ -119,6 +119,14 @@ func GetObjectAtKey(data map[string]interface{}, path string, debug bool) (inter
       if tmp, ok := hash[part].(map[string]interface{});ok {
         if debug { log.Printf("common.go:GetObjectAtKey:    %s - is a map", part) }
         hash = tmp
+      } else if tmp, ok := hash[part].([]interface{}); ok {
+        if debug { log.Printf("common.go:GetObjectAtKey:    %s - is a list", part) }
+        mapString := make(map[string]interface{})
+        for key, value := range tmp {
+          strKey := fmt.Sprintf("%v", key)
+          mapString[strKey] = value
+        }
+        hash = mapString
       } else {
         if debug { log.Printf("common.go:GetObjectAtKey:    %s - is a %T", part, hash[part]) }
         return nil, fmt.Errorf("GetObjectAtKey: Object at '%s' is not a map. Is this the right path?", seen)

restapi/common_test.go

@@ -104,3 +104,50 @@ func TestGetStringAtKey(t *testing.T) {
     t.Fatalf("Error: Expected '1', but got %s", res)
   }
 }
+
+func TestGetListStringAtKey(t *testing.T) {
+  debug := false
+  test_obj := make(map[string]interface{})
+  err := json.Unmarshal([]byte(`
+    {
+      "rootFoo": "bar",
+      "items": [
+        {
+          "foo": "bar",
+          "number": 1,
+          "list_numbers": [1, 2, 3],
+          "test": [{"id": "3333"}, {"id": "1337"}],
+          "resource": {
+            "id": "123"
+          }
+        }
+      ]
+    }
+  `), &test_obj)
+  if nil != err {
+    t.Fatalf("Error unmarshalling JSON: %s", err)
+  }
+
+  var res string
+
+  res, err = GetStringAtKey(test_obj, "items/0/resource/id", debug)
+  if err != nil {
+    t.Fatalf("Error extracting 'resource' from JSON payload: %s", err)
+  } else if "123" != res {
+    t.Fatalf("Error: Expected '123', but got %s", res)
+  }
+
+  res, err = GetStringAtKey(test_obj, "items/0/test/1/id", debug)
+  if err != nil {
+    t.Fatalf("Error extracting 'resource' from JSON payload: %s", err)
+  } else if "1337" != res {
+    t.Fatalf("Error: Expected '1337', but got %s", res)
+  }
+
+  res, err = GetStringAtKey(test_obj, "items/0/list_numbers/1", debug)
+  if err != nil {
+    t.Fatalf("Error extracting 'resource' from JSON payload: %s", err)
+  } else if "2" != res {
+    t.Fatalf("Error: Expected '2', but got %s", res)
+  }
+}