Remove legacy notifications/delivery related code (opensearch-project#94

) * remove legacy notifications/delivery related code Signed-off-by: David Cui <davidcui@amazon.com> * remove commented out reference Signed-off-by: David Cui <davidcui@amazon.com>
kavilla · Jun 23, 2021 · 6f2d7ed · 6f2d7ed
1 parent eebbec6
commit 6f2d7ed
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 225 deletions.
diff --git a/common/index.ts b/common/index.ts
@@ -29,10 +29,6 @@ export const PLUGIN_NAME = 'reports-dashboards';
 
 export const API_PREFIX = '/api/reporting';
 
-export const NOTIFICATION_API = {
-  SEND: '/_plugins/_notifications/send',
-};
-
 const BASE_REPORTS_URI = '/_plugins/_reports';
 
 export const OPENSEARCH_REPORTS_API = {

diff --git a/server/backend/opendistro-notification-plugin.ts b/server/backend/opendistro-notification-plugin.ts
diff --git a/server/executor/createScheduledReport.ts b/server/executor/createScheduledReport.ts
@@ -35,15 +35,13 @@ import { createSavedSearchReport } from '../routes/utils/savedSearchReportHelper
 import { ReportSchemaType } from '../model';
 import { CreateReportResultType } from '../routes/utils/types';
 import { createVisualReport } from '../routes/utils/visual_report/visualReportHelper';
-import { deliverReport } from '../routes/lib/deliverReport';
 import { updateReportState } from '../routes/lib/updateReportState';
 
 export const createScheduledReport = async (
   reportId: string,
   report: ReportSchemaType,
   opensearchClient: ILegacyClusterClient,
   opensearchReportsClient: ILegacyClusterClient,
-  notificationClient: ILegacyClusterClient,
   logger: Logger
 ) => {
   let createReportResult: CreateReportResultType;
@@ -76,17 +74,6 @@ export const createScheduledReport = async (
     // }
 
     await updateReportState(reportId, opensearchReportsClient, REPORT_STATE.created);
-
-    // deliver report
-    if (deliveryType == DELIVERY_TYPE.channel) {
-      await deliverReport(
-        report,
-        notificationClient,
-        opensearchReportsClient,
-        reportId,
-        logger
-      );
-    }
   } catch (error) {
     // update report instance with "error" state
     //TODO: save error detail and display on UI

diff --git a/server/executor/executor.ts b/server/executor/executor.ts
@@ -33,7 +33,6 @@ import { BackendReportInstanceType } from 'server/model/backendModel';
 
 async function pollAndExecuteJob(
   opensearchReportsClient: ILegacyClusterClient,
-  notificationClient: ILegacyClusterClient,
   opensearchClient: ILegacyClusterClient,
   logger: Logger
 ) {
@@ -60,7 +59,6 @@ async function pollAndExecuteJob(
         reportMetadata,
         opensearchClient,
         opensearchReportsClient,
-        notificationClient,
         logger
       );
     } else {

diff --git a/server/plugin.ts b/server/plugin.ts
@@ -35,7 +35,6 @@ import {
 import { setIntervalAsync } from 'set-interval-async/dynamic';
 import { Semaphore, SemaphoreInterface, withTimeout } from 'async-mutex';
 import opensearchReportsPlugin from './backend/opensearch-reports-plugin';
-import notificationPlugin from './backend/opendistro-notification-plugin';
 import {
   ReportsDashboardsPluginSetup,
   ReportsDashboardsPluginStart,
@@ -89,12 +88,6 @@ export class ReportsDashboardsPlugin
       }
     );
 
-    const notificationClient: ILegacyClusterClient = core.opensearch.legacy.createClient(
-      'notification',
-      {
-        plugins: [notificationPlugin],
-      }
-    );
     // Register server side APIs
     registerRoutes(router, accessInfo);
 
@@ -106,7 +99,6 @@ export class ReportsDashboardsPlugin
         return {
           logger: this.logger,
           semaphore: this.semaphore,
-          notificationClient,
           opensearchReportsClient,
         };
       }
@@ -124,12 +116,6 @@ export class ReportsDashboardsPlugin
       }
     );
 
-    const notificationClient: ILegacyClusterClient = core.opensearch.legacy.createClient(
-      'notification',
-      {
-        plugins: [notificationPlugin],
-      }
-    );
     const opensearchClient: ILegacyClusterClient =
       core.opensearch.legacy.client;
     /*

diff --git a/server/routes/lib/createReport.ts b/server/routes/lib/createReport.ts
@@ -42,7 +42,6 @@ import { ReportSchemaType } from '../../model';
 import { CreateReportResultType } from '../utils/types';
 import { createVisualReport } from '../utils/visual_report/visualReportHelper';
 import { SetCookie, Headers } from 'puppeteer-core';
-import { deliverReport } from './deliverReport';
 import { updateReportState } from './updateReportState';
 import { saveReport } from './saveReport';
 import { SemaphoreInterface } from 'async-mutex';
@@ -61,10 +60,6 @@ export const createReport = async (
   //@ts-ignore
   const semaphore: SemaphoreInterface = context.reporting_plugin.semaphore;
   // @ts-ignore
-  const notificationClient: ILegacyScopedClusterClient = context.reporting_plugin.notificationClient.asScoped(
-    request
-  );
-  // @ts-ignore
   const opensearchReportsClient: ILegacyScopedClusterClient = context.reporting_plugin.opensearchReportsClient.asScoped(
     request
   );
@@ -82,7 +77,6 @@ export const createReport = async (
   const {
     report_definition: {
       report_params: reportParams,
-      delivery: { delivery_type: deliveryType },
     },
   } = report;
   const { report_source: reportSource } = reportParams;
@@ -154,17 +148,6 @@ export const createReport = async (
     // if (!savedReportId) {
     //   await updateReportState(reportId, opensearchReportsClient, REPORT_STATE.created);
     // }
-
-    // deliver report
-    if (!savedReportId && deliveryType == DELIVERY_TYPE.channel) {
-      await deliverReport(
-        report,
-        notificationClient,
-        opensearchReportsClient,
-        reportId,
-        logger
-      );
-    }
   } catch (error) {
     // update report instance with "error" state
     // TODO: save error detail and display on UI

diff --git a/server/routes/lib/deliverReport.ts b/server/routes/lib/deliverReport.ts