PR feedback

ymao1 · ymao1 · commit ad65b91f1076 · 2025-05-30T14:12:05.000-04:00
diff --git a/x-pack/platform/plugins/private/reporting/server/core.ts b/x-pack/platform/plugins/private/reporting/server/core.ts
@@ -411,18 +411,16 @@ export class ReportingCore {
     return dataViews;
   }
 
-  public async getSoClient(request?: KibanaRequest) {
+  public async getScopedSoClient(request: KibanaRequest) {
     const { savedObjects } = await this.getPluginStartDeps();
+    return savedObjects.getScopedClient(request, {
+      excludedExtensions: [SECURITY_EXTENSION_ID],
+      includedHiddenTypes: [SCHEDULED_REPORT_SAVED_OBJECT_TYPE],
+    });
+  }
 
-    // if request is provided, use scoped client
-    if (request) {
-      return savedObjects.getScopedClient(request, {
-        excludedExtensions: [SECURITY_EXTENSION_ID],
-        includedHiddenTypes: [SCHEDULED_REPORT_SAVED_OBJECT_TYPE],
-      });
-    }
-
-    // otherwise use internal repository
+  public async getInternalSoClient() {
+    const { savedObjects } = await this.getPluginStartDeps();
     return savedObjects.createInternalRepository([SCHEDULED_REPORT_SAVED_OBJECT_TYPE]);
   }
 
diff --git a/x-pack/platform/plugins/private/reporting/server/lib/tasks/run_scheduled_report.test.ts b/x-pack/platform/plugins/private/reporting/server/lib/tasks/run_scheduled_report.test.ts
@@ -107,7 +107,7 @@ describe('Run Scheduled Report Task', () => {
     configType = createMockConfigSchema();
     mockReporting = await createMockReportingCore(configType);
 
-    soClient = await mockReporting.getSoClient();
+    soClient = await mockReporting.getInternalSoClient();
     soClient.get = jest.fn().mockImplementation(async () => {
       return reportSO;
     });
diff --git a/x-pack/platform/plugins/private/reporting/server/lib/tasks/run_scheduled_report.ts b/x-pack/platform/plugins/private/reporting/server/lib/tasks/run_scheduled_report.ts
@@ -46,7 +46,7 @@ export class RunScheduledReportTask extends RunReportTask<ScheduledReportTaskPar
         );
       }
 
-      const internalSoClient = await this.opts.reporting.getSoClient();
+      const internalSoClient = await this.opts.reporting.getInternalSoClient();
       const reportSO = await internalSoClient.get<ScheduledReportType>(
         SCHEDULED_REPORT_SAVED_OBJECT_TYPE,
         reportSoId,
diff --git a/x-pack/platform/plugins/private/reporting/server/routes/common/request_handler/schedule_request_handler.test.ts b/x-pack/platform/plugins/private/reporting/server/routes/common/request_handler/schedule_request_handler.test.ts
@@ -81,7 +81,7 @@ describe('Handle request to schedule', () => {
     mockContext = getMockContext();
     mockContext.reporting = Promise.resolve({} as ReportingSetup);
 
-    soClient = await reportingCore.getSoClient(fakeRawRequest as unknown as KibanaRequest);
+    soClient = await reportingCore.getScopedSoClient(fakeRawRequest as unknown as KibanaRequest);
     soClient.create = jest.fn().mockImplementation(async (_, opts) => {
       return {
         id: 'foo',
diff --git a/x-pack/platform/plugins/private/reporting/server/routes/common/request_handler/schedule_request_handler.ts b/x-pack/platform/plugins/private/reporting/server/routes/common/request_handler/schedule_request_handler.ts
@@ -111,7 +111,7 @@ export class ScheduleRequestHandler extends RequestHandler<
     const { exportTypeId, jobParams, schedule, notification } = params;
     const { reporting, logger, req, user } = this.opts;
 
-    const soClient = await reporting.getSoClient(req);
+    const soClient = await reporting.getScopedSoClient(req);
     const { version, job, jobType, name } = await this.createJob(exportTypeId, jobParams);
 
     const payload = {
diff --git a/x-pack/platform/plugins/private/reporting/server/routes/internal/schedule/integration_tests/scheduling_from_jobparams.test.ts b/x-pack/platform/plugins/private/reporting/server/routes/internal/schedule/integration_tests/scheduling_from_jobparams.test.ts
@@ -103,7 +103,7 @@ describe(`POST ${INTERNAL_ROUTES.SCHEDULE_PREFIX}`, () => {
     mockExportTypesRegistry = new ExportTypesRegistry();
     mockExportTypesRegistry.register(mockPdfExportType);
 
-    soClient = await reportingCore.getSoClient(fakeRawRequest as unknown as KibanaRequest);
+    soClient = await reportingCore.getScopedSoClient(fakeRawRequest as unknown as KibanaRequest);
     soClient.create = jest.fn().mockImplementation(async (_, opts) => {
       return {
         id: 'foo',

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class RunScheduledReportTask extends RunReportTask<ScheduledReportTaskPar`
`46`	`46`	`);`
`47`	`47`	`}`
`48`	`48`
`49`		`- const internalSoClient = await this.opts.reporting.getSoClient();`
	`49`	`+ const internalSoClient = await this.opts.reporting.getInternalSoClient();`
`50`	`50`	`const reportSO = await internalSoClient.get<ScheduledReportType>(`
`51`	`51`	`SCHEDULED_REPORT_SAVED_OBJECT_TYPE,`
`52`	`52`	`reportSoId,`