From 63939639a22f28775c9d4f387e5234aac3aac195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?= Date: Thu, 29 Aug 2024 01:34:13 +0200 Subject: [PATCH 1/2] [Move `@kbn/config-schema` to server] `kbn-server-http-tools` --- packages/kbn-server-http-tools/kibana.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kbn-server-http-tools/kibana.jsonc b/packages/kbn-server-http-tools/kibana.jsonc index c2b6aae999c2..f540a5be0912 100644 --- a/packages/kbn-server-http-tools/kibana.jsonc +++ b/packages/kbn-server-http-tools/kibana.jsonc @@ -1,5 +1,5 @@ { - "type": "shared-common", + "type": "shared-server", "id": "@kbn/server-http-tools", "owner": "@elastic/kibana-core" } From 78dcedc276105fcccae92084392281cbb0cd5a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?= Date: Thu, 29 Aug 2024 02:58:59 +0200 Subject: [PATCH 2/2] Move config from common to server --- .../synthetics/{common => server}/config.ts | 0 .../plugins/observability_solution/synthetics/server/index.ts | 2 +- .../plugins/observability_solution/synthetics/server/plugin.ts | 2 +- .../synthetics/server/synthetics_service/get_es_hosts.ts | 2 +- .../server/synthetics_service/service_api_client.test.ts | 2 +- .../synthetics/server/synthetics_service/service_api_client.ts | 2 +- .../synthetics/server/synthetics_service/synthetics_service.ts | 2 +- .../plugins/observability_solution/synthetics/server/types.ts | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename x-pack/plugins/observability_solution/synthetics/{common => server}/config.ts (100%) diff --git a/x-pack/plugins/observability_solution/synthetics/common/config.ts b/x-pack/plugins/observability_solution/synthetics/server/config.ts similarity index 100% rename from x-pack/plugins/observability_solution/synthetics/common/config.ts rename to x-pack/plugins/observability_solution/synthetics/server/config.ts diff --git a/x-pack/plugins/observability_solution/synthetics/server/index.ts b/x-pack/plugins/observability_solution/synthetics/server/index.ts index 80cbe388a301..e785ba27a368 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/index.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/index.ts @@ -11,4 +11,4 @@ export const plugin = async (initializerContext: PluginInitializerContext) => { return new Plugin(initializerContext); }; -export { config } from '../common/config'; +export { config } from './config'; diff --git a/x-pack/plugins/observability_solution/synthetics/server/plugin.ts b/x-pack/plugins/observability_solution/synthetics/server/plugin.ts index 29dc85e4aa0f..e3c0ad1ef7bf 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/plugin.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/plugin.ts @@ -25,7 +25,7 @@ import { SyntheticsMonitorClient } from './synthetics_service/synthetics_monitor import { initSyntheticsServer } from './server'; import { syntheticsFeature } from './feature'; import { registerSyntheticsSavedObjects } from './saved_objects/saved_objects'; -import { UptimeConfig } from '../common/config'; +import { UptimeConfig } from './config'; import { SyntheticsService } from './synthetics_service/synthetics_service'; import { syntheticsServiceApiKey } from './saved_objects/service_api_key'; import { SYNTHETICS_RULE_TYPES_ALERT_CONTEXT } from '../common/constants/synthetics_alerts'; diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_es_hosts.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_es_hosts.ts index 23a3f5aaf27c..32faa634df51 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_es_hosts.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_es_hosts.ts @@ -13,7 +13,7 @@ */ import type { CloudSetup } from '@kbn/cloud-plugin/server'; -import { ServiceConfig } from '../../common/config'; +import { ServiceConfig } from '../config'; export function getEsHosts({ cloud, diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.test.ts index 66ef4e9faa0c..93b3ca2fb374 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.test.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.test.ts @@ -10,7 +10,7 @@ import { CoreStart } from '@kbn/core/server'; import { coreMock } from '@kbn/core/server/mocks'; import { Logger } from '@kbn/core/server'; import { ServiceAPIClient } from './service_api_client'; -import { ServiceConfig } from '../../common/config'; +import { ServiceConfig } from '../config'; import axios from 'axios'; import { LocationStatus, PublicLocations } from '../../common/runtime_types'; import { LicenseGetResponse } from '@elastic/elasticsearch/lib/api/types'; diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts index 09ad88476ec0..3d334f32e940 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts @@ -24,7 +24,7 @@ import { ServiceLocation, ServiceLocationErrors, } from '../../common/runtime_types'; -import { ServiceConfig } from '../../common/config'; +import { ServiceConfig } from '../config'; const TEST_SERVICE_USERNAME = 'localKibanaIntegrationTestsUser'; diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.ts index 35bf0d9dc7ce..be72ca4d9a49 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.ts @@ -25,7 +25,7 @@ import { sendErrorTelemetryEvents } from '../routes/telemetry/monitor_upgrade_se import { installSyntheticsIndexTemplates } from '../routes/synthetics_service/install_index_templates'; import { getAPIKeyForSyntheticsService } from './get_api_key'; import { getEsHosts } from './get_es_hosts'; -import { ServiceConfig } from '../../common/config'; +import { ServiceConfig } from '../config'; import { ServiceAPIClient, ServiceData } from './service_api_client'; import { diff --git a/x-pack/plugins/observability_solution/synthetics/server/types.ts b/x-pack/plugins/observability_solution/synthetics/server/types.ts index 2e1fac95023b..032cee048e8b 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/types.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/types.ts @@ -38,7 +38,7 @@ import { TaskManagerStartContract, } from '@kbn/task-manager-plugin/server'; import { TelemetryEventsSender } from './telemetry/sender'; -import { UptimeConfig } from '../common/config'; +import { UptimeConfig } from './config'; import { SyntheticsEsClient } from './lib'; export interface SyntheticsServerSetup {