fix: datasource id on ConnectionItem (tableau#1538)

jorwoods · web-flow · commit 9d4e43ee84e6 · 2024-11-26T22:21:23.000-08:00
Closes tableau#1536 Populates the datasource id and name on the `ConnectionItem`s as they return. Co-authored-by: Jordan Woods <13803242+jorwoods@users.noreply.github.com>
diff --git a/tableauserverclient/server/endpoint/datasources_endpoint.py b/tableauserverclient/server/endpoint/datasources_endpoint.py
@@ -102,10 +102,15 @@ def connections_fetcher():
         datasource_item._set_connections(connections_fetcher)
         logger.info(f"Populated connections for datasource (ID: {datasource_item.id})")
 
-    def _get_datasource_connections(self, datasource_item, req_options=None):
+    def _get_datasource_connections(
+        self, datasource_item: DatasourceItem, req_options: Optional[RequestOptions] = None
+    ) -> list[ConnectionItem]:
         url = f"{self.baseurl}/{datasource_item.id}/connections"
         server_response = self.get_request(url, req_options)
         connections = ConnectionItem.from_response(server_response.content, self.parent_srv.namespace)
+        for connection in connections:
+            connection._datasource_id = datasource_item.id
+            connection._datasource_name = datasource_item.name
         return connections
 
     # Delete 1 datasource by id
diff --git a/test/test_datasource.py b/test/test_datasource.py
@@ -174,17 +174,22 @@ def test_populate_connections(self) -> None:
             connections: Optional[list[ConnectionItem]] = single_datasource.connections
 
         self.assertIsNotNone(connections)
+        assert connections is not None
         ds1, ds2 = connections
         self.assertEqual("be786ae0-d2bf-4a4b-9b34-e2de8d2d4488", ds1.id)
         self.assertEqual("textscan", ds1.connection_type)
         self.assertEqual("forty-two.net", ds1.server_address)
         self.assertEqual("duo", ds1.username)
         self.assertEqual(True, ds1.embed_password)
+        self.assertEqual(ds1.datasource_id, single_datasource.id)
+        self.assertEqual(single_datasource.name, ds1.datasource_name)
         self.assertEqual("970e24bc-e200-4841-a3e9-66e7d122d77e", ds2.id)
         self.assertEqual("sqlserver", ds2.connection_type)
         self.assertEqual("database.com", ds2.server_address)
         self.assertEqual("heero", ds2.username)
         self.assertEqual(False, ds2.embed_password)
+        self.assertEqual(ds2.datasource_id, single_datasource.id)
+        self.assertEqual(single_datasource.name, ds2.datasource_name)
 
     def test_update_connection(self) -> None:
         populate_xml, response_xml = read_xml_assets(POPULATE_CONNECTIONS_XML, UPDATE_CONNECTION_XML)
