From 96d53e046af3bfa48a3be5aca39fb06e70aaa365 Mon Sep 17 00:00:00 2001 From: Brad White Date: Thu, 4 Jul 2024 00:13:56 -0600 Subject: [PATCH] use basic license in ftr configs --- x-pack/test/alerting_api_integration/observability/config.ts | 2 +- .../security_and_spaces/group1/config.ts | 2 +- .../security_and_spaces/group2/config.ts | 2 +- .../group2/config_non_dedicated_task_runner.ts | 2 +- .../security_and_spaces/group2/tests/actions/config.ts | 2 +- .../security_and_spaces/group2/tests/telemetry/config.ts | 2 +- .../security_and_spaces/group3/config.ts | 2 +- .../group3/config_with_schedule_circuit_breaker.ts | 2 +- .../security_and_spaces/group4/config.ts | 2 +- .../group4/config_non_dedicated_task_runner.ts | 2 +- .../spaces_only/tests/action_task_params/config.ts | 2 +- .../spaces_only/tests/actions/config.ts | 2 +- .../spaces_only/tests/alerting/group1/config.ts | 2 +- .../spaces_only/tests/alerting/group2/config.ts | 2 +- .../spaces_only/tests/alerting/group3/config.ts | 2 +- .../spaces_only/tests/alerting/group4/config.ts | 2 +- .../alerting_api_integration/spaces_only_legacy/config.ts | 2 +- x-pack/test/apm_api_integration/configs/index.ts | 4 ++-- .../security_and_spaces/config_no_public_base_url.ts | 2 +- .../cases_api_integration/security_and_spaces/config_trial.ts | 2 +- x-pack/test/cases_api_integration/spaces_only/config.ts | 2 +- x-pack/test/cloud_integration/config.ts | 2 +- x-pack/test/custom_branding/config.ts | 2 +- x-pack/test/ftr_apis/security_and_spaces/config.ts | 2 +- x-pack/test/functional/config.base.js | 2 +- .../configs/index.ts | 2 +- x-pack/test/observability_api_integration/trial/config.ts | 2 +- x-pack/test/profiling_api_integration/configs/index.ts | 2 +- x-pack/test/rule_registry/security_and_spaces/config_trial.ts | 2 +- x-pack/test/rule_registry/spaces_only/config_trial.ts | 2 +- .../security_and_spaces/config_trial.ts | 2 +- .../api_integration/security_and_spaces/config.ts | 2 +- .../api_integration/tagging_api/config.ts | 2 +- .../api_integration/tagging_usage_collection/config.ts | 2 +- x-pack/test/saved_objects_field_count/config.ts | 2 +- .../security_functional/insecure_cluster_warning.config.ts | 2 +- x-pack/test/security_functional/login_selector.config.ts | 2 +- x-pack/test/security_functional/oidc.config.ts | 2 +- x-pack/test/security_functional/oidc.http2.config.ts | 2 +- x-pack/test/security_functional/saml.config.ts | 2 +- x-pack/test/security_functional/saml.http2.config.ts | 2 +- .../config/ess/config.base.trial.ts | 2 +- .../security_and_spaces/config_trial.ts | 2 +- .../security_and_spaces/copy_to_space_config_trial.ts | 2 +- x-pack/test/ui_capabilities/security_and_spaces/config.ts | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/x-pack/test/alerting_api_integration/observability/config.ts b/x-pack/test/alerting_api_integration/observability/config.ts index 316441e7fc82c..cc13fcbbe0626 100644 --- a/x-pack/test/alerting_api_integration/observability/config.ts +++ b/x-pack/test/alerting_api_integration/observability/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('observability', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts index f999da061b90b..69bcfd51c89c1 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts index 2f36b70282291..5779d5816d0a3 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts index 71d7cdd8dbb27..05e9baae5538c 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts index ac06b20e3438c..bd02661aea7f1 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts index e6336b7092087..88b3a7b05678e 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts index f999da061b90b..69bcfd51c89c1 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts index e6441be2e7226..9b203bc82a468 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts index f999da061b90b..69bcfd51c89c1 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts index 7aed7501bc012..244d7490cbf2f 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { disabledPlugins: [], - license: 'trial', + license: 'basic', ssl: true, enableActionsProxy: true, publicBaseUrl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts index b95ab7aec7d4b..a73ff6e2fb852 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts @@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com']; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, verificationMode: 'none', customizeLocalHostSsl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts index d4de1e05c1d53..5758b5a80044b 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts @@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com']; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, verificationMode: 'none', customizeLocalHostSsl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts index ef4c38d9171af..16e2855f5e25b 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts @@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com']; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, verificationMode: 'none', customizeLocalHostSsl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts index 9aa68299dbdac..49acc6f8a399c 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts @@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com']; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, verificationMode: 'none', customizeLocalHostSsl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts index c5fa4109abd3a..817b4be1ac5cf 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts @@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com']; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, verificationMode: 'none', customizeLocalHostSsl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts index 8ceb21f6c9b5f..d01d60e7bb632 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts @@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com']; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, verificationMode: 'none', customizeLocalHostSsl: true, diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts index 0bac779b37795..afb69981ae8de 100644 --- a/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts +++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', enableActionsProxy: false, rejectUnauthorized: false, verificationMode: undefined, diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts index cdefe3011e49f..832ccb996536f 100644 --- a/x-pack/test/apm_api_integration/configs/index.ts +++ b/x-pack/test/apm_api_integration/configs/index.ts @@ -26,11 +26,11 @@ const apmFtrConfigs = { kibanaConfig, }, trial: { - license: 'trial' as const, + license: 'basic' as const, kibanaConfig, }, rules: { - license: 'trial' as const, + license: 'basic' as const, kibanaConfig: { ...kibanaConfig, 'xpack.ruleRegistry.write.enabled': 'true', diff --git a/x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts b/x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts index a47dcdbfcbab7..0a4144774bbfc 100644 --- a/x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts +++ b/x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts @@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { - license: 'trial', + license: 'basic', ssl: true, testFiles: [require.resolve('./tests/no_public_base_url')], publicBaseUrl: false, diff --git a/x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts b/x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts index f6e7e39922091..465227c187650 100644 --- a/x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts +++ b/x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts @@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { - license: 'trial', + license: 'basic', ssl: true, testFiles: [require.resolve('./tests/trial')], publicBaseUrl: true, diff --git a/x-pack/test/cases_api_integration/spaces_only/config.ts b/x-pack/test/cases_api_integration/spaces_only/config.ts index 53cfdb6f9285d..8501fe611502b 100644 --- a/x-pack/test/cases_api_integration/spaces_only/config.ts +++ b/x-pack/test/cases_api_integration/spaces_only/config.ts @@ -10,7 +10,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { disabledPlugins: ['security'], - license: 'trial', + license: 'basic', ssl: false, testFiles: [require.resolve('./tests/trial')], }); diff --git a/x-pack/test/cloud_integration/config.ts b/x-pack/test/cloud_integration/config.ts index 6ce2950753394..61f2be7fb7254 100644 --- a/x-pack/test/cloud_integration/config.ts +++ b/x-pack/test/cloud_integration/config.ts @@ -46,7 +46,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: kibanaFunctionalConfig.get('servers'), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: [ 'xpack.security.authc.token.enabled=true', diff --git a/x-pack/test/custom_branding/config.ts b/x-pack/test/custom_branding/config.ts index 993a97647a540..c692ed4c3bef7 100644 --- a/x-pack/test/custom_branding/config.ts +++ b/x-pack/test/custom_branding/config.ts @@ -27,7 +27,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { esTestCluster: { ...kibanaFunctionalConfig.get('esTestCluster'), - license: 'trial', + license: 'basic', serverArgs: [`xpack.license.self_generated.type='trial'`], }, apps: { diff --git a/x-pack/test/ftr_apis/security_and_spaces/config.ts b/x-pack/test/ftr_apis/security_and_spaces/config.ts index 8cfc662bb0b96..36ff1eb04c9de 100644 --- a/x-pack/test/ftr_apis/security_and_spaces/config.ts +++ b/x-pack/test/ftr_apis/security_and_spaces/config.ts @@ -23,7 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, esTestCluster: { ...apiIntegrationConfig.get('esTestCluster'), - license: 'trial', + license: 'basic', }, kbnTestServer: { ...apiIntegrationConfig.get('kbnTestServer'), diff --git a/x-pack/test/functional/config.base.js b/x-pack/test/functional/config.base.js index 1bf939c537b7c..8d30dc6767f56 100644 --- a/x-pack/test/functional/config.base.js +++ b/x-pack/test/functional/config.base.js @@ -33,7 +33,7 @@ export default async function ({ readConfigFile }) { servers: kibanaFunctionalConfig.get('servers'), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: ['path.repo=/tmp/', 'xpack.security.authc.api_key.enabled=true'], }, diff --git a/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts b/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts index 75f7bb628b4be..f8f8076fcce12 100644 --- a/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts +++ b/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts @@ -23,7 +23,7 @@ export const observabilityAIAssistantFtrConfigs = { }, }, enterprise: { - license: 'trial' as const, + license: 'basic' as const, kibanaConfig: { 'logging.loggers': [observabilityAIAssistantDebugLogger], 'plugin-path': path.resolve( diff --git a/x-pack/test/observability_api_integration/trial/config.ts b/x-pack/test/observability_api_integration/trial/config.ts index 0df73c190d8ba..60f88f7734694 100644 --- a/x-pack/test/observability_api_integration/trial/config.ts +++ b/x-pack/test/observability_api_integration/trial/config.ts @@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig({ - license: 'trial', + license: 'basic', name: 'X-Pack Observability API integration tests (trial)', testFiles: [require.resolve('./tests')], }); diff --git a/x-pack/test/profiling_api_integration/configs/index.ts b/x-pack/test/profiling_api_integration/configs/index.ts index 410b415b19993..5bfe83f3ffec4 100644 --- a/x-pack/test/profiling_api_integration/configs/index.ts +++ b/x-pack/test/profiling_api_integration/configs/index.ts @@ -19,7 +19,7 @@ const profilingDebugLogger = { const profilingFtrConfigs = { cloud: { - license: 'trial' as const, + license: 'basic' as const, kibanaConfig: { 'logging.loggers': [profilingDebugLogger], config: kibanaYamlFilePath, diff --git a/x-pack/test/rule_registry/security_and_spaces/config_trial.ts b/x-pack/test/rule_registry/security_and_spaces/config_trial.ts index b5328fd83c2cb..80a441cd04847 100644 --- a/x-pack/test/rule_registry/security_and_spaces/config_trial.ts +++ b/x-pack/test/rule_registry/security_and_spaces/config_trial.ts @@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { - license: 'trial', + license: 'basic', ssl: true, testFiles: [require.resolve('./tests/trial')], }); diff --git a/x-pack/test/rule_registry/spaces_only/config_trial.ts b/x-pack/test/rule_registry/spaces_only/config_trial.ts index e788a16d0272f..711653747b627 100644 --- a/x-pack/test/rule_registry/spaces_only/config_trial.ts +++ b/x-pack/test/rule_registry/spaces_only/config_trial.ts @@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('spaces_only', { - license: 'trial', + license: 'basic', disabledPlugins: ['security'], ssl: false, testFiles: [require.resolve('./tests/trial')], diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/config_trial.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/config_trial.ts index 0481a6009d722..902f8baf026a8 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/config_trial.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/config_trial.ts @@ -8,4 +8,4 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export -export default createTestConfig('security_and_spaces', { license: 'trial' }); +export default createTestConfig('security_and_spaces', { license: 'basic' }); diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts index e52664d02df64..a76c16e0eb470 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts @@ -24,7 +24,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, esTestCluster: { ...apiIntegrationConfig.get('esTestCluster'), - license: 'trial', + license: 'basic', }, kbnTestServer: { ...apiIntegrationConfig.get('kbnTestServer'), diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts index 4d2b2a4313357..8926026bf41c7 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts @@ -23,7 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, esTestCluster: { ...apiIntegrationConfig.get('esTestCluster'), - license: 'trial', + license: 'basic', }, kbnTestServer: { ...apiIntegrationConfig.get('kbnTestServer'), diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts index 22edd56fffdbc..9fa387c87c378 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts @@ -23,7 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, esTestCluster: { ...apiIntegrationConfig.get('esTestCluster'), - license: 'trial', + license: 'basic', }, kbnTestServer: { ...apiIntegrationConfig.get('kbnTestServer'), diff --git a/x-pack/test/saved_objects_field_count/config.ts b/x-pack/test/saved_objects_field_count/config.ts index ab5154adb8d59..dad9f327c52f7 100644 --- a/x-pack/test/saved_objects_field_count/config.ts +++ b/x-pack/test/saved_objects_field_count/config.ts @@ -18,7 +18,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { testFiles: [require.resolve('./test')], esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: ['path.repo=/tmp/'], }, diff --git a/x-pack/test/security_functional/insecure_cluster_warning.config.ts b/x-pack/test/security_functional/insecure_cluster_warning.config.ts index f293eaec531c0..7df7d6d5dc592 100644 --- a/x-pack/test/security_functional/insecure_cluster_warning.config.ts +++ b/x-pack/test/security_functional/insecure_cluster_warning.config.ts @@ -33,7 +33,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: kibanaFunctionalConfig.get('servers'), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: ['xpack.security.enabled=false'], }, diff --git a/x-pack/test/security_functional/login_selector.config.ts b/x-pack/test/security_functional/login_selector.config.ts index 423e8edf8a2a4..95e73057422b0 100644 --- a/x-pack/test/security_functional/login_selector.config.ts +++ b/x-pack/test/security_functional/login_selector.config.ts @@ -41,7 +41,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: kibanaFunctionalConfig.get('servers'), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: [ 'xpack.security.authc.token.enabled=true', diff --git a/x-pack/test/security_functional/oidc.config.ts b/x-pack/test/security_functional/oidc.config.ts index c7051a2982ff0..be7f9165b339d 100644 --- a/x-pack/test/security_functional/oidc.config.ts +++ b/x-pack/test/security_functional/oidc.config.ts @@ -35,7 +35,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: kibanaFunctionalConfig.get('servers'), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: [ 'xpack.security.authc.token.enabled=true', diff --git a/x-pack/test/security_functional/oidc.http2.config.ts b/x-pack/test/security_functional/oidc.http2.config.ts index ebb3447401e24..c3a760be52e29 100644 --- a/x-pack/test/security_functional/oidc.http2.config.ts +++ b/x-pack/test/security_functional/oidc.http2.config.ts @@ -20,7 +20,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { return configureHTTP2({ ...functionalConfig.getAll(), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: [ 'xpack.security.authc.token.enabled=true', diff --git a/x-pack/test/security_functional/saml.config.ts b/x-pack/test/security_functional/saml.config.ts index 8da7266f57f31..6e7af4f8eb019 100644 --- a/x-pack/test/security_functional/saml.config.ts +++ b/x-pack/test/security_functional/saml.config.ts @@ -38,7 +38,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: kibanaFunctionalConfig.get('servers'), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: [ 'xpack.security.authc.token.enabled=true', diff --git a/x-pack/test/security_functional/saml.http2.config.ts b/x-pack/test/security_functional/saml.http2.config.ts index 998fcbfc8cfaa..3db4e9a09ba56 100644 --- a/x-pack/test/security_functional/saml.http2.config.ts +++ b/x-pack/test/security_functional/saml.http2.config.ts @@ -33,7 +33,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { return configureHTTP2({ ...functionalConfig.getAll(), esTestCluster: { - license: 'trial', + license: 'basic', from: 'snapshot', serverArgs: [ 'xpack.security.authc.token.enabled=true', diff --git a/x-pack/test/security_solution_api_integration/config/ess/config.base.trial.ts b/x-pack/test/security_solution_api_integration/config/ess/config.base.trial.ts index 3dabd49fb4830..15104fe97292a 100644 --- a/x-pack/test/security_solution_api_integration/config/ess/config.base.trial.ts +++ b/x-pack/test/security_solution_api_integration/config/ess/config.base.trial.ts @@ -8,6 +8,6 @@ import { createTestConfig } from './config.base'; export default createTestConfig({ - license: 'trial', + license: 'basic', ssl: true, }); diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts b/x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts index 0481a6009d722..902f8baf026a8 100644 --- a/x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts +++ b/x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts @@ -8,4 +8,4 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export -export default createTestConfig('security_and_spaces', { license: 'trial' }); +export default createTestConfig('security_and_spaces', { license: 'basic' }); diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts index da8834134f258..609d747fa8861 100644 --- a/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts +++ b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts @@ -9,6 +9,6 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export export default createTestConfig('security_and_spaces', { - license: 'trial', + license: 'basic', testFiles: [require.resolve('./apis/copy_to_space')], }); diff --git a/x-pack/test/ui_capabilities/security_and_spaces/config.ts b/x-pack/test/ui_capabilities/security_and_spaces/config.ts index d4fa87340e7f5..cd557cb2c0a02 100644 --- a/x-pack/test/ui_capabilities/security_and_spaces/config.ts +++ b/x-pack/test/ui_capabilities/security_and_spaces/config.ts @@ -8,4 +8,4 @@ import { createTestConfig } from '../common/config'; // eslint-disable-next-line import/no-default-export -export default createTestConfig('security_and_spaces', { disabledPlugins: [], license: 'trial' }); +export default createTestConfig('security_and_spaces', { disabledPlugins: [], license: 'basic' });