[config-schema] offeringBasedSchema helper (#163786)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

docs/developer/architecture/core/configuration-service.asciidoc

@@ -212,3 +212,22 @@ export const config = {
   }),
 };
 ----
+
+For Serverless vs. Traditional configuration, you are encouraged to use the `offeringBasedSchema` helper:
+
+[source,js]
+----
+import { schema, offeringBasedSchema } from '@kbn/config-schema'
+
+export const config = {
+  schema: schema.object({
+    // Enabled by default in Dev mode
+    enabled: schema.boolean({ defaultValue: schema.contextRef('dev') }),
+
+    // Setting only allowed in the Serverless offering
+    plansForWorldPeace: offeringBasedSchema({ 
+      serverless: schema.string({ defaultValue: 'Free hugs' }),
+    }),
+  }),
+};
+----

packages/core/http/core-http-server-internal/src/http_config.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ByteSizeValue, schema, TypeOf } from '@kbn/config-schema';
+import { ByteSizeValue, offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { IHttpConfig, SslConfig, sslSchema } from '@kbn/server-http-tools';
 import type { ServiceConfigDescriptor } from '@kbn/core-base-server-internal';
 import { uuidRegexp } from '@kbn/core-base-server-internal';
@@ -168,12 +168,9 @@ const configSchema = schema.object(
       }
     ),
     // allow access to internal routes by default to prevent breaking changes in current offerings
-    restrictInternalApis: schema.conditional(
+    restrictInternalApis: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.boolean({ defaultValue: false }),
-      true,
+    }),
-      schema.boolean({ defaultValue: false }),
-      schema.never()
-    ),
 
     versioned: schema.object({
       /**

packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_config.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { schema, TypeOf, offeringBasedSchema } from '@kbn/config-schema';
 import type { ServiceConfigDescriptor } from '@kbn/core-base-server-internal';
 import { ConfigDeprecationProvider } from '@kbn/config';
 
@@ -17,12 +17,7 @@ const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) =>
 
 const configSchema = schema.object({
   overrides: schema.object({}, { unknowns: 'allow' }),
-  publicApiEnabled: schema.conditional(
+  publicApiEnabled: offeringBasedSchema({ serverless: schema.boolean({ defaultValue: false }) }),
-    schema.contextRef('serverless'),
-    true,
-    schema.boolean({ defaultValue: false }),
-    schema.never()
-  ),
 });
 
 export type UiSettingsConfigType = TypeOf<typeof configSchema>;

packages/kbn-config-schema/index.ts

@@ -55,6 +55,7 @@ export { ObjectType, Type };
 export { ByteSizeValue } from './src/byte_size_value';
 export { SchemaTypeError, ValidationError } from './src/errors';
 export { isConfigSchema } from './src/typeguards';
+export { offeringBasedSchema } from './src/helpers';
 
 function any(options?: TypeOptions<any>) {
   return new AnyType(options);

packages/kbn-config-schema/src/helpers/index.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { offeringBasedSchema } from './offering_based_schema';

packages/kbn-config-schema/src/helpers/offering_based_schema.test.ts

@@ -0,0 +1,216 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { schema } from '../..';
+import { offeringBasedSchema } from './offering_based_schema';
+
+describe('Helper: offeringBasedSchema()', () => {
+  describe('Example: Only allow the setting on Serverless', () => {
+    const validation = schema.object({
+      myProp: offeringBasedSchema({ serverless: schema.boolean({ defaultValue: true }) }),
+    });
+
+    test('it uses the non-serverless validation when the context is not present', () => {
+      expect(validation.validate({})).toEqual({});
+    });
+
+    test('it uses the non-serverless validation when context claims "not in serverless"', () => {
+      expect(validation.validate({}, { serverless: false })).toEqual({});
+    });
+
+    test('it uses serverless validation when context claims "in serverless"', () => {
+      expect(validation.validate({}, { serverless: true })).toEqual({ myProp: true });
+    });
+
+    test('it does not allow changing the flag when context claims "not in serverless"', () => {
+      expect(() =>
+        validation.validate({ myProp: true }, { serverless: false })
+      ).toThrowErrorMatchingInlineSnapshot(`"[myProp]: a value wasn't expected to be present"`);
+    });
+
+    test('it allows changing the flag when context claims "in serverless"', () => {
+      expect(validation.validate({ myProp: false }, { serverless: true })).toEqual({
+        myProp: false,
+      });
+    });
+  });
+
+  describe('Example: Only allow the setting on Traditional', () => {
+    const validation = schema.object({
+      myProp: offeringBasedSchema({ traditional: schema.boolean({ defaultValue: true }) }),
+    });
+
+    test('it uses the non-serverless validation when the context is not present', () => {
+      expect(validation.validate({})).toEqual({ myProp: true });
+    });
+
+    test('it uses the non-serverless validation when context claims "not in serverless"', () => {
+      expect(validation.validate({}, { serverless: false })).toEqual({ myProp: true });
+    });
+
+    test('it uses serverless validation when context claims "in serverless"', () => {
+      expect(validation.validate({}, { serverless: true })).toEqual({});
+    });
+
+    test('it allows changing the flag when context claims "not in serverless"', () => {
+      expect(validation.validate({ myProp: false }, { serverless: false })).toEqual({
+        myProp: false,
+      });
+    });
+
+    test('it does not allow changing the flag when context claims "in serverless"', () => {
+      expect(() =>
+        validation.validate({ myProp: true }, { serverless: true })
+      ).toThrowErrorMatchingInlineSnapshot(`"[myProp]: a value wasn't expected to be present"`);
+    });
+  });
+
+  describe('Example: Fixed setting on Traditional, configurable on Serverless', () => {
+    const validation = schema.object({
+      myProp: offeringBasedSchema({
+        serverless: schema.boolean({ defaultValue: true }),
+        options: { defaultValue: false },
+      }),
+    });
+
+    test('it uses the non-serverless validation when the context is not present', () => {
+      expect(validation.validate({})).toEqual({ myProp: false });
+    });
+
+    test('it uses the non-serverless validation when context claims "not in serverless"', () => {
+      expect(validation.validate({}, { serverless: false })).toEqual({ myProp: false });
+    });
+
+    test('it uses serverless validation when context claims "in serverless"', () => {
+      expect(validation.validate({}, { serverless: true })).toEqual({ myProp: true });
+    });
+
+    test('it does not allow changing the flag when context claims "not in serverless"', () => {
+      expect(() =>
+        validation.validate({ myProp: true }, { serverless: false })
+      ).toThrowErrorMatchingInlineSnapshot(`"[myProp]: a value wasn't expected to be present"`);
+    });
+
+    test('it allows changing the flag when context claims "in serverless"', () => {
+      expect(validation.validate({ myProp: false }, { serverless: true })).toEqual({
+        myProp: false,
+      });
+    });
+  });
+
+  describe('Example: Fixed setting on Traditional (though settable), configurable on Serverless', () => {
+    const validation = schema.object({
+      myProp: offeringBasedSchema({
+        serverless: schema.boolean({ defaultValue: true }),
+        traditional: schema.literal(false),
+        options: { defaultValue: false },
+      }),
+    });
+
+    test('it uses the non-serverless validation when the context is not present', () => {
+      expect(validation.validate({})).toEqual({ myProp: false });
+    });
+
+    test('it uses the non-serverless validation when context claims "not in serverless"', () => {
+      expect(validation.validate({}, { serverless: false })).toEqual({ myProp: false });
+    });
+
+    test('it uses serverless validation when context claims "in serverless"', () => {
+      expect(validation.validate({}, { serverless: true })).toEqual({ myProp: true });
+    });
+
+    test('it does not allow changing the flag when context claims "not in serverless"', () => {
+      expect(() =>
+        validation.validate({ myProp: true }, { serverless: false })
+      ).toThrowErrorMatchingInlineSnapshot(`"[myProp]: expected value to equal [false]"`);
+    });
+
+    test('it allows changing the flag when context claims "in serverless"', () => {
+      expect(validation.validate({ myProp: false }, { serverless: true })).toEqual({
+        myProp: false,
+      });
+    });
+  });
+
+  describe('Example: Fixed setting on Serverless (though settable), configurable on Traditional', () => {
+    const validation = schema.object({
+      myProp: offeringBasedSchema({
+        serverless: schema.literal(false),
+        traditional: schema.boolean({ defaultValue: true }),
+        options: { defaultValue: false },
+      }),
+    });
+
+    test('it uses the non-serverless validation when the context is not present', () => {
+      expect(validation.validate({})).toEqual({ myProp: true });
+    });
+
+    test('it uses the non-serverless validation when context claims "not in serverless"', () => {
+      expect(validation.validate({}, { serverless: false })).toEqual({ myProp: true });
+    });
+
+    test('it uses serverless validation when context claims "in serverless"', () => {
+      expect(validation.validate({}, { serverless: true })).toEqual({ myProp: false });
+    });
+
+    test('it allows changing the flag when context claims "not in serverless"', () => {
+      expect(validation.validate({ myProp: false }, { serverless: false })).toEqual({
+        myProp: false,
+      });
+    });
+
+    test('it does not allow changing the flag when context claims "in serverless"', () => {
+      expect(() =>
+        validation.validate({ myProp: true }, { serverless: true })
+      ).toThrowErrorMatchingInlineSnapshot(`"[myProp]: expected value to equal [false]"`);
+    });
+  });
+
+  describe('Example: Setting is changeable on all offerings but with different defaults', () => {
+    const validation = schema.object({
+      myProp: offeringBasedSchema({
+        serverless: schema.boolean({ defaultValue: true }),
+        traditional: schema.boolean({ defaultValue: false }),
+      }),
+    });
+
+    test('it uses the non-serverless validation when the context is not present', () => {
+      expect(validation.validate({})).toEqual({ myProp: false });
+    });
+
+    test('it uses the non-serverless validation when context claims "not in serverless"', () => {
+      expect(validation.validate({}, { serverless: false })).toEqual({ myProp: false });
+    });
+
+    test('it uses serverless validation when context claims "in serverless"', () => {
+      expect(validation.validate({}, { serverless: true })).toEqual({ myProp: true });
+    });
+
+    test('it allows changing the flag when context claims "not in serverless"', () => {
+      expect(validation.validate({ myProp: true }, { serverless: false })).toEqual({
+        myProp: true,
+      });
+    });
+
+    test('it allows changing the flag when context claims "in serverless"', () => {
+      expect(validation.validate({ myProp: false }, { serverless: true })).toEqual({
+        myProp: false,
+      });
+    });
+  });
+
+  test('TS enforces the same types on both entries', () => {
+    schema.object({
+      myProp: offeringBasedSchema({
+        serverless: schema.boolean({ defaultValue: true }),
+        // @ts-expect-error
+        traditional: schema.string({ defaultValue: 'not on serverless' }),
+      }),
+    });
+  });
+});

packages/kbn-config-schema/src/helpers/offering_based_schema.ts

@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { schema } from '../..';
+import { Type, TypeOptions } from '../types';
+
+/**
+ * Helper to apply different validations depending on whether Kibana is running the Serverless or Traditional offering.
+ *
+ * @example Only allow the setting on Serverless
+ * const config = schema.object({
+ *   myProp: offeringBasedSchema({ serverless: schema.boolean({ defaultValue: true }) }),
+ * });
+ *
+ * @example Only allow the setting on Traditional
+ * const config = schema.object({
+ *   myProp: offeringBasedSchema({ fullyManaged: schema.boolean({ defaultValue: true }) }),
+ * });
+ *
+ * @example Fixed value on Traditional, configurable on Serverless
+ * const config = schema.object({
+ *   myProp: offeringBasedSchema({
+ *     serverless: schema.boolean({ defaultValue: true }),
+ *     traditional: schema.literal(false), // this can be skipped if users can't specify it in the config
+ *     options: { defaultValue: false },
+ *   }),
+ * });
+ *
+ * @example Setting is changeable on all offerings but with different defaults
+ * const config = schema.object({
+ *   myProp: offeringBasedSchema({
+ *     serverless: schema.boolean({ defaultValue: true }),
+ *     traditional: schema.boolean({ defaultValue: false }),
+ *   }),
+ * });
+ *
+ * @param opts.serverless The validation to apply in the Serverless offering. If not provided, it doesn't allow the setting to be set in this offering.
+ * @param opts.traditional The validation to apply in the Traditional offering. If not provided, it doesn't allow the setting to be set in this offering.
+ * @param opts.options Any options to pass down in the types.
+ */
+export function offeringBasedSchema<V>(opts: {
+  serverless?: Type<V>;
+  traditional?: Type<V>;
+  options?: TypeOptions<V>;
+}) {
+  const { serverless = schema.never(), traditional = schema.never(), options } = opts;
+  return schema.conditional(
+    schema.contextRef('serverless'),
+    true,
+    serverless,
+    traditional,
+    options
+  );
+}

src/plugins/input_control_vis/config.ts

@@ -6,15 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { schema, TypeOf, offeringBasedSchema } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type InputControlConfig = TypeOf<typeof configSchema>;

src/plugins/telemetry/server/config/config.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf, Type } from '@kbn/config-schema';
+import { schema, TypeOf, Type, offeringBasedSchema } from '@kbn/config-schema';
 import { getConfigPath } from '@kbn/utils';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 import { labelsSchema } from './telemetry_labels';
@@ -33,13 +33,11 @@ const configSchema = schema.object({
   sendUsageFrom: schema.oneOf([schema.literal('server'), schema.literal('browser')], {
     defaultValue: 'server',
   }),
-  appendServerlessChannelsSuffix: schema.conditional(
+  appendServerlessChannelsSuffix: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.literal(true),
-    true,
+    traditional: schema.literal(false),
-    schema.literal(true),
+    options: { defaultValue: schema.contextRef('serverless') },
-    schema.literal(false),
+  }),
-    { defaultValue: schema.contextRef('serverless') }
-  ),
   // Used for extra enrichment of telemetry
   labels: labelsSchema,
 });

src/plugins/telemetry/server/config/telemetry_labels.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 /**
  * Labels to enrich the context of the telemetry generated.
@@ -31,9 +31,7 @@ export const labelsSchema = schema.object(
      * The serverless project type.
      * Flagging it as maybe because these settings should never affect how Kibana runs.
      */
-    serverless: schema.maybe(
+    serverless: offeringBasedSchema({ serverless: schema.maybe(schema.string()) }),
-      schema.conditional(schema.contextRef('serverless'), true, schema.string(), schema.never())
-    ),
   },
   { defaultValue: {} }
 );

src/plugins/vis_types/gauge/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type GaugeConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/heatmap/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type HeatmapConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/metric/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type MetricConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/pie/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type PieConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/table/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type TableConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/tagcloud/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type TagcloudConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/timelion/config.ts

@@ -6,18 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   graphiteUrls: schema.maybe(schema.arrayOf(schema.string())),
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type TimelionConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/timeseries/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const config = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 
   /** @deprecated **/
   chartResolution: schema.number({ defaultValue: 150 }),

src/plugins/vis_types/vislib/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type VislibConfig = TypeOf<typeof configSchema>;

src/plugins/vis_types/xy/config.ts

@@ -6,17 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
-  readOnly: schema.conditional(
+  readOnly: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.maybe(schema.boolean({ defaultValue: false })),
-    schema.never()
-  ),
 });
 
 export type XyConfig = TypeOf<typeof configSchema>;

x-pack/plugins/apm/server/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import {
   PluginConfigDescriptor,
   PluginInitializerContext,
@@ -14,14 +14,12 @@ import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { SearchAggregatedTransactionSetting } from '../common/aggregated_transactions';
 import { APMPlugin } from './plugin';
 
-const disabledOnServerless = schema.conditional(
+const disabledOnServerless = offeringBasedSchema({
-  schema.contextRef('serverless'),
+  serverless: schema.boolean({
-  true,
-  schema.boolean({
     defaultValue: false,
   }),
-  schema.oneOf([schema.literal(true)], { defaultValue: true })
+  traditional: schema.oneOf([schema.literal(true)], { defaultValue: true }),
-);
+});
 
 // All options should be documented in the APM configuration settings: https://github.com/elastic/kibana/blob/main/docs/settings/apm-settings.asciidoc
 // and be included on cloud allow list unless there are specific reasons not to
@@ -61,18 +59,12 @@ const configSchema = schema.object({
     defaultValue: 'https://apm-agent-versions.elastic.co/versions.json',
   }),
   enabled: schema.boolean({ defaultValue: true }),
-  serverlessOnboarding: schema.conditional(
+  serverlessOnboarding: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+  }),
-    schema.boolean({ defaultValue: false }),
+  managedServiceUrl: offeringBasedSchema({
-    schema.never()
+    serverless: schema.string({ defaultValue: '' }),
-  ),
+  }),
-  managedServiceUrl: schema.conditional(
-    schema.contextRef('serverless'),
-    true,
-    schema.string({ defaultValue: '' }),
-    schema.never()
-  ),
   featureFlags: schema.object({
     agentConfigurationAvailable: disabledOnServerless,
     configurableIndicesAvailable: disabledOnServerless,
@@ -83,13 +75,10 @@ const configSchema = schema.object({
     storageExplorerAvailable: disabledOnServerless,
   }),
   serverless: schema.object({
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.literal(true),
-      true,
+      options: { defaultValue: schema.contextRef('serverless') },
-      schema.literal(true),
+    }),
-      schema.never(),
-      { defaultValue: schema.contextRef('serverless') }
-    ),
   }),
 });
 

x-pack/plugins/cloud/server/config.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const apmConfigSchema = schema.object({
@@ -29,12 +29,7 @@ const configSchema = schema.object({
   users_and_roles_url: schema.maybe(schema.string()),
   organization_url: schema.maybe(schema.string()),
   profile_url: schema.maybe(schema.string()),
-  projects_url: schema.conditional(
+  projects_url: offeringBasedSchema({ serverless: schema.string({ defaultValue: '/projects/' }) }),
-    schema.contextRef('serverless'),
-    true,
-    schema.string({ defaultValue: '/projects/' }),
-    schema.never()
-  ),
   trial_end_date: schema.maybe(schema.string()),
   is_elastic_staff_owned: schema.maybe(schema.boolean()),
   serverless: schema.maybe(

x-pack/plugins/cloud_integrations/cloud_data_migration/server/config.ts

@@ -5,18 +5,15 @@
  * 2.0.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core-plugins-server';
 
 const configSchema = schema.object({
-  enabled: schema.conditional(
+  enabled: offeringBasedSchema({
-    schema.contextRef('serverless'),
-    true,
     // cloud_data_migration is disabled in serverless; refer to the serverless.yml file as the source of truth
     // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-    schema.boolean({ defaultValue: true }),
+    serverless: schema.boolean({ defaultValue: true }),
-    schema.never()
+  }),
-  ),
 });
 
 export type CloudDataMigrationConfig = TypeOf<typeof configSchema>;

x-pack/plugins/cross_cluster_replication/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
@@ -26,14 +26,11 @@ const schemaLatest = schema.object(
      * Disables the plugin.
      * Added back in 8.8.
      */
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // CCR is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   },
   { defaultValue: undefined }
 );

x-pack/plugins/discover_log_explorer/server/config.ts

@@ -5,22 +5,19 @@
  * 2.0.
  */
 
-import { schema } from '@kbn/config-schema';
+import { schema, offeringBasedSchema } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { DiscoverLogExplorerConfig } from '../common/plugin_config';
 
 export const configSchema = schema.object({
   featureFlags: schema.object({
-    deepLinkVisible: schema.conditional(
+    deepLinkVisible: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.boolean(),
-      true,
+      options: {
-      schema.boolean(),
-      schema.never(),
-      {
         defaultValue: false,
-      }
+      },
-    ),
+    }),
   }),
 });
 

x-pack/plugins/graph/config.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { schema, TypeOf, offeringBasedSchema } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   savePolicy: schema.oneOf(
@@ -18,12 +18,7 @@ export const configSchema = schema.object({
     { defaultValue: 'configAndData' }
   ),
   canEditDrillDownUrls: schema.boolean({ defaultValue: true }),
-  enabled: schema.conditional(
+  enabled: offeringBasedSchema({ serverless: schema.boolean({ defaultValue: true }) }),
-    schema.contextRef('serverless'),
-    true,
-    schema.maybe(schema.boolean({ defaultValue: true })),
-    schema.never()
-  ),
 });
 
 export type ConfigSchema = TypeOf<typeof configSchema>;

x-pack/plugins/index_lifecycle_management/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
@@ -28,14 +28,11 @@ const schemaLatest = schema.object(
      * Disables the plugin.
      * Added back in 8.8.
      */
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // ILM is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   },
   { defaultValue: undefined }
 );

x-pack/plugins/index_management/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
@@ -22,22 +22,16 @@ const schemaLatest = schema.object(
     ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
     }),
-    enableIndexActions: schema.conditional(
+    enableIndexActions: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // Index actions are disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) for serverless config across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
+    enableLegacyTemplates: offeringBasedSchema({
-    enableLegacyTemplates: schema.conditional(
-      schema.contextRef('serverless'),
-      true,
       // Legacy templates functionality is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) for serverless config across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
     dev: schema.object({ enableIndexDetailsPage: schema.boolean({ defaultValue: false }) }),
   },
   { defaultValue: undefined }

x-pack/plugins/infra/server/plugin.ts

@@ -6,7 +6,7 @@
  */
 
 import { Server } from '@hapi/hapi';
-import { schema } from '@kbn/config-schema';
+import { offeringBasedSchema, schema } from '@kbn/config-schema';
 import {
   CoreStart,
   Plugin,
@@ -62,20 +62,17 @@ export const config: PluginConfigDescriptor<InfraConfig> = {
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
     // Setting variants only allowed in the Serverless offering, otherwise always default `logs-ui` value
-    logs: schema.conditional(
+    logs: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.object({
-      true,
-      schema.object({
         app_target: schema.oneOf(
           [schema.literal(LOGS_APP_TARGET), schema.literal(DISCOVER_APP_TARGET)],
           { defaultValue: LOGS_APP_TARGET }
         ),
       }),
-      schema.never(),
+      options: {
-      {
+        defaultValue: { app_target: LOGS_APP_TARGET } as const, // "as const" is required for TS to not generalize `app_target: string`
-        defaultValue: { app_target: LOGS_APP_TARGET },
+      },
-      }
+    }),
-    ),
     alerting: schema.object({
       inventory_threshold: schema.object({
         group_by_page_size: schema.number({ defaultValue: 5_000 }),

x-pack/plugins/license_management/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
@@ -26,14 +26,11 @@ const schemaLatest = schema.object(
      * Disables the plugin.
      * Added back in 8.8.
      */
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // License Management is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   },
   { defaultValue: undefined }
 );

x-pack/plugins/observability_onboarding/server/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import {
   PluginConfigDescriptor,
   PluginInitializerContext,
@@ -17,13 +17,10 @@ const configSchema = schema.object({
     enabled: schema.boolean({ defaultValue: true }),
   }),
   serverless: schema.object({
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.literal(true),
-      true,
+      options: { defaultValue: schema.contextRef('serverless') },
-      schema.literal(true),
+    }),
-      schema.never(),
-      { defaultValue: schema.contextRef('serverless') }
-    ),
   }),
 });
 

x-pack/plugins/remote_clusters/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
@@ -26,14 +26,11 @@ const schemaLatest = schema.object(
      * Disables the plugin.
      * Added back in 8.8.
      */
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // Remote Clusters is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   },
   { defaultValue: undefined }
 );

x-pack/plugins/reporting/server/config/schema.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ByteSizeValue, schema, TypeOf } from '@kbn/config-schema';
+import { ByteSizeValue, offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import ipaddr from 'ipaddr.js';
 import { sum } from 'lodash';
 import moment from 'moment';
@@ -84,18 +84,14 @@ const EncryptionKeySchema = schema.conditional(
 );
 
 const RolesSchema = schema.object({
-  enabled: schema.conditional(
+  enabled: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.boolean({ defaultValue: false }),
-    true,
+    traditional: schema.boolean({ defaultValue: true }),
-    schema.boolean({ defaultValue: false }),
+  }), // true: use ES API for access control (deprecated in 7.x). false: use Kibana API for application features (8.0)
-    schema.boolean({ defaultValue: true })
+  allow: offeringBasedSchema({
-  ), // true: use ES API for access control (deprecated in 7.x). false: use Kibana API for application features (8.0)
+    serverless: schema.arrayOf(schema.string(), { defaultValue: [] }),
-  allow: schema.conditional(
+    traditional: schema.arrayOf(schema.string(), { defaultValue: ['reporting_user'] }),
-    schema.contextRef('serverless'),
+  }),
-    true,
-    schema.arrayOf(schema.string(), { defaultValue: [] }),
-    schema.arrayOf(schema.string(), { defaultValue: ['reporting_user'] })
-  ),
 });
 
 // Browser side polling: job completion notifier, management table auto-refresh
@@ -118,21 +114,17 @@ const ExportTypeSchema = schema.object({
   }),
   // Png reports are disabled in serverless
   png: schema.object({
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.boolean({ defaultValue: false }),
-      true,
+      traditional: schema.boolean({ defaultValue: true }),
-      schema.boolean({ defaultValue: false }),
+    }),
-      schema.boolean({ defaultValue: true })
-    ),
   }),
   // Pdf reports are disabled in serverless
   pdf: schema.object({
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
+      serverless: schema.boolean({ defaultValue: false }),
-      true,
+      traditional: schema.boolean({ defaultValue: true }),
-      schema.boolean({ defaultValue: false }),
+    }),
-      schema.boolean({ defaultValue: true })
-    ),
   }),
 });
 

x-pack/plugins/rollup/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common';
@@ -26,14 +26,11 @@ const schemaLatest = schema.object(
      * Disables the plugin.
      * Added back in 8.8.
      */
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // Rollups is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   },
   { defaultValue: undefined }
 );

x-pack/plugins/security/server/config.ts

@@ -10,7 +10,7 @@ import type { Duration } from 'moment';
 import path from 'path';
 
 import type { Type, TypeOf } from '@kbn/config-schema';
-import { schema } from '@kbn/config-schema';
+import { offeringBasedSchema, schema } from '@kbn/config-schema';
 import type { AppenderConfigType, Logger } from '@kbn/core/server';
 import { config as coreConfig } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
@@ -299,16 +299,13 @@ export const ConfigSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
 
   // Setting only allowed in the Serverless offering
-  ui: schema.conditional(
+  ui: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.object({
-    true,
-    schema.object({
       userManagementEnabled: schema.boolean({ defaultValue: true }),
       roleManagementEnabled: schema.boolean({ defaultValue: true }),
       roleMappingManagementEnabled: schema.boolean({ defaultValue: true }),
     }),
-    schema.never()
+  }),
-  ),
 });
 
 export function createConfig(

x-pack/plugins/snapshot_restore/server/config.ts

@@ -7,7 +7,7 @@
 import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
@@ -29,14 +29,11 @@ const schemaLatest = schema.object(
      * Disables the plugin.
      * Added back in 8.8.
      */
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // Snapshot & Restore is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   },
   { defaultValue: undefined }
 );

x-pack/plugins/spaces/server/config.ts

@@ -8,7 +8,7 @@
 import type { Observable } from 'rxjs';
 
 import type { TypeOf } from '@kbn/config-schema';
-import { schema } from '@kbn/config-schema';
+import { offeringBasedSchema, schema } from '@kbn/config-schema';
 import type { PluginInitializerContext } from '@kbn/core/server';
 
 export const ConfigSchema = schema.object({
@@ -26,11 +26,9 @@ export const ConfigSchema = schema.object({
     })
   ),
   maxSpaces: schema.number({ defaultValue: 1000 }),
-  allowFeatureVisibility: schema.conditional(
+  allowFeatureVisibility: offeringBasedSchema({
-    schema.contextRef('serverless'),
+    serverless: schema.literal(false),
-    true,
+    traditional: schema.boolean({
-    schema.literal(false),
-    schema.boolean({
       validate: (rawValue) => {
         // This setting should not be configurable on-prem to avoid bugs when e.g. existing spaces
         // have feature visibility customized but admins would be unable to change them back if the
@@ -40,8 +38,8 @@ export const ConfigSchema = schema.object({
         }
       },
       defaultValue: true,
-    })
+    }),
-  ),
+  }),
 });
 
 export function createConfig$(context: PluginInitializerContext) {

x-pack/plugins/upgrade_assistant/server/config.ts

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { schema, TypeOf } from '@kbn/config-schema';
+import { offeringBasedSchema, schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from '@kbn/core/server';
 
 // -------------------------------
@@ -15,14 +15,11 @@ const configSchema = schema.object({
   /**
    * Disables the plugin.
    */
-  enabled: schema.conditional(
+  enabled: offeringBasedSchema({
-    schema.contextRef('serverless'),
-    true,
     // Upgrade Assistant is disabled in serverless; refer to the serverless.yml file as the source of truth
     // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-    schema.boolean({ defaultValue: true }),
+    serverless: schema.boolean({ defaultValue: true }),
-    schema.never()
+  }),
-  ),
 
   featureSet: schema.object({
     /**

x-pack/plugins/watcher/server/index.ts

@@ -6,7 +6,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/server';
-import { schema } from '@kbn/config-schema';
+import { offeringBasedSchema, schema } from '@kbn/config-schema';
 
 import { WatcherServerPlugin } from './plugin';
 
@@ -14,13 +14,10 @@ export const plugin = (ctx: PluginInitializerContext) => new WatcherServerPlugin
 
 export const config = {
   schema: schema.object({
-    enabled: schema.conditional(
+    enabled: offeringBasedSchema({
-      schema.contextRef('serverless'),
-      true,
       // Watcher is disabled in serverless; refer to the serverless.yml file as the source of truth
       // We take this approach in order to have a central place (serverless.yml) to view disabled plugins across Kibana
-      schema.boolean({ defaultValue: true }),
+      serverless: schema.boolean({ defaultValue: true }),
-      schema.never()
+    }),
-    ),
   }),
 };