[APM] Fix source map list in package policy (#132799) (#133110)

* Fix source map list in agent policy Co-authored-by: Kibana Machine <[email protected]> (cherry picked from commit 7c7ec16) Co-authored-by: Giorgos Bamparopoulos <[email protected]>
elastic · May 30, 2022 · d8941c5 · d8941c5
1 parent 2b2d935
commit d8941c5
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
@@ -13,7 +13,7 @@ import {
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 
-export async function getApmPackgePolicies({
+export async function getApmPackagePolicies({
   core,
   fleetPluginStart,
 }: {

diff --git a/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts b/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
@@ -39,7 +39,7 @@ export async function registerFleetPolicyCallbacks({
   const fleetPluginStart = await plugins.fleet.start();
 
   // Registers a callback invoked when a policy is created to populate the APM
-  // integration policy with pre-existing agent configurations
+  // integration policy with pre-existing agent configurations and source maps
   registerPackagePolicyExternalCallback({
     fleetPluginStart,
     callbackName: 'packagePolicyCreate',
@@ -51,7 +51,7 @@ export async function registerFleetPolicyCallbacks({
   });
 
   // Registers a callback invoked when a policy is updated to populate the APM
-  // integration policy with existing agent configurations
+  // integration policy with existing agent configurations and source maps
   registerPackagePolicyExternalCallback({
     fleetPluginStart,
     callbackName: 'packagePolicyUpdate',

diff --git a/x-pack/plugins/apm/server/routes/fleet/route.ts b/x-pack/plugins/apm/server/routes/fleet/route.ts
@@ -15,7 +15,7 @@ import {
 } from '../../../common/apm_saved_object_constants';
 import { createCloudApmPackgePolicy } from './create_cloud_apm_package_policy';
 import { getFleetAgents } from './get_agents';
-import { getApmPackgePolicies } from './get_apm_package_policies';
+import { getApmPackagePolicies } from './get_apm_package_policies';
 import {
   getApmPackagePolicy,
   getCloudAgentPolicy,
@@ -35,7 +35,7 @@ const hasFleetDataRoute = createApmServerRoute({
     if (!fleetPluginStart) {
       return { hasApmPolicies: false };
     }
-    const packagePolicies = await getApmPackgePolicies({
+    const packagePolicies = await getApmPackagePolicies({
       core,
       fleetPluginStart,
     });
@@ -89,7 +89,7 @@ const fleetAgentsRoute = createApmServerRoute({
       return { cloudStandaloneSetup, fleetAgents: [], isFleetEnabled: false };
     }
     // fetches package policies that contains APM integrations
-    const packagePolicies = await getApmPackgePolicies({
+    const packagePolicies = await getApmPackagePolicies({
       core,
       fleetPluginStart,
     });
@@ -198,7 +198,7 @@ const getMigrationCheckRoute = createApmServerRoute({
         })
       : undefined;
     const apmPackagePolicy = getApmPackagePolicy(cloudAgentPolicy);
-    const packagePolicies = await getApmPackgePolicies({
+    const packagePolicies = await getApmPackagePolicies({
       core,
       fleetPluginStart,
     });

diff --git a/x-pack/plugins/apm/server/routes/fleet/source_maps.ts b/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
@@ -13,9 +13,10 @@ import {
 import { promisify } from 'util';
 import { unzip } from 'zlib';
 import { Artifact } from '@kbn/fleet-plugin/server';
+import { isEmpty } from 'lodash';
 import { SourceMap } from '../source_maps/route';
 import { APMPluginStartDependencies } from '../../types';
-import { getApmPackgePolicies } from './get_apm_package_policies';
+import { getApmPackagePolicies } from './get_apm_package_policies';
 import { APM_SERVER, PackagePolicy } from './register_fleet_policy_callbacks';
 
 export interface ApmArtifactBody {
@@ -54,11 +55,32 @@ export async function listArtifacts({
   fleetPluginStart: FleetPluginStart;
 }) {
   const apmArtifactClient = getApmArtifactClient(fleetPluginStart);
-  const artifacts = await apmArtifactClient.listArtifacts({
+
+  const artifacts = [];
+  const perPage = 100;
+  let page = 1;
+
+  let fleetArtifactsResponse = await apmArtifactClient.listArtifacts({
     kuery: 'type: sourcemap',
+    perPage,
+    page,
   });
+  artifacts.push(...fleetArtifactsResponse.items);
+
+  while (
+    fleetArtifactsResponse.total > artifacts.length &&
+    !isEmpty(fleetArtifactsResponse.items)
+  ) {
+    page += 1;
+    fleetArtifactsResponse = await apmArtifactClient.listArtifacts({
+      kuery: 'type: sourcemap',
+      perPage,
+      page,
+    });
+    artifacts.push(...fleetArtifactsResponse.items);
+  }
 
-  return decodeArtifacts(artifacts.items);
+  return decodeArtifacts(artifacts);
 }
 
 export async function createApmArtifact({
@@ -139,7 +161,7 @@ export async function updateSourceMapsOnFleetPolicies({
 }) {
   const artifacts = await listArtifacts({ fleetPluginStart });
 
-  const apmFleetPolicies = await getApmPackgePolicies({
+  const apmFleetPolicies = await getApmPackagePolicies({
     core,
     fleetPluginStart,
   });

diff --git a/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts b/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
@@ -15,7 +15,7 @@ import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { Setup } from '../../lib/helpers/setup_request';
 import { listConfigurations } from '../settings/agent_configuration/list_configurations';
-import { getApmPackgePolicies } from './get_apm_package_policies';
+import { getApmPackagePolicies } from './get_apm_package_policies';
 import { getPackagePolicyWithAgentConfigurations } from './register_fleet_policy_callbacks';
 
 export async function syncAgentConfigsToApmPackagePolicies({
@@ -41,7 +41,7 @@ export async function syncAgentConfigsToApmPackagePolicies({
     await Promise.all([
       getInternalSavedObjectsClient(core.setup),
       listConfigurations({ setup }),
-      getApmPackgePolicies({
+      getApmPackagePolicies({
         core,
         fleetPluginStart,
       }),