Merge pull request #38 from dataiku/feature/sc-88223-recycle-lists

Moving lists to recycle bin instead of deleting them
dataiku · Jun 21, 2022 · f7a9ef9 · f7a9ef9
2 parents ebbb388 + 0012d1e
commit f7a9ef9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/python-lib/sharepoint_client.py b/python-lib/sharepoint_client.py
@@ -78,6 +78,7 @@ def __init__(self, config):
             self.assert_login_details(DSSConstants.SITE_APP_DETAILS, login_details)
             self.setup_sharepoint_online_url(login_details)
             self.setup_login_details(login_details)
+            self.apply_paths_overwrite(config)
             self.tenant_id = login_details.get("tenant_id")
             self.client_secret = login_details.get("client_secret")
             self.client_id = login_details.get("client_id")
@@ -326,13 +327,10 @@ def create_list(self, list_name):
         json = response.json()
         return json.get(SharePointConstants.RESULTS_CONTAINER_V2, {})
 
-    def delete_list(self, list_name):
-        headers = {
-            "X-HTTP-Method": "DELETE",
-            "IF-MATCH": "*"
-        }
+    def recycle_list(self, list_name):
+        headers = DSSConstants.JSON_HEADERS
         response = self.session.post(
-            self.get_lists_by_title_url(list_name),
+            self.get_lists_by_title_url(list_name)+"/recycle()",
             headers=headers
         )
         return response

diff --git a/python-lib/sharepoint_lists.py b/python-lib/sharepoint_lists.py
@@ -97,8 +97,8 @@ def __init__(self, config, parent, dataset_schema, dataset_partitioning, partiti
         self.web_name = self.parent.sharepoint_list_title
 
         if write_mode == SharePointConstants.WRITE_MODE_CREATE:
-            logger.info('flush:delete_list "{}"'.format(self.parent.sharepoint_list_title))
-            self.parent.client.delete_list(self.parent.sharepoint_list_title)
+            logger.info('flush:recycle_list "{}"'.format(self.parent.sharepoint_list_title))
+            self.parent.client.recycle_list(self.parent.sharepoint_list_title)
             logger.info('flush:create_list "{}"'.format(self.parent.sharepoint_list_title))
             created_list = self.parent.client.create_list(self.parent.sharepoint_list_title)
             self.entity_type_name = created_list.get("EntityTypeName")