Skip to content

Commit

Permalink
Add xpack.cloud.full_story configuration (#102363) (#102513)
Browse files Browse the repository at this point in the history
Co-authored-by: Josh Dover <1813008+joshdover@users.noreply.github.com>
  • Loading branch information
kibanamachine and joshdover committed Jun 17, 2021
1 parent 4115b2d commit 37a9d12
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 0 deletions.
37 changes: 37 additions & 0 deletions x-pack/plugins/cloud/server/config.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* 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; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import { config } from './config';

describe('xpack.cloud config', () => {
describe('full_story', () => {
it('allows orgId when enabled: false', () => {
expect(() =>
config.schema.validate({ full_story: { enabled: false, org_id: 'asdf' } })
).not.toThrow();
});

it('rejects undefined or empty orgId when enabled: true', () => {
expect(() =>
config.schema.validate({ full_story: { enabled: true } })
).toThrowErrorMatchingInlineSnapshot(
`"[full_story.org_id]: expected value of type [string] but got [undefined]"`
);
expect(() =>
config.schema.validate({ full_story: { enabled: true, org_id: '' } })
).toThrowErrorMatchingInlineSnapshot(
`"[full_story.org_id]: value has length [0] but it must have a minimum length of [1]."`
);
});

it('accepts orgId when enabled: true', () => {
expect(() =>
config.schema.validate({ full_story: { enabled: true, org_id: 'asdf' } })
).not.toThrow();
});
});
});
12 changes: 12 additions & 0 deletions x-pack/plugins/cloud/server/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ const apmConfigSchema = schema.object({
),
});

const fullStoryConfigSchema = schema.object({
enabled: schema.boolean({ defaultValue: false }),
org_id: schema.conditional(
schema.siblingRef('enabled'),
true,
schema.string({ minLength: 1 }),
schema.maybe(schema.string())
),
});

const configSchema = schema.object({
enabled: schema.boolean({ defaultValue: true }),
id: schema.maybe(schema.string()),
Expand All @@ -27,6 +37,7 @@ const configSchema = schema.object({
profile_url: schema.maybe(schema.string()),
deployment_url: schema.maybe(schema.string()),
organization_url: schema.maybe(schema.string()),
full_story: fullStoryConfigSchema,
});

export type CloudConfigType = TypeOf<typeof configSchema>;
Expand All @@ -39,6 +50,7 @@ export const config: PluginConfigDescriptor<CloudConfigType> = {
profile_url: true,
deployment_url: true,
organization_url: true,
full_story: true,
},
schema: configSchema,
};

0 comments on commit 37a9d12

Please sign in to comment.