Skip to content

Commit 76df1b6

Browse files
mshustovspalger
andauthored
Move streams utils to the core (#76397) (#76609)
* move utils/streams to the KP * allow imports from src/core/server/utils * ts-ify * import streams from KP * remove unnecessary ts-expect-error * fix kbn-es-archiver build * lost export * copy array in createListStream * remove streams from legacy utils Co-authored-by: spalger <spalger@users.noreply.github.com> Co-authored-by: spalger <spalger@users.noreply.github.com>
1 parent 9f76044 commit 76df1b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+85
-136
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ module.exports = {
311311
'!src/core/server/mocks{,.ts}',
312312
'!src/core/server/types{,.ts}',
313313
'!src/core/server/test_utils{,.ts}',
314+
'!src/core/server/utils', // ts alias
315+
'!src/core/server/utils/**/*',
314316
// for absolute imports until fixed in
315317
// https://github.com/elastic/kibana/issues/36096
316318
'!src/core/server/*.test.mocks{,.ts}',

src/cli_keystore/add.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import { Logger } from '../cli_plugin/lib/logger';
2121
import { confirm, question } from '../legacy/server/utils';
22-
import { createPromiseFromStreams, createConcatStream } from '../legacy/utils';
22+
import { createPromiseFromStreams, createConcatStream } from '../core/server/utils';
2323

2424
/**
2525
* @param {Keystore} keystore

src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import { exportSavedObjectsToStream } from './get_sorted_objects_for_export';
2121
import { savedObjectsClientMock } from '../service/saved_objects_client.mock';
2222
import { Readable } from 'stream';
23-
import { createPromiseFromStreams, createConcatStream } from '../../../../legacy/utils/streams';
23+
import { createPromiseFromStreams, createConcatStream } from '../../utils/streams';
2424

2525
async function readStreamToCompletion(stream: Readable) {
2626
return createPromiseFromStreams([stream, createConcatStream([])]);

src/core/server/saved_objects/export/get_sorted_objects_for_export.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
import Boom from 'boom';
21-
import { createListStream } from '../../../../legacy/utils/streams';
21+
import { createListStream } from '../../utils/streams';
2222
import { SavedObjectsClientContract, SavedObject } from '../types';
2323
import { fetchNestedDependencies } from './inject_nested_depdendencies';
2424
import { sortObjects } from './sort_objects';

src/core/server/saved_objects/import/collect_saved_objects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
createFilterStream,
2424
createMapStream,
2525
createPromiseFromStreams,
26-
} from '../../../../legacy/utils/streams';
26+
} from '../../utils/streams';
2727
import { SavedObject } from '../types';
2828
import { createLimitStream } from './create_limit_stream';
2929
import { SavedObjectsImportError } from './types';

src/core/server/saved_objects/import/create_limit_stream.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
createConcatStream,
2222
createListStream,
2323
createPromiseFromStreams,
24-
} from '../../../../legacy/utils/streams';
24+
} from '../../utils/streams';
2525
import { createLimitStream } from './create_limit_stream';
2626

2727
describe('createLimitStream()', () => {

src/core/server/saved_objects/routes/export.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919

2020
import { schema } from '@kbn/config-schema';
2121
import stringify from 'json-stable-stringify';
22-
import {
23-
createPromiseFromStreams,
24-
createMapStream,
25-
createConcatStream,
26-
} from '../../../../legacy/utils/streams';
22+
import { createPromiseFromStreams, createMapStream, createConcatStream } from '../../utils/streams';
2723
import { IRouter } from '../../http';
2824
import { SavedObjectConfig } from '../saved_objects_config';
2925
import { exportSavedObjectsToStream } from '../export';

src/core/server/saved_objects/routes/integration_tests/export.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jest.mock('../../export', () => ({
2222
}));
2323

2424
import * as exportMock from '../../export';
25-
import { createListStream } from '../../../../../legacy/utils/streams';
25+
import { createListStream } from '../../../utils/streams';
2626
import supertest from 'supertest';
2727
import { UnwrapPromise } from '@kbn/utility-types';
2828
import { SavedObjectConfig } from '../../saved_objects_config';

src/core/server/saved_objects/routes/utils.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import { createSavedObjectsStreamFromNdJson, validateTypes, validateObjects } from './utils';
2121
import { Readable } from 'stream';
22-
import { createPromiseFromStreams, createConcatStream } from '../../../../legacy/utils/streams';
22+
import { createPromiseFromStreams, createConcatStream } from '../../utils/streams';
2323

2424
async function readStreamToCompletion(stream: Readable) {
2525
return createPromiseFromStreams([stream, createConcatStream([])]);

src/core/server/saved_objects/routes/utils.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919

2020
import { Readable } from 'stream';
2121
import { SavedObject, SavedObjectsExportResultDetails } from 'src/core/server';
22-
import {
23-
createSplitStream,
24-
createMapStream,
25-
createFilterStream,
26-
} from '../../../../legacy/utils/streams';
22+
import { createSplitStream, createMapStream, createFilterStream } from '../../utils/streams';
2723

2824
export function createSavedObjectsStreamFromNdJson(ndJsonStream: Readable) {
2925
return ndJsonStream

0 commit comments

Comments
 (0)