chore(NA): upgrades uuid to v9.0.0 (#149135)

This PR upgrades uuid into its latest version `9.0.0`. The previous default used version `v4` was kept where it was previously used and places using `v1` or `v5` are still using it. In this latest version they removed the deep import feature and as we are not using tree shaking it increased our bundles by a significant size. As such, I've moved this dependency into the `ui-shared-deps-npm` bundle. Co-authored-by: kibanamachine <[email protected]>
elastic · Jan 19, 2023 · e38350f · e38350f
1 parent 195c8b0
commit e38350f
Show file tree

Hide file tree

Showing 361 changed files with 1,111 additions and 1,123 deletions.
diff --git a/examples/controls_example/public/search_example.tsx b/examples/controls_example/public/search_example.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { useEffect, useState } from 'react';
-import uuid from 'uuid/v4';
+import { v4 as uuidv4 } from 'uuid';
 import { lastValueFrom } from 'rxjs';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { DataView } from '@kbn/data-views-plugin/public';
@@ -74,7 +74,7 @@ export const SearchExample = ({ data, dataView, navigation }: Props) => {
       const { rawResponse: resp } = await lastValueFrom(
         searchSource.fetch$({
           abortSignal: abortController.signal,
-          sessionId: uuid(),
+          sessionId: uuidv4(),
           legacyHitsTotal: false,
         })
       );

diff --git a/examples/search_examples/server/fibonacci_strategy.ts b/examples/search_examples/server/fibonacci_strategy.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { ISearchStrategy } from '@kbn/data-plugin/server';
 import { FibonacciRequest, FibonacciResponse } from '../common/types';
 
@@ -17,7 +17,7 @@ export const fibonacciStrategyProvider = (): ISearchStrategy<
   const responseMap = new Map<string, [number[], number, number]>();
   return {
     search: (request: FibonacciRequest) => {
-      const id = request.id ?? uuid();
+      const id = request.id ?? uuidv4();
       const [sequence, total, started] = responseMap.get(id) ?? [
         [],
         request.params?.n ?? 0,

diff --git a/package.json b/package.json
@@ -697,7 +697,7 @@
     "use-resize-observer": "^6.0.0",
     "usng.js": "^0.4.5",
     "utility-types": "^3.10.0",
-    "uuid": "3.3.2",
+    "uuid": "9.0.0",
     "vega": "^5.22.1",
     "vega-interpreter": "^1.0.4",
     "vega-lite": "^5.5.0",
@@ -992,7 +992,7 @@
     "@types/tough-cookie": "^4.0.2",
     "@types/type-detect": "^4.0.1",
     "@types/use-resize-observer": "^6.0.0",
-    "@types/uuid": "^3.4.4",
+    "@types/uuid": "^9.0.0",
     "@types/vinyl": "^2.0.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/watchpack": "^1.1.5",

diff --git a/packages/core/environment/core-environment-server-internal/src/resolve_uuid.ts b/packages/core/environment/core-environment-server-internal/src/resolve_uuid.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { join } from 'path';
 import { PathConfigType } from '@kbn/utils';
 import type { Logger } from '@kbn/logging';
@@ -52,7 +52,7 @@ export async function resolveInstanceUuid({
     }
   }
   if (uuidFromFile === undefined) {
-    const newUuid = uuid.v4();
+    const newUuid = uuidv4();
     // no uuid either in config or file, we need to generate and write it.
     logger.debug(`Setting new Kibana instance UUID: ${newUuid}`);
     await writeUuidToFile(uuidFilePath, newUuid);

diff --git a/packages/core/http/core-http-router-server-internal/src/request.ts b/packages/core/http/core-http-router-server-internal/src/request.ts
@@ -7,7 +7,7 @@
  */
 
 import { URL } from 'url';
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import type { Request, RouteOptions } from '@hapi/hapi';
 import { fromEvent, NEVER } from 'rxjs';
 import { shareReplay, first, filter } from 'rxjs/operators';
@@ -131,8 +131,8 @@ export class CoreKibanaRequest<
     // KibanaRequest in conjunction with scoped Elasticsearch and SavedObjectsClient in order to pass credentials.
     // In these cases, the ids default to a newly generated UUID.
     const appState = request.app as KibanaRequestState | undefined;
-    this.id = appState?.requestId ?? uuid.v4();
-    this.uuid = appState?.requestUuid ?? uuid.v4();
+    this.id = appState?.requestId ?? uuidv4();
+    this.uuid = appState?.requestUuid ?? uuidv4();
     this.rewrittenUrl = appState?.rewrittenUrl;
 
     this.url = request.url ?? new URL('https://fake-request/url');

diff --git a/packages/core/http/core-http-server-internal/src/http_config.test.ts b/packages/core/http/core-http-server-internal/src/http_config.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { config, HttpConfig } from './http_config';
 import { cspConfig } from './csp';
 import { ExternalUrlConfig } from './external_url';
@@ -245,7 +245,7 @@ describe('publicBaseUrl', () => {
 
 test('accepts only valid uuids for server.uuid', () => {
   const httpSchema = config.schema;
-  expect(() => httpSchema.validate({ uuid: uuid.v4() })).not.toThrow();
+  expect(() => httpSchema.validate({ uuid: uuidv4() })).not.toThrow();
   expect(() => httpSchema.validate({ uuid: 'not an uuid' })).toThrowErrorMatchingInlineSnapshot(
     `"[uuid]: must be a valid uuid"`
   );

diff --git a/packages/core/http/core-http-server-internal/src/http_server.ts b/packages/core/http/core-http-server-internal/src/http_server.ts
@@ -9,7 +9,7 @@
 import { Server, Request } from '@hapi/hapi';
 import HapiStaticFiles from '@hapi/inert';
 import url from 'url';
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import {
   createServer,
   getListenerOptions,
@@ -365,7 +365,7 @@ export class HttpServer {
       request.app = {
         ...(request.app ?? {}),
         requestId,
-        requestUuid: uuid.v4(),
+        requestUuid: uuidv4(),
         // Kibana stores trace.id until https://github.com/elastic/apm-agent-nodejs/issues/2353 is resolved
         // The current implementation of the APM agent ends a request transaction before "response" log is emitted.
         traceId: apm.currentTraceIds['trace.id'],

diff --git a/.../saved-objects/core-saved-objects-migration-server-internal/src/core/document_migrator.ts b/.../saved-objects/core-saved-objects-migration-server-internal/src/core/document_migrator.ts
@@ -42,7 +42,7 @@
  */
 
 import Boom from '@hapi/boom';
-import uuidv5 from 'uuid/v5';
+import { v5 as uuidv5 } from 'uuid';
 import { set } from '@kbn/safer-lodash-set';
 import _ from 'lodash';
 import Semver from 'semver';

diff --git a/...s/core/saved-objects/core-saved-objects-utils-server/src/saved_objects_utils.test.mock.ts b/...s/core/saved-objects/core-saved-objects-utils-server/src/saved_objects_utils.test.mock.ts
@@ -7,10 +7,12 @@
  */
 
 const mockUuidv1 = jest.fn().mockReturnValue('uuidv1');
-jest.mock('uuid/v1', () => mockUuidv1);
-
 const mockUuidv5 = jest.fn().mockReturnValue('uuidv5');
 Object.defineProperty(mockUuidv5, 'DNS', { value: 'DNSUUID', writable: false });
-jest.mock('uuid/v5', () => mockUuidv5);
+
+jest.mock('uuid', () => ({
+  v1: mockUuidv1,
+  v5: mockUuidv5,
+}));
 
 export { mockUuidv1, mockUuidv5 };
diff --git a/packages/core/saved-objects/core-saved-objects-utils-server/src/saved_objects_utils.ts b/packages/core/saved-objects/core-saved-objects-utils-server/src/saved_objects_utils.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import uuidv1 from 'uuid/v1';
-import uuidv5 from 'uuid/v5';
+import { v1 as uuidv1, v5 as uuidv5 } from 'uuid';
 import type {
   SavedObjectsFindOptions,
   SavedObjectsFindResponse,

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -147,6 +147,6 @@ pageLoadAssetSize:
   visTypeTimeseries: 55203
   visTypeVega: 153573
   visTypeVislib: 242838
-  visTypeXy: 31800
+  visTypeXy: 46868
   visualizations: 90000
   watcher: 43598
diff --git a/packages/kbn-securitysolution-io-ts-alerting-types/src/default_uuid/index.ts b/packages/kbn-securitysolution-io-ts-alerting-types/src/default_uuid/index.ts
@@ -8,18 +8,18 @@
 
 import * as t from 'io-ts';
 import { Either } from 'fp-ts/lib/Either';
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { NonEmptyString } from '@kbn/securitysolution-io-ts-types';
 
 /**
  * Types the DefaultUuid as:
- *   - If null or undefined, then a default string uuid.v4() will be
+ *   - If null or undefined, then a default string uuidv4() will be
  *     created otherwise it will be checked just against an empty string
  */
 export const DefaultUuid = new t.Type<string, string | undefined, unknown>(
   'DefaultUuid',
   t.string.is,
   (input, context): Either<t.Errors, string> =>
-    input == null ? t.success(uuid.v4()) : NonEmptyString.validate(input, context),
+    input == null ? t.success(uuidv4()) : NonEmptyString.validate(input, context),
   t.identity
 );
diff --git a/packages/kbn-securitysolution-io-ts-types/src/default_uuid/index.ts b/packages/kbn-securitysolution-io-ts-types/src/default_uuid/index.ts
@@ -8,18 +8,18 @@
 
 import * as t from 'io-ts';
 import { Either } from 'fp-ts/lib/Either';
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { NonEmptyString } from '../non_empty_string';
 
 /**
  * Types the DefaultUuid as:
- *   - If null or undefined, then a default string uuid.v4() will be
+ *   - If null or undefined, then a default string uuidv4() will be
  *     created otherwise it will be checked just against an empty string
  */
 export const DefaultUuid = new t.Type<string, string | undefined, unknown>(
   'DefaultUuid',
   t.string.is,
   (input, context): Either<t.Errors, string> =>
-    input == null ? t.success(uuid.v4()) : NonEmptyString.validate(input, context),
+    input == null ? t.success(uuidv4()) : NonEmptyString.validate(input, context),
   t.identity
 );
diff --git a/packages/kbn-securitysolution-list-utils/src/helpers/index.ts b/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { addIdToItem, removeIdFromItem } from '@kbn/securitysolution-utils';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import {
@@ -159,7 +159,7 @@ export const getNewExceptionItem = ({
     item_id: undefined,
     list_id: listId,
     meta: {
-      temporaryUuid: uuid.v4(),
+      temporaryUuid: uuidv4(),
     },
     name,
     namespace_type: namespaceType,
@@ -897,7 +897,7 @@ export const getFormattedBuilderEntries = (
 
 export const getDefaultEmptyEntry = (): EmptyEntry => ({
   field: '',
-  id: uuid.v4(),
+  id: uuidv4(),
   operator: OperatorEnum.INCLUDED,
   type: OperatorTypeEnum.MATCH,
   value: '',
@@ -906,7 +906,7 @@ export const getDefaultEmptyEntry = (): EmptyEntry => ({
 export const getDefaultNestedEmptyEntry = (): EmptyNestedEntry => ({
   entries: [],
   field: '',
-  id: uuid.v4(),
+  id: uuidv4(),
   type: OperatorTypeEnum.NESTED,
 });
 

diff --git a/packages/kbn-securitysolution-utils/src/add_remove_id_to_item/index.ts b/packages/kbn-securitysolution-utils/src/add_remove_id_to_item/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 
 /**
  * This is useful for when you have arrays without an ID and need to add one for
@@ -23,7 +23,7 @@ export const addIdToItem = <T>(item: NotArray<T>): T => {
   if (maybeId.id != null) {
     return item;
   } else {
-    return { ...item, id: uuid.v4() };
+    return { ...item, id: uuidv4() };
   }
 };
 

diff --git a/packages/kbn-server-http-tools/src/get_request_id.ts b/packages/kbn-server-http-tools/src/get_request_id.ts
@@ -7,7 +7,7 @@
  */
 
 import { Request } from '@hapi/hapi';
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 
 export function getRequestId(
   request: Request,
@@ -17,6 +17,6 @@ export function getRequestId(
   return allowFromAnyIp ||
     // socket may be undefined in integration tests that connect via the http listener directly
     (remoteAddress && ipAllowlist.includes(remoteAddress))
-    ? request.headers['x-opaque-id'] ?? uuid.v4()
-    : uuid.v4();
+    ? request.headers['x-opaque-id'] ?? uuidv4()
+    : uuidv4();
 }
diff --git a/packages/kbn-test/src/es/test_es_cluster.ts b/packages/kbn-test/src/es/test_es_cluster.ts
@@ -9,7 +9,7 @@
 import Path from 'path';
 import { format } from 'url';
 import del from 'del';
-import Uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import globby from 'globby';
 import createArchiver from 'archiver';
 import Fs from 'fs';
@@ -307,7 +307,7 @@ export function createTestEsCluster<
         return;
       }
 
-      const uuid = Uuid.v4();
+      const uuid = uuidv4();
       const debugPath = Path.resolve(REPO_ROOT, `data/es_debug_${uuid}.tar.gz`);
       log.error(`[es] debug files found, archiving install to ${debugPath}`);
       const archiver = createArchiver('tar', { gzip: true });

diff --git a/packages/kbn-test/src/functional_tests/lib/run_kibana_server.ts b/packages/kbn-test/src/functional_tests/lib/run_kibana_server.ts
@@ -9,7 +9,7 @@
 import Path from 'path';
 import Os from 'os';
 
-import Uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import type { ProcRunner } from '@kbn/dev-proc-runner';
 import { REPO_ROOT } from '@kbn/repo-info';
 
@@ -98,7 +98,7 @@ export async function runKibanaServer(options: {
             ? []
             : [
                 '--node.roles=["ui"]',
-                `--path.data=${Path.resolve(Os.tmpdir(), `ftr-ui-${Uuid.v4()}`)}`,
+                `--path.data=${Path.resolve(Os.tmpdir(), `ftr-ui-${uuidv4()}`)}`,
               ]),
         ]),
       ],
@@ -121,7 +121,7 @@ export async function runKibanaServer(options: {
             ...kbnFlags,
             `--server.port=${DedicatedTaskRunner.getPort(config.get('servers.kibana.port'))}`,
             '--node.roles=["background_tasks"]',
-            `--path.data=${Path.resolve(Os.tmpdir(), `ftr-task-runner-${Uuid.v4()}`)}`,
+            `--path.data=${Path.resolve(Os.tmpdir(), `ftr-task-runner-${uuidv4()}`)}`,
             ...(typeof mainUuid === 'string' && mainUuid
               ? [`--server.uuid=${DedicatedTaskRunner.getUuid(mainUuid)}`]
               : []),

diff --git a/packages/kbn-ui-shared-deps-npm/BUILD.bazel b/packages/kbn-ui-shared-deps-npm/BUILD.bazel
@@ -57,6 +57,7 @@ RUNTIME_DEPS = [
   "@npm//rxjs",
   "@npm//styled-components",
   "@npm//tslib",
+  "@npm//uuid",
 ]
 
 webpack_cli(

diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -105,6 +105,7 @@ module.exports = (_, argv) => {
         'rxjs/operators',
         'styled-components',
         'tslib',
+        'uuid',
       ],
       'kbn-ui-shared-deps-npm.v8.dark': ['@elastic/eui/dist/eui_theme_dark.css'],
       'kbn-ui-shared-deps-npm.v8.light': ['@elastic/eui/dist/eui_theme_light.css'],

diff --git a/packages/kbn-ui-shared-deps-src/src/definitions.js b/packages/kbn-ui-shared-deps-src/src/definitions.js
@@ -79,6 +79,7 @@ const externals = {
    * runtime deps which don't need to be copied across all bundles
    */
   tslib: '__kbnSharedDeps__.TsLib',
+  uuid: '__kbnSharedDeps__.Uuid',
   '@kbn/analytics': '__kbnSharedDeps__.KbnAnalytics',
   '@kbn/es-query': '__kbnSharedDeps__.KbnEsQuery',
   '@kbn/std': '__kbnSharedDeps__.KbnStd',

diff --git a/packages/kbn-ui-shared-deps-src/src/entry.js b/packages/kbn-ui-shared-deps-src/src/entry.js
@@ -53,6 +53,7 @@ export const Fflate = { unzlibSync, strFromU8 };
 
 // runtime deps which don't need to be copied across all bundles
 export const TsLib = require('tslib');
+export const Uuid = require('uuid');
 export const KbnAnalytics = require('@kbn/analytics');
 export const KbnEsQuery = require('@kbn/es-query');
 export const KbnStd = require('@kbn/std');

diff --git a/src/core/server/integration_tests/saved_objects/routes/import.test.ts b/src/core/server/integration_tests/saved_objects/routes/import.test.ts
@@ -491,8 +491,8 @@ describe(`POST ${URL}`, () => {
       const mockUuid = jest.requireMock('uuid');
       mockUuid.v4 = jest
         .fn()
-        .mockReturnValueOnce('foo') // a uuid.v4() is generated for the request.id
-        .mockReturnValueOnce('foo') // another uuid.v4() is used for the request.uuid
+        .mockReturnValueOnce('foo') // a uuidv4() is generated for the request.id
+        .mockReturnValueOnce('foo') // another uuidv4() is used for the request.uuid
         .mockReturnValueOnce('new-id-1')
         .mockReturnValueOnce('new-id-2');
       savedObjectsClient.bulkGet.mockResolvedValueOnce({ saved_objects: [mockIndexPattern] });

diff --git a/src/plugins/console/common/constants/variables.ts b/src/plugins/console/common/constants/variables.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 
 export const DEFAULT_VARIABLES = [
-  { id: uuid.v4(), name: 'exampleVariable1', value: '_search' },
-  { id: uuid.v4(), name: 'exampleVariable2', value: 'match_all' },
+  { id: uuidv4(), name: 'exampleVariable1', value: '_search' },
+  { id: uuidv4(), name: 'exampleVariable2', value: 'match_all' },
 ];