Adjustment due to code review feedback

elastic · Oct 25, 2024 · 89b33fc · 89b33fc
1 parent 06c74ca
commit 89b33fc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/...ity_solution/server/endpoint/services/actions/clients/lib/base_response_actions_client.ts b/...ity_solution/server/endpoint/services/actions/clients/lib/base_response_actions_client.ts
@@ -583,7 +583,7 @@ export abstract class ResponseActionsClientImpl implements ResponseActionsClient
   ): Promise<LogsEndpointActionResponse<TOutputContent>> {
     // FIXME:PT need to ensure we use a index below that has the proper `namespace` when agent type is Endpoint
     //        Background: Endpoint responses require that the document be written to an index that has the
-    //        correct `namespace` as defined by the Integration/Agent policy adn that logic is not currently implemented.
+    //        correct `namespace` as defined by the Integration/Agent policy and that logic is not currently implemented.
 
     const doc = this.buildActionResponseEsDoc(options);
 

diff --git a/...ugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts b/...ugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
@@ -249,7 +249,7 @@ const fetchEndpointPolicyNamespace = async ({
   if (agentPolicyIdsToRetrieve.size > 0) {
     const ids = Array.from(agentPolicyIdsToRetrieve);
 
-    logger.debug(() => `Retrieving agent policies from fleeet for:\n${stringify(ids)}`);
+    logger.debug(() => `Retrieving agent policies from fleet for:\n${stringify(ids)}`);
 
     const agentPolicies = await agentPolicyService.getByIds(soClient, ids);
 

diff --git a/.../plugins/security_solution/server/fleet_integration/handlers/create_policy_datastreams.ts b/.../plugins/security_solution/server/fleet_integration/handlers/create_policy_datastreams.ts
@@ -100,30 +100,35 @@ export const createPolicyDataStreamsIfNeeded: PolicyDataStreamsCreator = async (
       return;
     }
 
-    if (!(await esClient.indices.exists({ index: datastreamIndexName }).catch(catchAndWrapError))) {
-      await esClient.indices
-        .createDataStream({ name: datastreamIndexName })
-        .then(() => {
-          indexesCreated.push(datastreamIndexName);
-          cache.set(datastreamIndexName, true);
-        })
-        .catch((err) => {
-          // It's possible that between the `.exists()` check and this `.createDataStream()` that
-          // the index could have been created. If that's the case, then just ignore the error.
-          if (err.body?.error?.type === 'resource_already_exists_exception') {
-            cache.set(datastreamIndexName, true);
-            return;
-          }
-
-          createErrors.push(
-            `Attempt to create datastream [${datastreamIndexName}] failed:\n${stringify(
-              err.body?.error ?? err
-            )}`
-          );
-        });
-    } else {
+    const doesDataStreamAlreadyExist = await esClient.indices
+      .exists({ index: datastreamIndexName })
+      .catch(catchAndWrapError);
+
+    if (doesDataStreamAlreadyExist) {
       cache.set(datastreamIndexName, true);
+      return;
     }
+
+    await esClient.indices
+      .createDataStream({ name: datastreamIndexName })
+      .then(() => {
+        indexesCreated.push(datastreamIndexName);
+        cache.set(datastreamIndexName, true);
+      })
+      .catch((err) => {
+        // It's possible that between the `.exists()` check and this `.createDataStream()` that
+        // the index could have been created. If that's the case, then just ignore the error.
+        if (err.body?.error?.type === 'resource_already_exists_exception') {
+          cache.set(datastreamIndexName, true);
+          return;
+        }
+
+        createErrors.push(
+          `Attempt to create datastream [${datastreamIndexName}] failed:\n${stringify(
+            err.body?.error ?? err
+          )}`
+        );
+      });
   };
 
   logger.debug(