Added response parsing

Author: vchavatapalli

samples/update_connections_auth.py

@@ -48,7 +48,7 @@ def main():
         embed_password = args.embed_password.lower() == "true"
 
         # Call unified update_connections method
-        updated_ids = endpoint.update_connections(
+        connection_items = endpoint.update_connections(
             resource,
             connection_luids=connection_luids,
             authentication_type=args.authentication_type,
@@ -57,7 +57,7 @@ def main():
             embed_password=embed_password,
         )
 
-        print(f"Updated connections on {args.resource_type} {args.resource_id}: {updated_ids}")
+        print(f"Updated connections on {args.resource_type} {args.resource_id}: {connection_items}")
 
 
 if __name__ == "__main__":

tableauserverclient/server/endpoint/datasources_endpoint.py

@@ -422,10 +422,12 @@ def update_connections(
             password=password,
             embed_password=embed_password,
         )
-        response = self.put_request(url, request_body)
+        server_response = self.put_request(url, request_body)
+        connection_items = list(ConnectionItem.from_response(server_response.content, self.parent_srv.namespace))
+        updated_ids = [conn.id for conn in connection_items]
 
-        logger.info(f"Updated connections for datasource {datasource_item.id}: {', '.join(connection_luids)}")
-        return connection_luids
+        logger.info(f"Updated connections for datasource {datasource_item.id}: {', '.join(updated_ids)}")
+        return connection_items
 
     @api(version="2.8")
     def refresh(self, datasource_item: Union[DatasourceItem, str], incremental: bool = False) -> JobItem:

tableauserverclient/server/endpoint/workbooks_endpoint.py

@@ -379,10 +379,12 @@ def update_connections(
         )
 
         # Send request
-        response = self.put_request(url, request_body)
+        server_response = self.put_request(url, request_body)
+        connection_items = list(ConnectionItem.from_response(server_response.content, self.parent_srv.namespace))
+        updated_ids = [conn.id for conn in connection_items]
 
-        logger.info(f"Updated connections for workbook {workbook_item.id}: {', '.join(connection_luids)}")
-        return connection_luids
+        logger.info(f"Updated connections for workbook {workbook_item.id}: {', '.join(updated_ids)}")
+        return connection_items
 
     # Download workbook contents with option of passing in filepath
     @api(version="2.0")

test/assets/datasource_connections_update.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tsResponse xmlns="http://tableau.com/api"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-3.26.xsd">
+            xsi:schemaLocation="http://tableau.com/api https://help.tableau.com/samples/en-us/rest_api/ts-api_3_25.xsd">
     <connections>
         <connection id="be786ae0-d2bf-4a4b-9b34-e2de8d2d4488"
                     type="sqlserver"
                     serverAddress="updated-server"
                     serverPort="1433"
                     userName="user1"
                     embedPassword="true"
-                    authentication="auth-keypair" />
+                    authenticationType="auth-keypair" />
         <connection id="a1b2c3d4-e5f6-7a8b-9c0d-123456789abc"
                     type="sqlserver"
                     serverAddress="updated-server"
                     serverPort="1433"
                     userName="user1"
                     embedPassword="true"
-                    authentication="auth-keypair" />
+                    authenticationType="auth-keypair" />
     </connections>
 </tsResponse>

test/assets/workbook_update_connections.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tsResponse xmlns="http://tableau.com/api"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-3.26.xsd">
+            xsi:schemaLocation="http://tableau.com/api https://help.tableau.com/samples/en-us/rest_api/ts-api_3_25.xsd">
     <connections>
         <connection id="abc12345-def6-7890-gh12-ijklmnopqrst"
                     type="sqlserver"
                     serverAddress="updated-db-host"
                     serverPort="1433"
                     userName="svc-client"
                     embedPassword="true"
-                    authentication="AD Service Principal" />
+                    authenticationType="AD Service Principal" />
         <connection id="1234abcd-5678-efgh-ijkl-0987654321mn"
                     type="sqlserver"
                     serverAddress="updated-db-host"
                     serverPort="1433"
                     userName="svc-client"
                     embedPassword="true"
-                    authentication="AD Service Principal" />
+                    authenticationType="AD Service Principal" />
     </connections>
 </tsResponse>

test/test_datasource.py

@@ -183,16 +183,17 @@ def test_update_connections(self) -> None:
             print("BASEURL:", self.server.baseurl)
             print("Calling PUT on:", f"{self.server.baseurl}/{datasource.id}/connections")
 
-            updated_luids = self.server.datasources.update_connections(
+            connection_items = self.server.datasources.update_connections(
                 datasource_item=datasource,
                 connection_luids=connection_luids,
                 authentication_type="auth-keypair",
                 username="testuser",
                 password="testpass",
                 embed_password=True,
             )
+            updated_ids = [conn.id for conn in connection_items]
 
-            self.assertEqual(updated_luids, connection_luids)
+            self.assertEqual(updated_ids, connection_luids)
 
     def test_populate_permissions(self) -> None:
         with open(asset(POPULATE_PERMISSIONS_XML), "rb") as f:

test/test_workbook.py

@@ -728,16 +728,17 @@ def test_update_workbook_connections(self) -> None:
                 text=response_xml,
             )
 
-            updated_luids = self.server.workbooks.update_connections(
+            connection_items = self.server.workbooks.update_connections(
                 workbook_item=workbook,
                 connection_luids=connection_luids,
                 authentication_type="AD Service Principal",
                 username="svc-client",
                 password="secret-token",
                 embed_password=True,
             )
+            updated_ids = [conn.id for conn in connection_items]
 
-            self.assertEqual(updated_luids, connection_luids)
+            self.assertEqual(updated_ids, connection_luids)
 
     def test_get_workbook_all_fields(self) -> None:
         self.server.version = "3.21"