From 3ecf97ef8de14abfc57a15ae3574f7c2a0c340ad Mon Sep 17 00:00:00 2001 From: Ahmad Bamieh Date: Wed, 24 Jun 2020 16:49:11 +0300 Subject: [PATCH] fix typecheck --- .../src/cli/run_telemetry_extract.ts | 80 ++++++++++--------- .../parsed_externally_defined_collector.ts | 4 +- .../__fixture__/parsed_imported_schema.ts | 2 +- .../parsed_imported_usage_interface.ts | 2 +- .../__fixture__/parsed_nested_collector.ts | 2 +- .../__fixture__/parsed_working_collector.ts | 2 +- .../extract_collectors.test.ts.snap | 12 +-- .../__snapshots__/ts_parser.test.ts.snap | 2 +- .../tools/check_collector__integrity.test.ts | 20 ++++- .../src/tools/extract_collectors.test.ts | 2 +- .../src/tools/manage_schema.test.ts | 14 +++- .../src/tools/manage_schema.ts | 10 ++- .../src/tools/serializer.test.ts | 8 +- .../src/tools/ts_parser.test.ts | 8 +- .../telemetry_collectors}/.telemetryrc.json | 0 .../telemetry_collectors}/constants.ts | 2 +- .../externally_defined_collector.ts | 9 +-- .../file_with_no_collector.ts | 0 .../telemetry_collectors}/imported_schema.ts | 6 +- .../imported_usage_interface.ts | 6 +- .../telemetry_collectors}/nested_collector.ts | 9 +-- .../unmapped_collector.ts | 6 +- .../working_collector.ts | 6 +- 23 files changed, 125 insertions(+), 87 deletions(-) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/.telemetryrc.json (100%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/constants.ts (94%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/externally_defined_collector.ts (87%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/file_with_no_collector.ts (100%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/imported_schema.ts (84%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/imported_usage_interface.ts (84%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/nested_collector.ts (85%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/unmapped_collector.ts (83%) rename {packages/kbn-telemetry-tools/src/tools/__fixture__ => src/fixtures/telemetry_collectors}/working_collector.ts (89%) diff --git a/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts b/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts index 4293e3efd66443..27a406a4e216d2 100644 --- a/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts +++ b/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts @@ -29,45 +29,47 @@ import { writeToFileTask, } from '../tools/tasks'; -run( - async ({ flags: {}, log }) => { - const list = new Listr([ - { - title: 'Parsing .telemetryrc.json files', - task: () => new Listr(parseConfigsTask(), { exitOnError: true }), - }, - { - title: 'Extracting Telemetry Collectors', - task: (context) => new Listr(extractCollectorsTask(context), { exitOnError: true }), - }, - { - title: 'Generating Schema files', - task: (context) => new Listr(generateSchemasTask(context), { exitOnError: true }), - }, - { - title: 'Writing to file', - task: (context) => new Listr(writeToFileTask(context), { exitOnError: true }), - }, - ]); +export function runTelemetryExtract() { + run( + async ({ flags: {}, log }) => { + const list = new Listr([ + { + title: 'Parsing .telemetryrc.json files', + task: () => new Listr(parseConfigsTask(), { exitOnError: true }), + }, + { + title: 'Extracting Telemetry Collectors', + task: (context) => new Listr(extractCollectorsTask(context), { exitOnError: true }), + }, + { + title: 'Generating Schema files', + task: (context) => new Listr(generateSchemasTask(context), { exitOnError: true }), + }, + { + title: 'Writing to file', + task: (context) => new Listr(writeToFileTask(context), { exitOnError: true }), + }, + ]); - try { - const context = createTaskContext(); - await list.run(context); - } catch (error) { - process.exitCode = 1; - if (error instanceof ErrorReporter) { - error.errors.forEach((e: string | Error) => log.error(e)); - } else { - log.error('Unhandled exception'); - log.error(error); + try { + const context = createTaskContext(); + await list.run(context); + } catch (error) { + process.exitCode = 1; + if (error instanceof ErrorReporter) { + error.errors.forEach((e: string | Error) => log.error(e)); + } else { + log.error('Unhandled exception'); + log.error(error); + } } - } - process.exit(); - }, - { - flags: { - allowUnexpected: true, - guessTypesForUnexpectedFlags: true, + process.exit(); }, - } -); + { + flags: { + allowUnexpected: true, + guessTypesForUnexpectedFlags: true, + }, + } + ); +} diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts index 2b3df1b391cd5d..fe45f6b7f30427 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts +++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts @@ -22,7 +22,7 @@ import { ParsedUsageCollection } from '../ts_parser'; export const parsedExternallyDefinedCollector: ParsedUsageCollection[] = [ [ - 'packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts', + 'src/fixtures/telemetry_collectors/externally_defined_collector.ts', { collectorName: 'from_variable_collector', schema: { @@ -44,7 +44,7 @@ export const parsedExternallyDefinedCollector: ParsedUsageCollection[] = [ }, ], [ - 'packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts', + 'src/fixtures/telemetry_collectors/externally_defined_collector.ts', { collectorName: 'from_fn_collector', schema: { diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts index a57ae56e732ebc..48702520829502 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts +++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts @@ -22,7 +22,7 @@ import { ParsedUsageCollection } from '../ts_parser'; export const parsedImportedSchemaCollector: ParsedUsageCollection[] = [ [ - 'packages/kbn-telemetry-tools/src/tools/__fixture__/imported_schema.ts', + 'src/fixtures/telemetry_collectors/imported_schema.ts', { collectorName: 'with_imported_schema', schema: { diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts index 69437aa90690a4..42ed2140b5208a 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts +++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts @@ -22,7 +22,7 @@ import { ParsedUsageCollection } from '../ts_parser'; export const parsedImportedUsageInterface: ParsedUsageCollection[] = [ [ - 'packages/kbn-telemetry-tools/src/tools/__fixture__/imported_usage_interface.ts', + 'src/fixtures/telemetry_collectors/imported_usage_interface.ts', { collectorName: 'imported_usage_interface_collector', schema: { diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts index a746c5dc485e95..ed727c15b7c86e 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts +++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts @@ -21,7 +21,7 @@ import { SyntaxKind } from 'typescript'; import { ParsedUsageCollection } from '../ts_parser'; export const parsedNestedCollector: ParsedUsageCollection = [ - 'packages/kbn-telemetry-tools/src/tools/__fixture__/nested_collector.ts', + 'src/fixtures/telemetry_collectors/nested_collector.ts', { collectorName: 'my_nested_collector', schema: { diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts index d338a7ca736ffa..25e49ea221c941 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts +++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts @@ -21,7 +21,7 @@ import { SyntaxKind } from 'typescript'; import { ParsedUsageCollection } from '../ts_parser'; export const parsedWorkingCollector: ParsedUsageCollection = [ - 'packages/kbn-telemetry-tools/src/tools/__fixture__/working_collector.ts', + 'src/fixtures/telemetry_collectors/working_collector.ts', { collectorName: 'my_working_collector', schema: { diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap index 28586db2e493db..44a12dfa9030cc 100644 --- a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap +++ b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap @@ -3,7 +3,7 @@ exports[`extractCollectors extracts collectors given rc file 1`] = ` Array [ Array [ - "packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts", + "src/fixtures/telemetry_collectors/externally_defined_collector.ts", Object { "collectorName": "from_variable_collector", "fetch": Object { @@ -25,7 +25,7 @@ Array [ }, ], Array [ - "packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts", + "src/fixtures/telemetry_collectors/externally_defined_collector.ts", Object { "collectorName": "from_fn_collector", "fetch": Object { @@ -47,7 +47,7 @@ Array [ }, ], Array [ - "packages/kbn-telemetry-tools/src/tools/__fixture__/imported_schema.ts", + "src/fixtures/telemetry_collectors/imported_schema.ts", Object { "collectorName": "with_imported_schema", "fetch": Object { @@ -69,7 +69,7 @@ Array [ }, ], Array [ - "packages/kbn-telemetry-tools/src/tools/__fixture__/imported_usage_interface.ts", + "src/fixtures/telemetry_collectors/imported_usage_interface.ts", Object { "collectorName": "imported_usage_interface_collector", "fetch": Object { @@ -91,7 +91,7 @@ Array [ }, ], Array [ - "packages/kbn-telemetry-tools/src/tools/__fixture__/nested_collector.ts", + "src/fixtures/telemetry_collectors/nested_collector.ts", Object { "collectorName": "my_nested_collector", "fetch": Object { @@ -113,7 +113,7 @@ Array [ }, ], Array [ - "packages/kbn-telemetry-tools/src/tools/__fixture__/working_collector.ts", + "src/fixtures/telemetry_collectors/working_collector.ts", Object { "collectorName": "my_working_collector", "fetch": Object { diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap index 025ae54ecd3acf..5b1b3d9d352990 100644 --- a/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap +++ b/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`parseUsageCollection throws when mapping fields is not defined 1`] = ` -"Error extracting collector in packages/kbn-telemetry-tools/src/tools/__fixture__/unmapped_collector.ts +"Error extracting collector in src/fixtures/telemetry_collectors/unmapped_collector.ts Error: usageCollector.schema must be defined." `; diff --git a/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts b/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts index c2652e1339277f..6083593431d9b3 100644 --- a/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts +++ b/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts @@ -19,18 +19,29 @@ import * as _ from 'lodash'; import * as ts from 'typescript'; -import mockSchema from './__fixture__/mock_schema.json'; import { parsedWorkingCollector } from './__fixture__/parsed_working_collector'; import { checkCompatibleTypeDescriptor, checkMatchingMapping } from './check_collector_integrity'; +import * as path from 'path'; +import { readFile } from 'fs'; +import { promisify } from 'util'; +const read = promisify(readFile); + +async function parseJsonFile(relativePath: string) { + const schemaPath = path.resolve(__dirname, '__fixture__', relativePath); + const fileContent = await read(schemaPath, 'utf8'); + return JSON.parse(fileContent); +} describe('checkMatchingMapping', () => { - it('returns no diff on matching parsedCollections and stored mapping', () => { + it('returns no diff on matching parsedCollections and stored mapping', async () => { + const mockSchema = await parseJsonFile('mock_schema.json'); const diffs = checkMatchingMapping([parsedWorkingCollector], mockSchema); expect(diffs).toEqual({}); }); describe('Collector change', () => { - it('returns diff on mismatching parsedCollections and stored mapping', () => { + it('returns diff on mismatching parsedCollections and stored mapping', async () => { + const mockSchema = await parseJsonFile('mock_schema.json'); const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector); const fieldMapping = { type: 'number' }; malformedParsedCollector[1].schema.value.flat = fieldMapping; @@ -45,7 +56,8 @@ describe('checkMatchingMapping', () => { }); }); - it('returns diff on unknown parsedCollections', () => { + it('returns diff on unknown parsedCollections', async () => { + const mockSchema = await parseJsonFile('mock_schema.json'); const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector); const collectorName = 'New Collector in town!'; const collectorMapping = { some_usage: { type: 'number' } }; diff --git a/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts b/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts index 112b78def9fa40..1b4ed21a1635cf 100644 --- a/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts +++ b/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts @@ -24,7 +24,7 @@ import { parseTelemetryRC } from './config'; describe('extractCollectors', () => { it('extracts collectors given rc file', async () => { - const configRoot = path.join(__dirname, '__fixture__'); + const configRoot = path.join(process.cwd(), 'src', 'fixtures', 'telemetry_collectors'); const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json'); if (!tsConfig) { throw new Error('Could not find a valid tsconfig.json.'); diff --git a/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts b/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts index 5130c1a101bede..8f4bfc66b32aeb 100644 --- a/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts +++ b/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts @@ -19,10 +19,20 @@ import { generateMapping } from './manage_schema'; import { parsedWorkingCollector } from './__fixture__/parsed_working_collector'; -import mockSchema from './__fixture__/mock_schema.json'; +import * as path from 'path'; +import { readFile } from 'fs'; +import { promisify } from 'util'; +const read = promisify(readFile); + +async function parseJsonFile(relativePath: string) { + const schemaPath = path.resolve(__dirname, '__fixture__', relativePath); + const fileContent = await read(schemaPath, 'utf8'); + return JSON.parse(fileContent); +} describe('generateMapping', () => { - it('generates a mapping file', () => { + it('generates a mapping file', async () => { + const mockSchema = await parseJsonFile('mock_schema.json'); const result = generateMapping([parsedWorkingCollector]); expect(result).toEqual(mockSchema); }); diff --git a/packages/kbn-telemetry-tools/src/tools/manage_schema.ts b/packages/kbn-telemetry-tools/src/tools/manage_schema.ts index d4d7c85a31642e..d422837140d802 100644 --- a/packages/kbn-telemetry-tools/src/tools/manage_schema.ts +++ b/packages/kbn-telemetry-tools/src/tools/manage_schema.ts @@ -18,7 +18,15 @@ */ import { ParsedUsageCollection } from './ts_parser'; -import { AllowedSchemaTypes } from '../../../../src/plugins/usage_collection/server'; + +export type AllowedSchemaTypes = + | 'keyword' + | 'text' + | 'number' + | 'boolean' + | 'long' + | 'date' + | 'float'; export function compatibleSchemaTypes(type: AllowedSchemaTypes) { switch (type) { diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts index bb60bc36c42354..9475574a442192 100644 --- a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts +++ b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts @@ -23,7 +23,13 @@ import { getDescriptor, TelemetryKinds } from './serializer'; import { traverseNodes } from './ts_parser'; export function loadFixtureProgram(fixtureName: string) { - const fixturePath = path.resolve(__dirname, '__fixture__', `${fixtureName}.ts`); + const fixturePath = path.resolve( + process.cwd(), + 'src', + 'fixtures', + 'telemetry_collectors', + `${fixtureName}.ts` + ); const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json'); if (!tsConfig) { throw new Error('Could not find a valid tsconfig.json.'); diff --git a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts index 3626497caf1d44..b7ca33a7bcd743 100644 --- a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts +++ b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts @@ -27,7 +27,13 @@ import { parsedImportedUsageInterface } from './__fixture__/parsed_imported_usag import { parsedImportedSchemaCollector } from './__fixture__/parsed_imported_schema'; export function loadFixtureProgram(fixtureName: string) { - const fixturePath = path.resolve(__dirname, '__fixture__', `${fixtureName}.ts`); + const fixturePath = path.resolve( + process.cwd(), + 'src', + 'fixtures', + 'telemetry_collectors', + `${fixtureName}.ts` + ); const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json'); if (!tsConfig) { throw new Error('Could not find a valid tsconfig.json.'); diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/.telemetryrc.json b/src/fixtures/telemetry_collectors/.telemetryrc.json similarity index 100% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/.telemetryrc.json rename to src/fixtures/telemetry_collectors/.telemetryrc.json diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/constants.ts b/src/fixtures/telemetry_collectors/constants.ts similarity index 94% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/constants.ts rename to src/fixtures/telemetry_collectors/constants.ts index ec1c983ea93fa6..4aac9e66cdbdb3 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/constants.ts +++ b/src/fixtures/telemetry_collectors/constants.ts @@ -17,7 +17,7 @@ * under the License. */ import moment, { Moment } from 'moment'; -import { MakeSchemaFrom } from '../../../../../src/plugins/usage_collection/server'; +import { MakeSchemaFrom } from '../../plugins/usage_collection/server'; export interface Usage { locale: string; diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts b/src/fixtures/telemetry_collectors/externally_defined_collector.ts similarity index 87% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts rename to src/fixtures/telemetry_collectors/externally_defined_collector.ts index 031cea0b037b79..00a8d643e27b33 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/externally_defined_collector.ts +++ b/src/fixtures/telemetry_collectors/externally_defined_collector.ts @@ -16,14 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import { - CollectorSet, - CollectorOptions, -} from '../../../../../src/plugins/usage_collection/server/collector'; -import { loggingServiceMock } from '../../../../../src/core/server/mocks'; +import { CollectorSet, CollectorOptions } from '../../plugins/usage_collection/server/collector'; +import { loggerMock } from '../../core/server/logging/logger.mock'; const collectorSet = new CollectorSet({ - logger: loggingServiceMock.createLogger(), + logger: loggerMock.create(), maximumWaitTimeForAllCollectorsInS: 0, }); diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/file_with_no_collector.ts b/src/fixtures/telemetry_collectors/file_with_no_collector.ts similarity index 100% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/file_with_no_collector.ts rename to src/fixtures/telemetry_collectors/file_with_no_collector.ts diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/imported_schema.ts b/src/fixtures/telemetry_collectors/imported_schema.ts similarity index 84% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/imported_schema.ts rename to src/fixtures/telemetry_collectors/imported_schema.ts index 5a4673ed2419a3..66d04700642d17 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/imported_schema.ts +++ b/src/fixtures/telemetry_collectors/imported_schema.ts @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -import { CollectorSet } from '../../../../../src/plugins/usage_collection/server/collector'; -import { loggingServiceMock } from '../../../../../src/core/server/mocks'; +import { CollectorSet } from '../../plugins/usage_collection/server/collector'; +import { loggerMock } from '../../core/server/logging/logger.mock'; import { externallyDefinedSchema } from './constants'; const { makeUsageCollector } = new CollectorSet({ - logger: loggingServiceMock.createLogger(), + logger: loggerMock.create(), maximumWaitTimeForAllCollectorsInS: 0, }); diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/imported_usage_interface.ts b/src/fixtures/telemetry_collectors/imported_usage_interface.ts similarity index 84% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/imported_usage_interface.ts rename to src/fixtures/telemetry_collectors/imported_usage_interface.ts index 20d5d3fb49e5ab..a4a0f4ae1b3c4a 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/imported_usage_interface.ts +++ b/src/fixtures/telemetry_collectors/imported_usage_interface.ts @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -import { CollectorSet } from '../../../../../src/plugins/usage_collection/server/collector'; -import { loggingServiceMock } from '../../../../../src/core/server/mocks'; +import { CollectorSet } from '../../plugins/usage_collection/server/collector'; +import { loggerMock } from '../../core/server/logging/logger.mock'; import { Usage } from './constants'; const { makeUsageCollector } = new CollectorSet({ - logger: loggingServiceMock.createLogger(), + logger: loggerMock.create(), maximumWaitTimeForAllCollectorsInS: 0, }); diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/nested_collector.ts b/src/fixtures/telemetry_collectors/nested_collector.ts similarity index 85% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/nested_collector.ts rename to src/fixtures/telemetry_collectors/nested_collector.ts index f707b662a9d0f9..bde89fe4a70603 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/nested_collector.ts +++ b/src/fixtures/telemetry_collectors/nested_collector.ts @@ -16,14 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import { - CollectorSet, - UsageCollector, -} from '../../../../../src/plugins/usage_collection/server/collector'; -import { loggingServiceMock } from '../../../../../src/core/server/mocks'; +import { CollectorSet, UsageCollector } from '../../plugins/usage_collection/server/collector'; +import { loggerMock } from '../../core/server/logging/logger.mock'; const collectorSet = new CollectorSet({ - logger: loggingServiceMock.createLogger(), + logger: loggerMock.create(), maximumWaitTimeForAllCollectorsInS: 0, }); diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/unmapped_collector.ts b/src/fixtures/telemetry_collectors/unmapped_collector.ts similarity index 83% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/unmapped_collector.ts rename to src/fixtures/telemetry_collectors/unmapped_collector.ts index 063e54a3b8a977..1ea360fcd9e960 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/unmapped_collector.ts +++ b/src/fixtures/telemetry_collectors/unmapped_collector.ts @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import { CollectorSet } from '../../../../../src/plugins/usage_collection/server/collector'; -import { loggingServiceMock } from '../../../../../src/core/server/mocks'; +import { CollectorSet } from '../../plugins/usage_collection/server/collector'; +import { loggerMock } from '../../core/server/logging/logger.mock'; const { makeUsageCollector } = new CollectorSet({ - logger: loggingServiceMock.createLogger(), + logger: loggerMock.create(), maximumWaitTimeForAllCollectorsInS: 0, }); diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/working_collector.ts b/src/fixtures/telemetry_collectors/working_collector.ts similarity index 89% rename from packages/kbn-telemetry-tools/src/tools/__fixture__/working_collector.ts rename to src/fixtures/telemetry_collectors/working_collector.ts index e401c076066783..d70a247c61e70a 100644 --- a/packages/kbn-telemetry-tools/src/tools/__fixture__/working_collector.ts +++ b/src/fixtures/telemetry_collectors/working_collector.ts @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import { CollectorSet } from '../../../../../src/plugins/usage_collection/server/collector'; -import { loggingServiceMock } from '../../../../../src/core/server/mocks'; +import { CollectorSet } from '../../plugins/usage_collection/server/collector'; +import { loggerMock } from '../../core/server/logging/logger.mock'; const { makeUsageCollector } = new CollectorSet({ - logger: loggingServiceMock.createLogger(), + logger: loggerMock.create(), maximumWaitTimeForAllCollectorsInS: 0, });