@backstage/backend-test-utils 1.5.0-next.0 → 1.5.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @backstage/backend-test-utils
 
+## 1.5.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.10.0-next.2
+  - @backstage/config@1.3.2
+  - @backstage/backend-app-api@1.2.3-next.1
+  - @backstage/plugin-auth-node@0.6.3-next.1
+  - @backstage/backend-plugin-api@1.3.1-next.1
+  - @backstage/errors@1.2.7
+  - @backstage/types@1.2.1
+  - @backstage/plugin-events-node@0.4.11-next.1
+
+## 1.5.0-next.1
+
+### Minor Changes
+
+- c6bc67d: Added Valkey support alongside Redis in backend-defaults cache clients, using the new Keyv Valkey package. Also extended backend-test-utils to support Valkey in tests.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.10.0-next.1
+  - @backstage/backend-app-api@1.2.3-next.1
+  - @backstage/plugin-auth-node@0.6.3-next.1
+  - @backstage/backend-plugin-api@1.3.1-next.1
+  - @backstage/config@1.3.2
+  - @backstage/errors@1.2.7
+  - @backstage/types@1.2.1
+  - @backstage/plugin-events-node@0.4.11-next.1
+
 ## 1.5.0-next.0
 
 ### Minor Changes

package/dist/cache/TestCaches.cjs.js

@@ -5,6 +5,7 @@ var isDockerDisabledForTests = require('../util/isDockerDisabledForTests.cjs.js'
 var memcache = require('./memcache.cjs.js');
 var redis = require('./redis.cjs.js');
 var types = require('./types.cjs.js');
+var valkey = require('./valkey.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -110,6 +111,8 @@ class TestCaches {
         return this.initMemcached(properties);
       case "redis":
         return this.initRedis(properties);
+      case "valkey":
+        return this.initValkey(properties);
       case "memory":
         return {
           store: "memory",
@@ -142,6 +145,16 @@ class TestCaches {
     }
     return await redis.startRedisContainer(properties.dockerImageName);
   }
+  async initValkey(properties) {
+    const envVarName = properties.connectionStringEnvironmentVariableName;
+    if (envVarName) {
+      const connectionString = process.env[envVarName];
+      if (connectionString) {
+        return valkey.connectToExternalValkey(connectionString);
+      }
+    }
+    return await valkey.startValkeyContainer(properties.dockerImageName);
+  }
   async shutdown() {
     const instances = [...this.instanceById.values()];
     this.instanceById.clear();

package/dist/cache/TestCaches.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestCaches.cjs.js","sources":["../../src/cache/TestCaches.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport Keyv from 'keyv';\nimport { isDockerDisabledForTests } from '../util/isDockerDisabledForTests';\nimport { connectToExternalMemcache, startMemcachedContainer } from './memcache';\nimport { connectToExternalRedis, startRedisContainer } from './redis';\nimport { Instance, TestCacheId, TestCacheProperties, allCaches } from './types';\n\n/**\n * Encapsulates the creation of ephemeral test cache instances for use inside\n * unit or integration tests.\n *\n * @public\n */\nexport class TestCaches {\n  private readonly instanceById: Map<string, Instance>;\n  private readonly supportedIds: TestCacheId[];\n  private static defaultIds?: TestCacheId[];\n\n  /**\n   * Creates an empty `TestCaches` instance, and sets up Jest to clean up all of\n   * its acquired resources after all tests finish.\n   *\n   * You typically want to create just a single instance like this at the top of\n   * your test file or `describe` block, and then call `init` many times on that\n   * instance inside the individual tests. Spinning up a \"physical\" cache\n   * instance takes a considerable amount of time, slowing down tests. But\n   * wiping the contents of an instance using `init` is very fast.\n   */\n  static create(options?: {\n    ids?: TestCacheId[];\n    disableDocker?: boolean;\n  }): TestCaches {\n    const ids = options?.ids;\n    const disableDocker = options?.disableDocker ?? isDockerDisabledForTests();\n\n    let testCacheIds: TestCacheId[];\n    if (ids) {\n      testCacheIds = ids;\n    } else if (TestCaches.defaultIds) {\n      testCacheIds = TestCaches.defaultIds;\n    } else {\n      testCacheIds = Object.keys(allCaches) as TestCacheId[];\n    }\n\n    const supportedIds = testCacheIds.filter(id => {\n      const properties = allCaches[id];\n      if (!properties) {\n        return false;\n      }\n      // If the caller has set up the env with an explicit connection string,\n      // we'll assume that this target will work\n      if (\n        properties.connectionStringEnvironmentVariableName &&\n        process.env[properties.connectionStringEnvironmentVariableName]\n      ) {\n        return true;\n      }\n      // If the cache doesn't require docker at all, there's nothing to worry\n      // about\n      if (!properties.dockerImageName) {\n        return true;\n      }\n      // If the cache requires docker, but docker is disabled, we will fail.\n      if (disableDocker) {\n        return false;\n      }\n      return true;\n    });\n\n    const caches = new TestCaches(supportedIds);\n\n    if (supportedIds.length > 0) {\n      afterAll(async () => {\n        await caches.shutdown();\n      });\n    }\n\n    return caches;\n  }\n\n  static setDefaults(options: { ids?: TestCacheId[] }) {\n    TestCaches.defaultIds = options.ids;\n  }\n\n  private constructor(supportedIds: TestCacheId[]) {\n    this.instanceById = new Map();\n    this.supportedIds = supportedIds;\n  }\n\n  supports(id: TestCacheId): boolean {\n    return this.supportedIds.includes(id);\n  }\n\n  eachSupportedId(): [TestCacheId][] {\n    return this.supportedIds.map(id => [id]);\n  }\n\n  /**\n   * Returns a fresh, empty cache for the given driver.\n   *\n   * @param id - The ID of the cache to use, e.g. 'REDIS_7'\n   * @returns Cache connection properties\n   */\n  async init(\n    id: TestCacheId,\n  ): Promise<{ store: string; connection: string; keyv: Keyv }> {\n    const properties = allCaches[id];\n    if (!properties) {\n      const candidates = Object.keys(allCaches).join(', ');\n      throw new Error(\n        `Unknown test cache ${id}, possible values are ${candidates}`,\n      );\n    }\n    if (!this.supportedIds.includes(id)) {\n      const candidates = this.supportedIds.join(', ');\n      throw new Error(\n        `Unsupported test cache ${id} for this environment, possible values are ${candidates}`,\n      );\n    }\n\n    // Ensure that a testcontainers instance is up for this ID\n    let instance: Instance | undefined = this.instanceById.get(id);\n    if (!instance) {\n      instance = await this.initAny(properties);\n      this.instanceById.set(id, instance);\n    }\n\n    // Ensure that it's cleared of data from previous tests\n    await instance.keyv.clear();\n\n    return {\n      store: instance.store,\n      connection: instance.connection,\n      keyv: instance.keyv,\n    };\n  }\n\n  private async initAny(properties: TestCacheProperties): Promise<Instance> {\n    switch (properties.store) {\n      case 'memcache':\n        return this.initMemcached(properties);\n      case 'redis':\n        return this.initRedis(properties);\n      case 'memory':\n        return {\n          store: 'memory',\n          connection: 'memory',\n          keyv: new Keyv(),\n          stop: async () => {},\n        };\n      default:\n        throw new Error(`Unknown cache store '${properties.store}'`);\n    }\n  }\n\n  private async initMemcached(\n    properties: TestCacheProperties,\n  ): Promise<Instance> {\n    // Use the connection string if provided\n    const envVarName = properties.connectionStringEnvironmentVariableName;\n    if (envVarName) {\n      const connectionString = process.env[envVarName];\n      if (connectionString) {\n        return connectToExternalMemcache(connectionString);\n      }\n    }\n\n    return await startMemcachedContainer(properties.dockerImageName!);\n  }\n\n  private async initRedis(properties: TestCacheProperties): Promise<Instance> {\n    // Use the connection string if provided\n    const envVarName = properties.connectionStringEnvironmentVariableName;\n    if (envVarName) {\n      const connectionString = process.env[envVarName];\n      if (connectionString) {\n        return connectToExternalRedis(connectionString);\n      }\n    }\n\n    return await startRedisContainer(properties.dockerImageName!);\n  }\n\n  private async shutdown() {\n    const instances = [...this.instanceById.values()];\n    this.instanceById.clear();\n    await Promise.all(\n      instances.map(({ stop }) =>\n        stop().catch(error => {\n          console.warn(`TestCaches: Failed to stop container`, { error });\n        }),\n      ),\n    );\n  }\n}\n"],"names":["isDockerDisabledForTests","allCaches","Keyv","connectToExternalMemcache","startMemcachedContainer","connectToExternalRedis","startRedisContainer"],"mappings":"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"}
+{"version":3,"file":"TestCaches.cjs.js","sources":["../../src/cache/TestCaches.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport Keyv from 'keyv';\nimport { isDockerDisabledForTests } from '../util/isDockerDisabledForTests';\nimport { connectToExternalMemcache, startMemcachedContainer } from './memcache';\nimport { connectToExternalRedis, startRedisContainer } from './redis';\nimport { Instance, TestCacheId, TestCacheProperties, allCaches } from './types';\nimport { connectToExternalValkey, startValkeyContainer } from './valkey';\n\n/**\n * Encapsulates the creation of ephemeral test cache instances for use inside\n * unit or integration tests.\n *\n * @public\n */\nexport class TestCaches {\n  private readonly instanceById: Map<string, Instance>;\n  private readonly supportedIds: TestCacheId[];\n  private static defaultIds?: TestCacheId[];\n\n  /**\n   * Creates an empty `TestCaches` instance, and sets up Jest to clean up all of\n   * its acquired resources after all tests finish.\n   *\n   * You typically want to create just a single instance like this at the top of\n   * your test file or `describe` block, and then call `init` many times on that\n   * instance inside the individual tests. Spinning up a \"physical\" cache\n   * instance takes a considerable amount of time, slowing down tests. But\n   * wiping the contents of an instance using `init` is very fast.\n   */\n  static create(options?: {\n    ids?: TestCacheId[];\n    disableDocker?: boolean;\n  }): TestCaches {\n    const ids = options?.ids;\n    const disableDocker = options?.disableDocker ?? isDockerDisabledForTests();\n\n    let testCacheIds: TestCacheId[];\n    if (ids) {\n      testCacheIds = ids;\n    } else if (TestCaches.defaultIds) {\n      testCacheIds = TestCaches.defaultIds;\n    } else {\n      testCacheIds = Object.keys(allCaches) as TestCacheId[];\n    }\n\n    const supportedIds = testCacheIds.filter(id => {\n      const properties = allCaches[id];\n      if (!properties) {\n        return false;\n      }\n      // If the caller has set up the env with an explicit connection string,\n      // we'll assume that this target will work\n      if (\n        properties.connectionStringEnvironmentVariableName &&\n        process.env[properties.connectionStringEnvironmentVariableName]\n      ) {\n        return true;\n      }\n      // If the cache doesn't require docker at all, there's nothing to worry\n      // about\n      if (!properties.dockerImageName) {\n        return true;\n      }\n      // If the cache requires docker, but docker is disabled, we will fail.\n      if (disableDocker) {\n        return false;\n      }\n      return true;\n    });\n\n    const caches = new TestCaches(supportedIds);\n\n    if (supportedIds.length > 0) {\n      afterAll(async () => {\n        await caches.shutdown();\n      });\n    }\n\n    return caches;\n  }\n\n  static setDefaults(options: { ids?: TestCacheId[] }) {\n    TestCaches.defaultIds = options.ids;\n  }\n\n  private constructor(supportedIds: TestCacheId[]) {\n    this.instanceById = new Map();\n    this.supportedIds = supportedIds;\n  }\n\n  supports(id: TestCacheId): boolean {\n    return this.supportedIds.includes(id);\n  }\n\n  eachSupportedId(): [TestCacheId][] {\n    return this.supportedIds.map(id => [id]);\n  }\n\n  /**\n   * Returns a fresh, empty cache for the given driver.\n   *\n   * @param id - The ID of the cache to use, e.g. 'REDIS_7'\n   * @returns Cache connection properties\n   */\n  async init(\n    id: TestCacheId,\n  ): Promise<{ store: string; connection: string; keyv: Keyv }> {\n    const properties = allCaches[id];\n    if (!properties) {\n      const candidates = Object.keys(allCaches).join(', ');\n      throw new Error(\n        `Unknown test cache ${id}, possible values are ${candidates}`,\n      );\n    }\n    if (!this.supportedIds.includes(id)) {\n      const candidates = this.supportedIds.join(', ');\n      throw new Error(\n        `Unsupported test cache ${id} for this environment, possible values are ${candidates}`,\n      );\n    }\n\n    // Ensure that a testcontainers instance is up for this ID\n    let instance: Instance | undefined = this.instanceById.get(id);\n    if (!instance) {\n      instance = await this.initAny(properties);\n      this.instanceById.set(id, instance);\n    }\n\n    // Ensure that it's cleared of data from previous tests\n    await instance.keyv.clear();\n\n    return {\n      store: instance.store,\n      connection: instance.connection,\n      keyv: instance.keyv,\n    };\n  }\n\n  private async initAny(properties: TestCacheProperties): Promise<Instance> {\n    switch (properties.store) {\n      case 'memcache':\n        return this.initMemcached(properties);\n      case 'redis':\n        return this.initRedis(properties);\n      case 'valkey':\n        return this.initValkey(properties);\n      case 'memory':\n        return {\n          store: 'memory',\n          connection: 'memory',\n          keyv: new Keyv(),\n          stop: async () => {},\n        };\n      default:\n        throw new Error(`Unknown cache store '${properties.store}'`);\n    }\n  }\n\n  private async initMemcached(\n    properties: TestCacheProperties,\n  ): Promise<Instance> {\n    // Use the connection string if provided\n    const envVarName = properties.connectionStringEnvironmentVariableName;\n    if (envVarName) {\n      const connectionString = process.env[envVarName];\n      if (connectionString) {\n        return connectToExternalMemcache(connectionString);\n      }\n    }\n\n    return await startMemcachedContainer(properties.dockerImageName!);\n  }\n\n  private async initRedis(properties: TestCacheProperties): Promise<Instance> {\n    // Use the connection string if provided\n    const envVarName = properties.connectionStringEnvironmentVariableName;\n    if (envVarName) {\n      const connectionString = process.env[envVarName];\n      if (connectionString) {\n        return connectToExternalRedis(connectionString);\n      }\n    }\n\n    return await startRedisContainer(properties.dockerImageName!);\n  }\n\n  private async initValkey(properties: TestCacheProperties): Promise<Instance> {\n    // Use the connection string if provided\n    const envVarName = properties.connectionStringEnvironmentVariableName;\n    if (envVarName) {\n      const connectionString = process.env[envVarName];\n      if (connectionString) {\n        return connectToExternalValkey(connectionString);\n      }\n    }\n\n    return await startValkeyContainer(properties.dockerImageName!);\n  }\n\n  private async shutdown() {\n    const instances = [...this.instanceById.values()];\n    this.instanceById.clear();\n    await Promise.all(\n      instances.map(({ stop }) =>\n        stop().catch(error => {\n          console.warn(`TestCaches: Failed to stop container`, { error });\n        }),\n      ),\n    );\n  }\n}\n"],"names":["isDockerDisabledForTests","allCaches","Keyv","connectToExternalMemcache","startMemcachedContainer","connectToExternalRedis","startRedisContainer","connectToExternalValkey","startValkeyContainer"],"mappings":"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"}

package/dist/cache/types.cjs.js

@@ -18,6 +18,12 @@ const allCaches = Object.freeze({
   MEMORY: {
     name: "In-memory",
     store: "memory"
+  },
+  VALKEY_8: {
+    name: "Valkey 8.x",
+    store: "valkey",
+    dockerImageName: getDockerImageForName.getDockerImageForName("valkey/valkey:8"),
+    connectionStringEnvironmentVariableName: "BACKSTAGE_TEST_CACHE_VALKEY8_CONNECTION_STRING"
   }
 });
 

package/dist/cache/types.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs.js","sources":["../../src/cache/types.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport Keyv from 'keyv';\nimport { getDockerImageForName } from '../util/getDockerImageForName';\n\n/**\n * The possible caches to test against.\n *\n * @public\n */\nexport type TestCacheId = 'MEMORY' | 'REDIS_7' | 'MEMCACHED_1';\n\nexport type TestCacheProperties = {\n  name: string;\n  store: string;\n  dockerImageName?: string;\n  connectionStringEnvironmentVariableName?: string;\n};\n\nexport type Instance = {\n  store: string;\n  connection: string;\n  keyv: Keyv;\n  stop: () => Promise<void>;\n};\n\nexport const allCaches: Record<TestCacheId, TestCacheProperties> =\n  Object.freeze({\n    REDIS_7: {\n      name: 'Redis 7.x',\n      store: 'redis',\n      dockerImageName: getDockerImageForName('redis:7'),\n      connectionStringEnvironmentVariableName:\n        'BACKSTAGE_TEST_CACHE_REDIS7_CONNECTION_STRING',\n    },\n    MEMCACHED_1: {\n      name: 'Memcached 1.x',\n      store: 'memcache',\n      dockerImageName: getDockerImageForName('memcached:1'),\n      connectionStringEnvironmentVariableName:\n        'BACKSTAGE_TEST_CACHE_MEMCACHED1_CONNECTION_STRING',\n    },\n    MEMORY: {\n      name: 'In-memory',\n      store: 'memory',\n    },\n  });\n"],"names":["getDockerImageForName"],"mappings":";;;;AAwCa,MAAA,SAAA,GACX,OAAO,MAAO,CAAA;AAAA,EACZ,OAAS,EAAA;AAAA,IACP,IAAM,EAAA,WAAA;AAAA,IACN,KAAO,EAAA,OAAA;AAAA,IACP,eAAA,EAAiBA,4CAAsB,SAAS,CAAA;AAAA,IAChD,uCACE,EAAA;AAAA,GACJ;AAAA,EACA,WAAa,EAAA;AAAA,IACX,IAAM,EAAA,eAAA;AAAA,IACN,KAAO,EAAA,UAAA;AAAA,IACP,eAAA,EAAiBA,4CAAsB,aAAa,CAAA;AAAA,IACpD,uCACE,EAAA;AAAA,GACJ;AAAA,EACA,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA,WAAA;AAAA,IACN,KAAO,EAAA;AAAA;AAEX,CAAC;;;;"}
+{"version":3,"file":"types.cjs.js","sources":["../../src/cache/types.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport Keyv from 'keyv';\nimport { getDockerImageForName } from '../util/getDockerImageForName';\n\n/**\n * The possible caches to test against.\n *\n * @public\n */\nexport type TestCacheId = 'MEMORY' | 'REDIS_7' | 'VALKEY_8' | 'MEMCACHED_1';\n\nexport type TestCacheProperties = {\n  name: string;\n  store: string;\n  dockerImageName?: string;\n  connectionStringEnvironmentVariableName?: string;\n};\n\nexport type Instance = {\n  store: string;\n  connection: string;\n  keyv: Keyv;\n  stop: () => Promise<void>;\n};\n\nexport const allCaches: Record<TestCacheId, TestCacheProperties> =\n  Object.freeze({\n    REDIS_7: {\n      name: 'Redis 7.x',\n      store: 'redis',\n      dockerImageName: getDockerImageForName('redis:7'),\n      connectionStringEnvironmentVariableName:\n        'BACKSTAGE_TEST_CACHE_REDIS7_CONNECTION_STRING',\n    },\n    MEMCACHED_1: {\n      name: 'Memcached 1.x',\n      store: 'memcache',\n      dockerImageName: getDockerImageForName('memcached:1'),\n      connectionStringEnvironmentVariableName:\n        'BACKSTAGE_TEST_CACHE_MEMCACHED1_CONNECTION_STRING',\n    },\n    MEMORY: {\n      name: 'In-memory',\n      store: 'memory',\n    },\n    VALKEY_8: {\n      name: 'Valkey 8.x',\n      store: 'valkey',\n      dockerImageName: getDockerImageForName('valkey/valkey:8'),\n      connectionStringEnvironmentVariableName:\n        'BACKSTAGE_TEST_CACHE_VALKEY8_CONNECTION_STRING',\n    },\n  });\n"],"names":["getDockerImageForName"],"mappings":";;;;AAwCa,MAAA,SAAA,GACX,OAAO,MAAO,CAAA;AAAA,EACZ,OAAS,EAAA;AAAA,IACP,IAAM,EAAA,WAAA;AAAA,IACN,KAAO,EAAA,OAAA;AAAA,IACP,eAAA,EAAiBA,4CAAsB,SAAS,CAAA;AAAA,IAChD,uCACE,EAAA;AAAA,GACJ;AAAA,EACA,WAAa,EAAA;AAAA,IACX,IAAM,EAAA,eAAA;AAAA,IACN,KAAO,EAAA,UAAA;AAAA,IACP,eAAA,EAAiBA,4CAAsB,aAAa,CAAA;AAAA,IACpD,uCACE,EAAA;AAAA,GACJ;AAAA,EACA,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA,WAAA;AAAA,IACN,KAAO,EAAA;AAAA,GACT;AAAA,EACA,QAAU,EAAA;AAAA,IACR,IAAM,EAAA,YAAA;AAAA,IACN,KAAO,EAAA,QAAA;AAAA,IACP,eAAA,EAAiBA,4CAAsB,iBAAiB,CAAA;AAAA,IACxD,uCACE,EAAA;AAAA;AAEN,CAAC;;;;"}

package/dist/cache/valkey.cjs.js

@@ -0,0 +1,62 @@
+'use strict';
+
+var Keyv = require('keyv');
+var KeyvValkey = require('@keyv/valkey');
+var uuid = require('uuid');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var Keyv__default = /*#__PURE__*/_interopDefaultCompat(Keyv);
+var KeyvValkey__default = /*#__PURE__*/_interopDefaultCompat(KeyvValkey);
+
+async function attemptValkeyConnection(connection) {
+  const startTime = Date.now();
+  for (; ; ) {
+    try {
+      const store = new KeyvValkey__default.default(connection);
+      const keyv = new Keyv__default.default({ store });
+      const value = uuid.v4();
+      await keyv.set("test", value);
+      if (await keyv.get("test") === value) {
+        return keyv;
+      }
+    } catch (e) {
+      if (Date.now() - startTime > 3e4) {
+        throw new Error(
+          `Timed out waiting for valkey to be ready for connections, ${e}`
+        );
+      }
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+}
+async function connectToExternalValkey(connection) {
+  const keyv = await attemptValkeyConnection(connection);
+  return {
+    store: "valkey",
+    connection,
+    keyv,
+    stop: async () => await keyv.disconnect()
+  };
+}
+async function startValkeyContainer(image) {
+  const { GenericContainer } = require("testcontainers");
+  const container = await new GenericContainer(image).withExposedPorts(6379).start();
+  const host = container.getHost();
+  const port = container.getMappedPort(6379);
+  const connection = `redis://${host}:${port}`;
+  const keyv = await attemptValkeyConnection(connection);
+  return {
+    store: "valkey",
+    connection,
+    keyv,
+    stop: async () => {
+      await keyv.disconnect();
+      await container.stop({ timeout: 1e4 });
+    }
+  };
+}
+
+exports.connectToExternalValkey = connectToExternalValkey;
+exports.startValkeyContainer = startValkeyContainer;
+//# sourceMappingURL=valkey.cjs.js.map

package/dist/cache/valkey.cjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"valkey.cjs.js","sources":["../../src/cache/valkey.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport Keyv from 'keyv';\nimport KeyvValkey from '@keyv/valkey';\nimport { v4 as uuid } from 'uuid';\nimport { Instance } from './types';\n\nasync function attemptValkeyConnection(connection: string): Promise<Keyv> {\n  const startTime = Date.now();\n\n  for (;;) {\n    try {\n      const store = new KeyvValkey(connection);\n      const keyv = new Keyv({ store });\n      const value = uuid();\n      await keyv.set('test', value);\n      if ((await keyv.get('test')) === value) {\n        return keyv;\n      }\n    } catch (e) {\n      if (Date.now() - startTime > 30_000) {\n        throw new Error(\n          `Timed out waiting for valkey to be ready for connections, ${e}`,\n        );\n      }\n    }\n\n    await new Promise(resolve => setTimeout(resolve, 100));\n  }\n}\n\nexport async function connectToExternalValkey(\n  connection: string,\n): Promise<Instance> {\n  const keyv = await attemptValkeyConnection(connection);\n  return {\n    store: 'valkey',\n    connection,\n    keyv,\n    stop: async () => await keyv.disconnect(),\n  };\n}\n\nexport async function startValkeyContainer(image: string): Promise<Instance> {\n  // Lazy-load to avoid side-effect of importing testcontainers\n  const { GenericContainer } =\n    require('testcontainers') as typeof import('testcontainers');\n\n  const container = await new GenericContainer(image)\n    .withExposedPorts(6379)\n    .start();\n\n  const host = container.getHost();\n  const port = container.getMappedPort(6379);\n  const connection = `redis://${host}:${port}`;\n\n  const keyv = await attemptValkeyConnection(connection);\n\n  return {\n    store: 'valkey',\n    connection,\n    keyv,\n    stop: async () => {\n      await keyv.disconnect();\n      await container.stop({ timeout: 10_000 });\n    },\n  };\n}\n"],"names":["KeyvValkey","Keyv","uuid"],"mappings":";;;;;;;;;;;AAqBA,eAAe,wBAAwB,UAAmC,EAAA;AACxE,EAAM,MAAA,SAAA,GAAY,KAAK,GAAI,EAAA;AAE3B,EAAS,WAAA;AACP,IAAI,IAAA;AACF,MAAM,MAAA,KAAA,GAAQ,IAAIA,2BAAA,CAAW,UAAU,CAAA;AACvC,MAAA,MAAM,IAAO,GAAA,IAAIC,qBAAK,CAAA,EAAE,OAAO,CAAA;AAC/B,MAAA,MAAM,QAAQC,OAAK,EAAA;AACnB,MAAM,MAAA,IAAA,CAAK,GAAI,CAAA,MAAA,EAAQ,KAAK,CAAA;AAC5B,MAAA,IAAK,MAAM,IAAA,CAAK,GAAI,CAAA,MAAM,MAAO,KAAO,EAAA;AACtC,QAAO,OAAA,IAAA;AAAA;AACT,aACO,CAAG,EAAA;AACV,MAAA,IAAI,IAAK,CAAA,GAAA,EAAQ,GAAA,SAAA,GAAY,GAAQ,EAAA;AACnC,QAAA,MAAM,IAAI,KAAA;AAAA,UACR,6DAA6D,CAAC,CAAA;AAAA,SAChE;AAAA;AACF;AAGF,IAAA,MAAM,IAAI,OAAQ,CAAA,CAAA,OAAA,KAAW,UAAW,CAAA,OAAA,EAAS,GAAG,CAAC,CAAA;AAAA;AAEzD;AAEA,eAAsB,wBACpB,UACmB,EAAA;AACnB,EAAM,MAAA,IAAA,GAAO,MAAM,uBAAA,CAAwB,UAAU,CAAA;AACrD,EAAO,OAAA;AAAA,IACL,KAAO,EAAA,QAAA;AAAA,IACP,UAAA;AAAA,IACA,IAAA;AAAA,IACA,IAAM,EAAA,YAAY,MAAM,IAAA,CAAK,UAAW;AAAA,GAC1C;AACF;AAEA,eAAsB,qBAAqB,KAAkC,EAAA;AAE3E,EAAA,MAAM,EAAE,gBAAA,EACN,GAAA,OAAA,CAAQ,gBAAgB,CAAA;AAE1B,EAAM,MAAA,SAAA,GAAY,MAAM,IAAI,gBAAA,CAAiB,KAAK,CAC/C,CAAA,gBAAA,CAAiB,IAAI,CAAA,CACrB,KAAM,EAAA;AAET,EAAM,MAAA,IAAA,GAAO,UAAU,OAAQ,EAAA;AAC/B,EAAM,MAAA,IAAA,GAAO,SAAU,CAAA,aAAA,CAAc,IAAI,CAAA;AACzC,EAAA,MAAM,UAAa,GAAA,CAAA,QAAA,EAAW,IAAI,CAAA,CAAA,EAAI,IAAI,CAAA,CAAA;AAE1C,EAAM,MAAA,IAAA,GAAO,MAAM,uBAAA,CAAwB,UAAU,CAAA;AAErD,EAAO,OAAA;AAAA,IACL,KAAO,EAAA,QAAA;AAAA,IACP,UAAA;AAAA,IACA,IAAA;AAAA,IACA,MAAM,YAAY;AAChB,MAAA,MAAM,KAAK,UAAW,EAAA;AACtB,MAAA,MAAM,SAAU,CAAA,IAAA,CAAK,EAAE,OAAA,EAAS,KAAQ,CAAA;AAAA;AAC1C,GACF;AACF;;;;;"}

package/dist/index.d.ts

@@ -15,7 +15,7 @@ import * as express_serve_static_core from 'express-serve-static-core';
  *
  * @public
  */
-type TestCacheId = 'MEMORY' | 'REDIS_7' | 'MEMCACHED_1';
+type TestCacheId = 'MEMORY' | 'REDIS_7' | 'VALKEY_8' | 'MEMCACHED_1';
 
 /**
  * Encapsulates the creation of ephemeral test cache instances for use inside
@@ -61,6 +61,7 @@ declare class TestCaches {
     private initAny;
     private initMemcached;
     private initRedis;
+    private initValkey;
     private shutdown;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-test-utils",
-  "version": "1.5.0-next.0",
+  "version": "1.5.0-next.2",
   "description": "Test helpers library for Backstage backends",
   "backstage": {
     "role": "node-library"
@@ -49,16 +49,17 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-app-api": "1.2.3-next.0",
-    "@backstage/backend-defaults": "0.9.1-next.0",
-    "@backstage/backend-plugin-api": "1.3.1-next.0",
+    "@backstage/backend-app-api": "1.2.3-next.1",
+    "@backstage/backend-defaults": "0.10.0-next.2",
+    "@backstage/backend-plugin-api": "1.3.1-next.1",
     "@backstage/config": "1.3.2",
     "@backstage/errors": "1.2.7",
-    "@backstage/plugin-auth-node": "0.6.3-next.0",
-    "@backstage/plugin-events-node": "0.4.11-next.0",
+    "@backstage/plugin-auth-node": "0.6.3-next.1",
+    "@backstage/plugin-events-node": "0.4.11-next.1",
     "@backstage/types": "1.2.1",
     "@keyv/memcache": "^2.0.1",
     "@keyv/redis": "^4.0.1",
+    "@keyv/valkey": "^1.0.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
     "@types/keyv": "^4.2.0",
@@ -78,7 +79,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "0.32.1-next.0",
+    "@backstage/cli": "0.32.1-next.2",
     "@types/jest": "*",
     "@types/supertest": "^2.0.8",
     "supertest": "^7.0.0"