added api validation for serverless

elastic · Nov 16, 2023 · 5547f55 · 5547f55
1 parent b3a49c7
commit 5547f55
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/server/routes/output/handler.ts b/x-pack/plugins/fleet/server/routes/output/handler.ts
@@ -10,6 +10,8 @@ import type { TypeOf } from '@kbn/config-schema';
 
 import Boom from '@hapi/boom';
 
+import type { ValueOf } from '@elastic/eui';
+
 import { outputType } from '../../../common/constants';
 
 import type {
@@ -23,11 +25,12 @@ import type {
   GetOneOutputResponse,
   GetOutputsResponse,
   Output,
+  OutputType,
   PostLogstashApiKeyResponse,
 } from '../../../common/types';
 import { outputService } from '../../services/output';
 import { defaultFleetErrorHandler, FleetUnauthorizedError } from '../../errors';
-import { agentPolicyService } from '../../services';
+import { agentPolicyService, appContextService } from '../../services';
 import { generateLogstashApiKey, canCreateLogstashApiKey } from '../../services/api_keys';
 
 function ensureNoDuplicateSecrets(output: Partial<Output>) {
@@ -89,8 +92,9 @@ export const putOutputHandler: RequestHandler<
   const soClient = coreContext.savedObjects.client;
   const esClient = coreContext.elasticsearch.client.asInternalUser;
   const outputUpdate = request.body;
-  ensureNoDuplicateSecrets(outputUpdate);
   try {
+    validateOutputServerless(outputUpdate.type);
+    ensureNoDuplicateSecrets(outputUpdate);
     await outputService.update(soClient, esClient, request.params.outputId, outputUpdate);
     const output = await outputService.get(soClient, request.params.outputId);
     if (output.is_default || output.is_default_monitoring) {
@@ -125,6 +129,7 @@ export const postOutputHandler: RequestHandler<
   const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     const { id, ...newOutput } = request.body;
+    validateOutputServerless(newOutput.type);
     ensureNoDuplicateSecrets(newOutput);
     const output = await outputService.create(soClient, esClient, newOutput, { id });
     if (output.is_default || output.is_default_monitoring) {
@@ -141,6 +146,13 @@ export const postOutputHandler: RequestHandler<
   }
 };
 
+function validateOutputServerless(type?: ValueOf<OutputType>): void {
+  const cloudSetup = appContextService.getCloud();
+  if (cloudSetup?.isServerlessEnabled && type === outputType.RemoteElasticsearch) {
+    throw Boom.badRequest('Output type remote_elasticsearch not supported in serverless');
+  }
+}
+
 export const deleteOutputHandler: RequestHandler<
   TypeOf<typeof DeleteOutputRequestSchema.params>
 > = async (context, request, response) => {