add sample data cleanup

Signed-off-by: Hailong Cui <[email protected]>
opensearch-project · Nov 11, 2024 · fe0f9f8 · fe0f9f8
1 parent c121643
commit fe0f9f8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_analytics_overviews.spec.js b/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_analytics_overviews.spec.js
@@ -11,12 +11,13 @@ const workspaceName = `test_workspace_analytics_${Math.random()
   .substring(7)}`;
 let workspaceDescription = 'This is a analytics workspace description.';
 let workspaceId;
+let datasourceId;
 let workspaceFeatures = ['use-case-all'];
 
 const MDSEnabled = Cypress.env('DATASOURCE_MANAGEMENT_ENABLED');
 
 if (Cypress.env('WORKSPACE_ENABLED')) {
-  const createWorkspace = (datasourceId) => {
+  const createWorkspace = (dsId) => {
     cy.createWorkspace({
       name: workspaceName,
       description: workspaceDescription,
@@ -26,12 +27,12 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
           library_write: { users: ['%me%'] },
           write: { users: ['%me%'] },
         },
-        dataSources: [datasourceId],
+        dataSources: [dsId],
       },
     }).then((value) => {
       workspaceId = value;
       // load sample data
-      cy.loadSampleDataForWorkspace('ecommerce', value, datasourceId);
+      cy.loadSampleDataForWorkspace('ecommerce', value, dsId);
     });
   };
 
@@ -41,7 +42,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
       if (MDSEnabled) {
         cy.deleteAllDataSources();
         cy.createDataSourceNoAuth().then((result) => {
-          const datasourceId = result[0];
+          datasourceId = result[0];
           expect(datasourceId).to.be.a('string').that.is.not.empty;
           createWorkspace(datasourceId);
         });
@@ -52,8 +53,10 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
 
     after(() => {
       if (workspaceId) {
+        cy.removeSampleDataForWorkspace('ecommerce', workspaceId, datasourceId);
         cy.deleteWorkspaceById(workspaceId);
       }
+      cy.deleteAllDataSources();
     });
 
     beforeEach(() => {

diff --git a/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_essential_overviews.spec.js b/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_essential_overviews.spec.js
@@ -11,6 +11,7 @@ const workspaceName = `test_workspace_${Math.random()
   .substring(7)}`;
 let workspaceDescription = 'This is a workspace description.';
 let workspaceId;
+let datasourceId;
 let workspaceFeatures = ['use-case-essentials'];
 
 const MDSEnabled = Cypress.env('DATASOURCE_MANAGEMENT_ENABLED');
@@ -41,7 +42,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
       if (MDSEnabled) {
         cy.deleteAllDataSources();
         cy.createDataSourceNoAuth().then((result) => {
-          const datasourceId = result[0];
+          datasourceId = result[0];
           expect(datasourceId).to.be.a('string').that.is.not.empty;
           createWorkspace(datasourceId);
         });
@@ -52,8 +53,10 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
 
     after(() => {
       if (workspaceId) {
+        cy.removeSampleDataForWorkspace('ecommerce', workspaceId, datasourceId);
         cy.deleteWorkspaceById(workspaceId);
       }
+      cy.deleteAllDataSources();
     });
 
     beforeEach(() => {

diff --git a/...-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_search_overviews.spec.js b/...-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_search_overviews.spec.js
@@ -30,8 +30,6 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
       },
     }).then((value) => {
       workspaceId = value;
-      // load sample data
-      cy.loadSampleDataForWorkspace('ecommerce', value, datasourceId);
     });
   };
 
@@ -54,6 +52,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
       if (workspaceId) {
         cy.deleteWorkspaceById(workspaceId);
       }
+      cy.deleteAllDataSources();
     });
 
     beforeEach(() => {

diff --git a/cypress/utils/commands.js b/cypress/utils/commands.js
@@ -606,6 +606,17 @@ Cypress.Commands.add(
   }
 );
 
+Cypress.Commands.add(
+  'removeSampleDataForWorkspace',
+  (type, workspaceId, datasourceId) => {
+    cy.request({
+      method: 'DELETE',
+      headers: { 'osd-xsrf': 'opensearch-dashboards' },
+      url: `${BASE_PATH}/w/${workspaceId}/api/sample_data/${type}?data_source_id=${datasourceId}`,
+    });
+  }
+);
+
 Cypress.Commands.add('fleshTenantSettings', () => {
   if (Cypress.env('SECURITY_ENABLED')) {
     // Use xhr request is good enough to flesh tenant