Create a deepcopy of config when creating workspace client from account client (#542)

kartikgupta-db · web-flow · commit 9af2630672c8 · 2024-02-12T12:44:34.000Z
## Changes
* We are creating a shallow copy of the config object when creating a ws
client from acc client. This leads to the config of acc client being
overridden by changes made for the workspace client. This PR makes it so
that we are making a deepcopy instead.
* Also, correctly handle list response jsons in the API client. 

## Tests
* added integration test

- [ ] `make test` run locally
- [ ] `make fmt` applied
- [ ] relevant integration tests applied
diff --git a/databricks/sdk/__init__.py b/databricks/sdk/__init__.py
diff --git a/databricks/sdk/config.py b/databricks/sdk/config.py
@@ -457,3 +457,8 @@ def copy(self):
         cpy: Config = copy.copy(self)
         cpy._user_agent_other_info = copy.deepcopy(self._user_agent_other_info)
         return cpy
+
+    def deep_copy(self):
+        """Creates a deep copy of the config object.
+        """
+        return copy.deepcopy(self)
diff --git a/databricks/sdk/core.py b/databricks/sdk/core.py
@@ -142,7 +142,12 @@ def do(self,
             resp[header] = response.headers.get(Casing.to_header_case(header))
         if not len(response.content):
             return resp
-        return {**resp, **response.json()}
+
+        json = response.json()
+        if isinstance(json, list):
+            return json
+
+        return {**resp, **json}
 
     @staticmethod
     def _is_retryable(err: BaseException) -> Optional[str]:
diff --git a/tests/integration/test_client.py b/tests/integration/test_client.py
@@ -14,3 +14,13 @@ def test_get_workspace_client(a):
 def test_get_workspace_id(ucws, env_or_skip):
     ws_id = int(env_or_skip('THIS_WORKSPACE_ID'))
     assert ucws.get_workspace_id() == ws_id
+
+
+def test_creating_ws_client_from_ac_client_does_not_override_config(a):
+    wss = list(a.workspaces.list())
+    if len(wss) == 0:
+        pytest.skip("no workspaces")
+    a.get_workspace_client(wss[0])
+
+    # assert doesn't throw
+    wss = list(a.workspaces.list())
