[APM] refactoring sourcemap api to receive form-data (elastic#103152)

cauemarcondes · Jun 24, 2021 · 5a76c84 · 5a76c84
1 parent 8a422fd
commit 5a76c84
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 18 deletions.
diff --git a/x-pack/plugins/apm/server/lib/fleet/source_maps.test.ts b/x-pack/plugins/apm/server/lib/fleet/source_maps.test.ts
@@ -103,12 +103,51 @@ const artifacts = [
 
 describe('Source maps', () => {
   describe('getPackagePolicyWithSourceMap', () => {
-    it('returns unchanged package policy when artifacts is empty', () => {
+    it('removes source map from package policy', () => {
+      const packagePolicyWithSourceMaps = {
+        ...packagePolicy,
+        inputs: [
+          {
+            ...packagePolicy.inputs[0],
+            compiled_input: {
+              'apm-server': {
+                ...packagePolicy.inputs[0].compiled_input['apm-server'],
+                value: {
+                  rum: {
+                    source_mapping: {
+                      metadata: [
+                        {
+                          'service.name': 'service_name',
+                          'service.version': '1.0.0',
+                          'bundle.filepath':
+                            'http://localhost:3000/static/js/main.chunk.js',
+                          'sourcemap.url':
+                            '/api/fleet/artifacts/service_name-1.0.0/my-id-1',
+                        },
+                        {
+                          'service.name': 'service_name',
+                          'service.version': '2.0.0',
+                          'bundle.filepath':
+                            'http://localhost:3000/static/js/main.chunk.js',
+                          'sourcemap.url':
+                            '/api/fleet/artifacts/service_name-2.0.0/my-id-2',
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      };
       const updatedPackagePolicy = getPackagePolicyWithSourceMap({
-        packagePolicy,
+        packagePolicy: packagePolicyWithSourceMaps,
         artifacts: [],
       });
-      expect(updatedPackagePolicy).toEqual(packagePolicy);
+      expect(updatedPackagePolicy.inputs[0].config).toEqual({
+        'apm-server': { value: { rum: { source_mapping: { metadata: [] } } } },
+      });
     });
     it('adds source maps into the package policy', () => {
       const updatedPackagePolicy = getPackagePolicyWithSourceMap({

diff --git a/x-pack/plugins/apm/server/lib/fleet/source_maps.ts b/x-pack/plugins/apm/server/lib/fleet/source_maps.ts
@@ -97,9 +97,6 @@ export function getPackagePolicyWithSourceMap({
   packagePolicy: PackagePolicy;
   artifacts: ArtifactSourceMap[];
 }) {
-  if (!artifacts.length) {
-    return packagePolicy;
-  }
   const [firstInput, ...restInputs] = packagePolicy.inputs;
   return {
     ...packagePolicy,

diff --git a/x-pack/plugins/apm/server/routes/source_maps.ts b/x-pack/plugins/apm/server/routes/source_maps.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import Boom from '@hapi/boom';
+import { jsonRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
 import { SavedObjectsClientContract } from 'kibana/server';
 import {
@@ -34,7 +35,7 @@ export const sourceMapRt = t.intersection([
 const listSourceMapRoute = createApmServerRoute({
   endpoint: 'GET /api/apm/sourcemaps',
   options: { tags: ['access:apm'] },
-  handler: async ({ plugins, logger }) => {
+  handler: async ({ plugins }) => {
     try {
       const fleetPluginStart = await plugins.fleet?.start();
       if (fleetPluginStart) {
@@ -51,21 +52,26 @@ const listSourceMapRoute = createApmServerRoute({
 });
 
 const uploadSourceMapRoute = createApmServerRoute({
-  endpoint: 'POST /api/apm/sourcemaps/{serviceName}/{serviceVersion}',
-  options: { tags: ['access:apm', 'access:apm_write'] },
+  endpoint: 'POST /api/apm/sourcemaps',
+  options: {
+    tags: ['access:apm', 'access:apm_write'],
+    body: { accepts: ['multipart/form-data'] },
+  },
   params: t.type({
-    path: t.type({
-      serviceName: t.string,
-      serviceVersion: t.string,
-    }),
     body: t.type({
-      bundleFilepath: t.string,
-      sourceMap: sourceMapRt,
+      service_name: t.string,
+      service_version: t.string,
+      bundle_filepath: t.string,
+      sourcemap: jsonRt.pipe(sourceMapRt),
     }),
   }),
   handler: async ({ params, plugins, core }) => {
-    const { serviceName, serviceVersion } = params.path;
-    const { bundleFilepath, sourceMap } = params.body;
+    const {
+      service_name: serviceName,
+      service_version: serviceVersion,
+      bundle_filepath: bundleFilepath,
+      sourcemap: sourceMap,
+    } = params.body;
     const fleetPluginStart = await plugins.fleet?.start();
     const coreStart = await core.start();
     const esClient = coreStart.elasticsearch.client.asInternalUser;
@@ -107,7 +113,7 @@ const deleteSourceMapRoute = createApmServerRoute({
       id: t.string,
     }),
   }),
-  handler: async ({ context, params, plugins, core }) => {
+  handler: async ({ params, plugins, core }) => {
     const fleetPluginStart = await plugins.fleet?.start();
     const { id } = params.path;
     const coreStart = await core.start();

diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
@@ -39,6 +39,7 @@ export interface APMRouteCreateOptions {
       | 'access:ml:canGetJobs'
       | 'access:ml:canCreateJob'
     >;
+    body?: { accepts: Array<'application/json' | 'multipart/form-data'> };
   };
 }