[Cloud Security][serverless] metering code polishing

e40pud · Jan 18, 2024 · b058d21 · b058d21
1 parent bc97065
commit b058d21
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/config/serverless.security.yml b/config/serverless.security.yml
@@ -16,6 +16,7 @@ xpack.securitySolutionServerless.productTypes:
   [
     { product_line: 'security', product_tier: 'complete' },
     { product_line: 'endpoint', product_tier: 'complete' },
+    { product_line: 'cloud', product_tier: 'complete' },
   ]
 
 xpack.securitySolution.offeringSettings: {

diff --git a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering.ts b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { Logger } from '@kbn/core/server';
 import { ProductLine } from '../../common/product';
 import { getCloudSecurityUsageRecord } from './cloud_security_metering_task';
 import { CLOUD_DEFEND, CNVM, CSPM, KSPM } from './constants';
@@ -21,16 +22,12 @@ export const cloudSecurityMetringCallback = async ({
 }: MeteringCallbackInput): Promise<UsageRecord[]> => {
   const projectId = cloudSetup?.serverless?.projectId || 'missing_project_id';
 
-  if (!cloudSetup?.serverless?.projectId) {
-    logger.error('no project id found');
-  }
-
-  const tier: Tier = getCloudProductTier(config);
+  const tier: Tier = getCloudProductTier(config, logger);
 
   try {
     const cloudSecuritySolutions: CloudSecuritySolutions[] = [CSPM, KSPM, CNVM, CLOUD_DEFEND];
 
-    const cloudSecurityUsageRecords = await Promise.all(
+    const promiseResults = await Promise.allSettled(
       cloudSecuritySolutions.map((cloudSecuritySolution) =>
         getCloudSecurityUsageRecord({
           esClient,
@@ -44,21 +41,33 @@ export const cloudSecurityMetringCallback = async ({
       )
     );
 
-    // remove any potential undefined values from the array,
-    return cloudSecurityUsageRecords
-      .filter((record) => record !== undefined && record.length > 0)
-      .flatMap((record) => record) as UsageRecord[];
+    const cloudSecurityUsageRecords: UsageRecord[] = [];
+    promiseResults.forEach((result) => {
+      if (result.status === 'fulfilled') {
+        if (result.value !== undefined && result.value.length > 0) {
+          cloudSecurityUsageRecords.push(...result.value);
+        }
+      } else {
+        // Handle or log the rejection reason
+        logger.error(`Promise rejected with reason: ${result.reason}`);
+      }
+    });
+
+    return cloudSecurityUsageRecords;
   } catch (err) {
-    logger.error(`Failed to fetch Cloud Security metering data ${err}`);
+    logger.error(`Failed to process Cloud Security metering data ${err}`);
     return [];
   }
 };
 
-export const getCloudProductTier = (config: ServerlessSecurityConfig): Tier => {
+export const getCloudProductTier = (config: ServerlessSecurityConfig, logger: Logger): Tier => {
   const cloud = config.productTypes.find(
     (productType) => productType.product_line === ProductLine.cloud
   );
   const tier = cloud ? cloud.product_tier : 'none';
+  if (tier === 'none') {
+    logger.error(`Failed to fetch cloud product tier, config: ${JSON.stringify(config)}`);
+  }
 
   return tier;
 };
diff --git a/...s/security_solution_serverless/server/cloud_security/cloud_security_metering_task.test.ts b/...s/security_solution_serverless/server/cloud_security/cloud_security_metering_task.test.ts
@@ -167,7 +167,7 @@ describe('should return the relevant product tier', () => {
       ],
     } as unknown as ServerlessSecurityConfig;
 
-    const tier = getCloudProductTier(serverlessSecurityConfig);
+    const tier = getCloudProductTier(serverlessSecurityConfig, logger);
 
     expect(tier).toBe('complete');
   });
@@ -273,7 +273,7 @@ describe('should return the relevant product tier', () => {
       productTypes: [{ product_line: 'endpoint', product_tier: 'complete' }],
     } as unknown as ServerlessSecurityConfig;
 
-    const tier = getCloudProductTier(serverlessSecurityConfig);
+    const tier = getCloudProductTier(serverlessSecurityConfig, logger);
 
     expect(tier).toBe('none');
   });

diff --git a/...lugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.ts b/...lugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.ts
@@ -222,14 +222,12 @@ const getSearchStartDate = (lastSuccessfulReport: Date): Date => {
   const initialDate = new Date();
   const thresholdDate = new Date(initialDate.getTime() - THRESHOLD_MINUTES * 60 * 1000);
 
-  let lastSuccessfulReport1;
-
   if (lastSuccessfulReport) {
-    lastSuccessfulReport1 = new Date(lastSuccessfulReport);
+    const lastSuccessfulReportDate = new Date(lastSuccessfulReport);
 
     const searchFrom =
-      lastSuccessfulReport && lastSuccessfulReport1 > thresholdDate
-        ? lastSuccessfulReport1
+      lastSuccessfulReport && lastSuccessfulReportDate > thresholdDate
+        ? lastSuccessfulReportDate
         : thresholdDate;
     return searchFrom;
   }

diff --git a/x-pack/plugins/security_solution_serverless/server/task_manager/usage_reporting_task.ts b/x-pack/plugins/security_solution_serverless/server/task_manager/usage_reporting_task.ts
@@ -102,7 +102,7 @@ export class SecurityUsageReportingTask {
         params: { version: this.version },
       });
     } catch (e) {
-      this.logger.debug(`Error scheduling task, received ${e.message}`);
+      this.logger.error(`Error scheduling task ${this.taskType}, received ${e.message}`);
     }
   };