[7.17] Update dependency lru-cache to ^11.1.0 (main) (#216517) (#216829)

# Backport This will backport the following commits from `main` to `7.17`: - [Update dependency lru-cache to ^11.1.0 (main) (#216517)](https://github.com/elastic/kibana/pull/216517) We also need to cherry-pick some changes from https://github.com/elastic/kibana/pull/206225  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  --------- Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
2025-04-24 01:38:56 -04:00 · 2025-04-05 01:35:25 +02:00 · 2025-04-05 01:35:25 +02:00 · 33930c1dc1
commit 33930c1dc1
parent dbd56632c3
13 changed files with 37 additions and 35 deletions
--- a/package.json
+++ b/package.json
@ -282,7 +282,7 @@
    "load-json-file": "^6.2.0",
    "loader-utils": "^2.0.4",
    "lodash": "^4.17.21",
-    "lru-cache": "^4.1.5",
+    "lru-cache": "^11.1.0",
    "lz-string": "^1.4.4",
    "mapbox-gl-draw-rectangle-mode": "1.0.4",
    "maplibre-gl": "1.15.2",
@ -563,7 +563,6 @@
    "@types/license-checker": "15.0.0",
    "@types/loader-utils": "^2.0.3",
    "@types/lodash": "^4.14.159",
-    "@types/lru-cache": "^5.1.0",
    "@types/lz-string": "^1.3.34",
    "@types/markdown-it": "^12.2.3",
    "@types/md5": "^2.2.0",
--- a/packages/kbn-eslint-import-resolver-kibana/lib/get_path_type.js
+++ b/packages/kbn-eslint-import-resolver-kibana/lib/get_path_type.js
@ -8,11 +8,11 @@

 const { statSync } = require('fs');

-const LRU = require('lru-cache');
+const LRU = require('lru-cache').LRUCache;

 const DIR = Symbol('dir');
 const FILE = Symbol('file');
-const cache = process.env.KIBANA_RESOLVER_HARD_CACHE ? new Map() : new LRU({ maxAge: 1000 });
+const cache = process.env.KIBANA_RESOLVER_HARD_CACHE ? new Map() : new LRU({ ttl: 1000 });

 function getPathType(path) {
  const cached = cache.get(path);
--- a/packages/kbn-optimizer/src/worker/webpack.config.ts
+++ b/packages/kbn-optimizer/src/worker/webpack.config.ts
@ -84,6 +84,7 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
      // or which have require() statements that should be ignored because the file is
      // already bundled with all its necessary depedencies
      noParse: [
+        /[\/\\]node_modules[\/\\]lru-cache[\/\\]dist[\/\\]commonjs[\/\\]index\.js$/,
        /[\/\\]node_modules[\/\\]lodash[\/\\]index\.js$/,
        /[\/\\]node_modules[\/\\]vega[\/\\]build-es5[\/\\]vega\.js$/,
      ],
--- a/packages/kbn-storybook/src/webpack.config.ts
+++ b/packages/kbn-storybook/src/webpack.config.ts
@ -78,7 +78,10 @@ export default function ({ config: storybookConfig }: { config: Configuration })
      // no parse rules for a few known large packages which have no require() statements
      // or which have require() statements that should be ignored because the file is
      // already bundled with all its necessary dependencies
-      noParse: [/[\/\\]node_modules[\/\\]vega[\/\\]build-es5[\/\\]vega\.js$/],
+      noParse: [
+        /[\/\\]node_modules[\/\\]lru-cache[\/\\]dist[\/\\]commonjs[\/\\]index\.js$/,
+        /[\/\\]node_modules[\/\\]vega[\/\\]build-es5[\/\\]vega\.js$/,
+      ],
      rules: [
        {
          test: /\.(html|md|txt|tmpl)$/,
--- a/src/core/server/core_app/bundle_routes/file_hash_cache.ts
+++ b/src/core/server/core_app/bundle_routes/file_hash_cache.ts
@ -6,7 +6,7 @@
 * Side Public License, v 1.
 */

-import LruCache from 'lru-cache';
+import { LRUCache as LruCache } from 'lru-cache';

 /** @internal */
 export interface IFileHashCache {
@ -21,8 +21,8 @@ export interface IFileHashCache {
 export class FileHashCache implements IFileHashCache {
  private lru: LruCache<string, Promise<string>>;

-  constructor(maxSize: number = 250) {
-    this.lru = new LruCache(maxSize);
+  constructor(maxItems: number = 250) {
+    this.lru = new LruCache({ max: maxItems });
  }

  get(key: string) {
@ -34,6 +34,6 @@ export class FileHashCache implements IFileHashCache {
  }

  del(key: string) {
-    this.lru.del(key);
+    this.lru.delete(key);
  }
 }
--- a/src/plugins/telemetry_collection_manager/server/cache/cache_manager.test.ts
+++ b/src/plugins/telemetry_collection_manager/server/cache/cache_manager.test.ts
@ -11,22 +11,16 @@ import { CacheManager } from './cache_manager';
 describe('CacheManager', () => {
  const mockCacheKey = 'mock_key';
  const mockCacheItem = 'cache_item';
-  const cacheDurationMs = 10000;
-  let mockNow: number;
+  const cacheDurationMs = 1000;

-  beforeEach(() => {
-    jest.useFakeTimers();
-    mockNow = jest.getRealSystemTime();
-    jest.setSystemTime(mockNow);
-  });
  afterEach(() => jest.clearAllMocks());
-  afterAll(() => jest.useRealTimers());

-  it('caches object for the cache duration only', () => {
+  it('caches object for the cache duration only', async () => {
    const cacheManager = new CacheManager({ cacheDurationMs });
    cacheManager.setCache(mockCacheKey, mockCacheItem);
    expect(cacheManager.getFromCache(mockCacheKey)).toEqual(mockCacheItem);
-    jest.advanceTimersByTime(cacheDurationMs + 100);
+    // Cannot get `jest.FakeTimers` to work with LRUCache
+    await new Promise((resolve) => setTimeout(resolve, cacheDurationMs + 100));
    expect(cacheManager.getFromCache(mockCacheKey)).toEqual(undefined);
  });

--- a/src/plugins/telemetry_collection_manager/server/cache/cache_manager.ts
+++ b/src/plugins/telemetry_collection_manager/server/cache/cache_manager.ts
@ -6,7 +6,7 @@
 * Side Public License, v 1.
 */

-import LRUCache from 'lru-cache';
+import { LRUCache } from 'lru-cache';

 export interface CacheManagerConfig {
  // cache duration of objects in ms
@ -14,12 +14,12 @@ export interface CacheManagerConfig {
 }

 export class CacheManager {
-  private readonly cache: LRUCache<string, unknown>;
+  private readonly cache: LRUCache<string, {}>;

  constructor({ cacheDurationMs }: CacheManagerConfig) {
    this.cache = new LRUCache({
      max: 1,
-      maxAge: cacheDurationMs,
+      ttl: cacheDurationMs,
    });
  }

@ -27,7 +27,7 @@ export class CacheManager {
   * Cache an object by key
   */
  public setCache = (cacheKey: string, data: unknown): void => {
-    this.cache.set(cacheKey, data);
+    this.cache.set(cacheKey, data as {});
  };

  /**
@ -41,6 +41,6 @@ export class CacheManager {
   * Removes all cached objects
   */
  public resetCache(): void {
-    this.cache.reset();
+    this.cache.clear();
  }
 }
--- a/x-pack/plugins/apm/public/services/rest/callApi.ts
+++ b/x-pack/plugins/apm/public/services/rest/callApi.ts
@ -7,7 +7,7 @@

 import { CoreSetup, CoreStart } from 'kibana/public';
 import { isString, startsWith } from 'lodash';
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import hash from 'object-hash';
 import { enableInspectEsQueries } from '../../../../observability/public';
 import { FetchOptions } from '../../../common/fetch_options';
@ -28,10 +28,10 @@ function fetchOptionsWithDebug(fetchOptions: FetchOptions, inspectableEsQueriesE
  };
 }

-const cache = new LRU<string, any>({ max: 100, maxAge: 1000 * 60 * 60 });
+const cache = new LRU<string, any>({ max: 100, ttl: 1000 * 60 * 60 });

 export function clearCache() {
-  cache.reset();
+  cache.clear();
 }

 export type CallApi = typeof callApi;
--- a/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts
+++ b/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts
@ -6,7 +6,7 @@
 */

 import { uniq } from 'lodash';
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import { MetricsExplorerRequestBody } from '../../../../common/http_api';
 import { getDatasetForField } from './get_dataset_for_field';
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
@ -14,7 +14,7 @@ import { ESSearchClient } from '../../../lib/metrics/types';

 const cache = new LRU({
  max: 100,
-  maxAge: 15 * 60 * 1000,
+  ttl: 15 * 60 * 1000,
 });

 export const findIntervalForMetrics = async (
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
@ -5,7 +5,7 @@
 * 2.0.
 */

-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
 import { Logger } from 'src/core/server';
 import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
@ -72,7 +72,7 @@ export const buildManifestManagerMockOptions = (
 ): ManifestManagerMockOptions => {
  const savedObjectMock = savedObjectsClientMock.create();
  return {
-    cache: new LRU<string, Buffer>({ max: 10, maxAge: 1000 * 60 * 60 }),
+    cache: new LRU<string, Buffer>({ max: 10, ttl: 1000 * 60 * 60 }),
    exceptionListClient: listMock.getExceptionListClient(savedObjectMock),
    packagePolicyService: createPackagePolicyServiceMock(),
    savedObjectsClient: savedObjectMock,
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
@ -7,7 +7,7 @@

 import pMap from 'p-map';
 import semver from 'semver';
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import { isEqual, isEmpty } from 'lodash';
 import { Logger, SavedObjectsClientContract } from 'src/core/server';
 import { ListResult } from '../../../../../../fleet/common';
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@ -6,7 +6,7 @@
 */

 import { Observable } from 'rxjs';
-import LRU from 'lru-cache';
+import { LRUCache as LRU } from 'lru-cache';
 import { estypes } from '@elastic/elasticsearch';

 import { Logger, SavedObjectsClient } from '../../../../src/core/server';
@ -119,7 +119,7 @@ export class Plugin implements ISecuritySolutionPlugin {
    this.appClientFactory = new AppClientFactory();

    // Cache up to three artifacts with a max retention of 5 mins each
-    this.artifactsCache = new LRU<string, Buffer>({ max: 3, maxAge: 1000 * 60 * 5 });
+    this.artifactsCache = new LRU<string, Buffer>({ max: 3, ttl: 1000 * 60 * 5 });
    this.telemetryEventsSender = new TelemetryEventsSender(this.logger);
    this.telemetryReceiver = new TelemetryReceiver(this.logger);

--- a/yarn.lock
+++ b/yarn.lock
@ -18206,7 +18206,7 @@ lru-cache@10.2.0:
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==

-lru-cache@4.1.5, lru-cache@^4.1.5:
+lru-cache@4.1.5:
  version "4.1.5"
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@ -18219,6 +18219,11 @@ lru-cache@^10.2.0:
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==

+lru-cache@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.1.0.tgz#afafb060607108132dbc1cf8ae661afb69486117"
+  integrity sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==
+
 lru-cache@^5.1.1:
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"