Skip to content

Commit

Permalink
fix: global cache return undefined instead of null (#6530)
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed Jun 17, 2020
1 parent f5a588e commit a684373
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 4 additions & 2 deletions lib/util/cache/global/file.spec.ts
Expand Up @@ -7,7 +7,9 @@ describe('lib/util/cache/global/file', () => {
});

it('gets null', async () => {
expect(await global.renovateCache.get('test', 'missing-key')).toBeNull();
expect(
await global.renovateCache.get('test', 'missing-key')
).toBeUndefined();
});

it('sets and gets', async () => {
Expand All @@ -17,6 +19,6 @@ describe('lib/util/cache/global/file', () => {

it('expires', async () => {
await global.renovateCache.set('test', 'key', 1234, -5);
expect(await global.renovateCache.get('test', 'key')).toBeNull();
expect(await global.renovateCache.get('test', 'key')).toBeUndefined();
});
});
3 changes: 1 addition & 2 deletions lib/util/cache/global/file.ts
Expand Up @@ -18,7 +18,6 @@ async function get<T = never>(namespace: string, key: string): Promise<T> {
try {
const res = await cacache.get(renovateCache, getKey(namespace, key));
const cachedValue = JSON.parse(res.data.toString());
// istanbul ignore else: only happens when cache is corrupted
if (cachedValue) {
if (DateTime.local() < DateTime.fromISO(cachedValue.expiry)) {
logger.trace({ namespace, key }, 'Returning cached value');
Expand All @@ -29,7 +28,7 @@ async function get<T = never>(namespace: string, key: string): Promise<T> {
} catch (err) {
logger.trace({ namespace, key }, 'Cache miss');
}
return null;
return undefined;
}

async function set(
Expand Down
2 changes: 1 addition & 1 deletion lib/util/cache/global/redis.ts
Expand Up @@ -38,7 +38,7 @@ async function get<T = never>(namespace: string, key: string): Promise<T> {
} catch (err) {
logger.trace({ namespace, key }, 'Cache miss');
}
return null;
return undefined;
}

async function set(
Expand Down

0 comments on commit a684373

Please sign in to comment.