github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-28 11:05:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ftr/journeys] allow override ftr base config in journey (#151277)

Browse source 
## Summary

Currently journeys use pre-defined base FTR config and there is no way
to re-configure Kibana to be loaded with extras, e.g. Fleet plugin
configuration.

f443109eea/packages/kbn-journeys/journey/journey_ftr_config.ts (L32-L34)

Probably the easiest way to address it is to path custom FTR config
directly in the journey.

```
export const journey = new Journey({
  ftrConfigPath: 'x-pack/test/cloud_security_posture_api/config.ts',
  ...
})
```


It can be also considered as a step towards using journeys as future
alternative to Webdriver functional tests.
This commit is contained in:
Dzmitry Lemechko 2023-02-16 08:52:05 +01:00 • committed by GitHub
parent a7293f62b5
commit b46d25a7ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/kbn-journeys/journey/journey_config.ts
View file

@ -70,6 +70,11 @@ export interface ScalabilitySetup {
} }
export interface JourneyConfigOptions<CtxExt> { export interface JourneyConfigOptions<CtxExt> {
/**
* Relative path to FTR config file. Use to override the default ones:
* 'x-pack/test/functional/config.base.js', 'test/functional/config.base.js'
*/
ftrConfigPath?: string;
/** /**
* Set to `true` to skip this journey. should probably be preceded * Set to `true` to skip this journey. should probably be preceded
* by a link to a Github issue where the reasoning for why this was * by a link to a Github issue where the reasoning for why this was
@ -122,6 +127,10 @@ export class JourneyConfig<CtxExt extends object> {
this.#opts = opts; this.#opts = opts;
} }
getFtrConfigPath() {
return this.#opts.ftrConfigPath;
}
getEsArchives() { getEsArchives() {
return this.#opts.esArchives ?? []; return this.#opts.esArchives ?? [];
} }

14
packages/kbn-journeys/journey/journey_ftr_config.ts
View file

@ -25,16 +25,12 @@ export function makeFtrConfigProvider(
steps: AnyStep[] steps: AnyStep[]
): FtrConfigProvider { ): FtrConfigProvider {
return async ({ readConfigFile }: FtrConfigProviderContext) => { return async ({ readConfigFile }: FtrConfigProviderContext) => {
const baseConfig = ( const configPath = config.getFtrConfigPath();
await readConfigFile( const defaultConfigPath = config.isXpack()
Path.resolve(
REPO_ROOT,
config.isXpack()
? 'x-pack/test/functional/config.base.js' ? 'x-pack/test/functional/config.base.js'
: 'test/functional/config.base.js' : 'test/functional/config.base.js';
) const ftrConfigPath = configPath ?? defaultConfigPath;
) const baseConfig = (await readConfigFile(Path.resolve(REPO_ROOT, ftrConfigPath))).getAll();
).getAll();
const testBuildId = process.env.BUILDKITE_BUILD_ID ?? `local-${uuidV4()}`; const testBuildId = process.env.BUILDKITE_BUILD_ID ?? `local-${uuidV4()}`;
const testJobId = process.env.BUILDKITE_JOB_ID ?? `local-${uuidV4()}`; const testJobId = process.env.BUILDKITE_JOB_ID ?? `local-${uuidV4()}`;