Merge pull request #44 from uc-cdis/feat/add-merge-option-to-update-r…

…esource

(PXP-9480): Support merge param for update_resource

python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gen3authz"
-version = "1.4.2"
+version = "1.5.0"
 description = "Gen3 authz client"
 authors = ["CTDS UChicago <cdis@uchicago.edu>"]
 license = "Apache-2.0"

python/src/gen3authz/client/arborist/base.py

@@ -440,10 +440,18 @@ async def get_resource(self, path):
         return response.json
 
     @maybe_sync
-    async def update_resource(self, path, resource_json, create_parents=False):
+    async def update_resource(
+        self, path, resource_json, create_parents=False, merge=False
+    ):
         url = self._resource_url + quote(path)
+        parameters = []
         if create_parents:
-            url = url + "?p"
+            parameters.append("p")
+        if merge:
+            parameters.append("merge")
+        if parameters:
+            url = url + "?" + "&".join(parameters)
+
         response = await self.put(url, json=resource_json)
         if not response.successful:
             msg = "could not update resource `{}` in arborist: {}".format(