Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy notifications/delivery related code #94

Merged
merged 2 commits into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions dashboards-reports/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions dashboards-reports/server/executor/createScheduledReport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions dashboards-reports/server/executor/executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import { BackendReportInstanceType } from 'server/model/backendModel';

async function pollAndExecuteJob(
opensearchReportsClient: ILegacyClusterClient,
notificationClient: ILegacyClusterClient,
opensearchClient: ILegacyClusterClient,
logger: Logger
) {
Expand All @@ -60,7 +59,6 @@ async function pollAndExecuteJob(
reportMetadata,
opensearchClient,
opensearchReportsClient,
notificationClient,
logger
);
} else {
Expand Down
14 changes: 0 additions & 14 deletions dashboards-reports/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -89,12 +88,6 @@ export class ReportsDashboardsPlugin
}
);

const notificationClient: ILegacyClusterClient = core.opensearch.legacy.createClient(
'notification',
{
plugins: [notificationPlugin],
}
);
// Register server side APIs
registerRoutes(router, accessInfo);

Expand All @@ -106,7 +99,6 @@ export class ReportsDashboardsPlugin
return {
logger: this.logger,
semaphore: this.semaphore,
notificationClient,
opensearchReportsClient,
};
}
Expand All @@ -124,12 +116,6 @@ export class ReportsDashboardsPlugin
}
);

const notificationClient: ILegacyClusterClient = core.opensearch.legacy.createClient(
'notification',
{
plugins: [notificationPlugin],
}
);
const opensearchClient: ILegacyClusterClient =
core.opensearch.legacy.client;
/*
Expand Down
17 changes: 0 additions & 17 deletions dashboards-reports/server/routes/lib/createReport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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
);
Expand All @@ -82,7 +77,6 @@ export const createReport = async (
const {
report_definition: {
report_params: reportParams,
delivery: { delivery_type: deliveryType },
},
} = report;
const { report_source: reportSource } = reportParams;
Expand Down Expand Up @@ -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
Expand Down
133 changes: 0 additions & 133 deletions dashboards-reports/server/routes/lib/deliverReport.ts

This file was deleted.