github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Make experimental config robust (#168844)

Browse source
This commit is contained in:
Nicolas Chaulet 2023-10-13 11:33:02 -04:00 • committed by GitHub
parent 94284a105a
commit 046841ce4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
x-pack/plugins/fleet/server/config.test.ts
View file

@ -5,9 +5,18 @@
* 2.0.
*/
import { loggingSystemMock } from '@kbn/core/server/mocks';
import { config } from './config';
import { appContextService } from './services';
jest.mock('./services/app_context');
describe('Config schema', () => {
beforeEach(() => {
const mockedLogger = loggingSystemMock.createLogger();
jest.mocked(appContextService.getLogger).mockReturnValue(mockedLogger);
});
it('should not allow to specify both default output in xpack.fleet.ouputs and xpack.fleet.agents.elasticsearch.hosts ', () => {
expect(() => {
config.schema.validate({
@ -70,4 +79,26 @@ describe('Config schema', () => {
});
}).not.toThrow();
});
it('should log a warning when trying to enable a non existing experimental feature', () => {
expect(() => {
config.schema.validate({
enableExperimental: ['notvalid'],
});
}).not.toThrow();
expect(appContextService.getLogger().warn).toBeCalledWith(
'[notvalid] is not a valid fleet experimental feature.'
);
});
it('should not log a warning when enabling an existing experimental feature', () => {
expect(() => {
config.schema.validate({
enableExperimental: ['displayAgentMetrics'],
});
}).not.toThrow();
expect(appContextService.getLogger().warn).not.toBeCalled();
});
});

13
x-pack/plugins/fleet/server/config.ts
View file

@ -11,11 +11,7 @@ import { schema } from '@kbn/config-schema';
import type { TypeOf } from '@kbn/config-schema';
import type { PluginConfigDescriptor } from '@kbn/core/server';
import {
getExperimentalAllowedValues,
isValidExperimentalValue,
} from '../common/experimental_features';
const allowedExperimentalValues = getExperimentalAllowedValues();
import { isValidExperimentalValue } from '../common/experimental_features';
import {
PreconfiguredPackagesSchema,
@ -25,6 +21,7 @@ import {
PreconfiguredFleetProxiesSchema,
} from './types';
import { BULK_CREATE_MAX_ARTIFACTS_BYTES } from './services/artifacts/artifacts';
import { appContextService } from './services';
const DEFAULT_BUNDLED_PACKAGE_LOCATION = path.join(__dirname, '../target/bundled_packages');
const DEFAULT_GPG_KEY_PATH = path.join(__dirname, '../target/keys/GPG-KEY-elasticsearch');
@ -162,9 +159,9 @@ export const config: PluginConfigDescriptor = {
validate(list) {
for (const key of list) {
if (!isValidExperimentalValue(key)) {
return `[${key}] is not allowed. Allowed values are: ${allowedExperimentalValues.join(
', '
)}`;
appContextService
.getLogger()
.warn(`[${key}] is not a valid fleet experimental feature.`);
}
}
},