add flag to feel endpoint and rename schema flag to flett migration

MiriamAparicio · Jun 6, 2023 · 87d15bf · 87d15bf
1 parent dcd7633
commit 87d15bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/x-pack/plugins/apm/common/apm_feature_flags.ts b/x-pack/plugins/apm/common/apm_feature_flags.ts
@@ -16,7 +16,7 @@ export enum ApmFeatureFlagName {
   MigrationToFleetAvailable = 'migrationToFleetAvailable',
   SourcemapApiAvailable = 'sourcemapApiAvailable',
   SpacesAvailable = 'spacesAvailable',
-  SchemaAvailable = 'schemaAvailable',
+  FleetMigrationAvailable = 'fleetMigrationAvailable',
   StorageExplorerAvailable = 'storageExplorerAvailable',
 }
 
@@ -49,7 +49,7 @@ const apmFeatureFlagMap = {
     default: true,
     type: t.boolean,
   },
-  [ApmFeatureFlagName.SchemaAvailable]: {
+  [ApmFeatureFlagName.FleetMigrationAvailable]: {
     default: true,
     type: t.boolean,
   },

diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
@@ -46,7 +46,9 @@ export function SettingsTemplate({ children, selectedTab }: Props) {
   const agentConfigurationAvailable = useApmFeatureFlag(
     ApmFeatureFlagName.AgentConfigurationAvailable
   );
-  const schemaAvailable = useApmFeatureFlag(ApmFeatureFlagName.SchemaAvailable);
+  const schemaAvailable = useApmFeatureFlag(
+    ApmFeatureFlagName.FleetMigrationAvailable
+  );
   const indicesAvailable = useApmFeatureFlag(
     ApmFeatureFlagName.ConfigurableIndicesAvailable
   );

diff --git a/x-pack/plugins/apm/server/routes/fleet/route.ts b/x-pack/plugins/apm/server/routes/fleet/route.ts
@@ -34,7 +34,7 @@ import {
 function throwNotFoundIfApmSchemaNotAvailable(
   featureFlags: ApmFeatureFlags
 ): void {
-  if (!featureFlags.schemaAvailable) {
+  if (!featureFlags.fleetMigrationAvailable) {
     throw Boom.notFound();
   }
 }
@@ -140,6 +140,7 @@ const createCloudApmPackagePolicyRoute = createApmServerRoute({
   ): Promise<{
     cloudApmPackagePolicy: PackagePolicy;
   }> => {
+    throwNotFoundIfApmSchemaNotAvailable(resources.featureFlags);
     const { plugins, context, config, request, logger } = resources;
     const cloudApmMigrationEnabled = config.agent.migrations.enabled;