Add ttl and tests for ttl (#160)

Author: Claimundefine

schemaregistry/rules/encryption/dekregistry/dekregistry-client.ts

@@ -66,7 +66,7 @@ class DekRegistryClient implements DekClient {
   constructor(config: ClientConfig) {
     const cacheOptions = {
       max: config.cacheCapacity !== undefined ? config.cacheCapacity : 1000,
-      ...(config.cacheLatestTtlSecs !== undefined && { maxAge: config.cacheLatestTtlSecs * 1000 }),
+      ...(config.cacheLatestTtlSecs !== undefined && { ttl: config.cacheLatestTtlSecs * 1000 }),
     };
 
 

schemaregistry/schemaregistry-client.ts

@@ -198,7 +198,7 @@ export class SchemaRegistryClient implements Client {
     this.clientConfig = config
     const cacheOptions = {
       max: config.cacheCapacity !== undefined ? config.cacheCapacity : 1000,
-      ...(config.cacheLatestTtlSecs !== undefined && { maxAge: config.cacheLatestTtlSecs * 1000 })
+      ...(config.cacheLatestTtlSecs !== undefined && { ttl: config.cacheLatestTtlSecs * 1000 })
     };
 
     this.restService = new RestService(config.baseURLs, config.isForward, config.createAxiosDefaults,

test/schemaregistry/schemaregistry-client.spec.ts

@@ -10,7 +10,7 @@ import { RestService } from '../../schemaregistry/rest-service';
 import { AxiosResponse } from 'axios';
 import stringify from "json-stringify-deterministic";
 import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
-import { mockClientConfig } from '../../test/schemaregistry/test-constants';
+import { mockClientConfig, mockTtlClientConfig } from '../../test/schemaregistry/test-constants';
 
 jest.mock('../../schemaregistry/rest-service');
 
@@ -76,6 +76,10 @@ const schemaInfoMetadata2 = {
 const subjects: string[] = [mockSubject, mockSubject2];
 const versions: number[] = [1, 2, 3];
 
+async function sleep(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 describe('SchemaRegistryClient-Register', () => {
 
   beforeEach(() => {
@@ -630,3 +634,33 @@ describe('SchemaRegistryClient-Config', () => {
     expect(restService.handleRequest).toHaveBeenCalledTimes(1);
   });
 });
+
+describe('SchemaRegistryClient-Cache', () => {
+  beforeEach(() => {
+    restService = new RestService(mockClientConfig.baseURLs) as jest.Mocked<RestService>;
+    client = new SchemaRegistryClient(mockTtlClientConfig);
+    (client as any).restService = restService;
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('Should delete cached item after expiry', async () => {
+    const expectedResponse = {
+      id: 1,
+      version: 1,
+      schema: schemaString,
+      metadata: metadata,
+    };
+
+    restService.handleRequest.mockResolvedValue({ data: expectedResponse } as AxiosResponse);
+
+    await client.register(mockSubject, schemaInfo);
+
+    await sleep(2000);
+
+    await client.register(mockSubject, schemaInfo);
+
+    expect(restService.handleRequest).toHaveBeenCalledTimes(2);
+  });
+});

test/schemaregistry/test-constants.ts

@@ -32,4 +32,13 @@ const mockClientConfig: ClientConfig = {
   basicAuthCredentials: basicAuthCredentials
 };
 
-export { clientConfig, mockClientConfig };
+const mockTtlClientConfig: ClientConfig = {
+  baseURLs: mockBaseUrls,
+  createAxiosDefaults: createAxiosDefaults,
+  isForward: false,
+  cacheCapacity: 512,
+  cacheLatestTtlSecs: 1,
+  basicAuthCredentials: basicAuthCredentials
+};
+
+export { clientConfig, mockClientConfig, mockTtlClientConfig };