chore: Tidy up promise handling and testing

api-server/server/utils/in-memory-cache.js

@@ -18,23 +18,20 @@ function InMemoryCache(initialValue, reportError) {
       return typeof value !== 'undefined' ? value : null;
     },
 
-    async update(fn) {
+    update(fn) {
-      let maybePromisedValue;
       try {
-        maybePromisedValue = fn();
+        const value = fn();
+        if (isPromiseLike(value)) {
+          return value.then(value => cache.set(cacheKey, value));
+        } else {
+          cache.set(cacheKey, value);
+        }
       } catch (e) {
         const errMsg = `InMemoryCache > update > caught: ${e.message}`;
         e.message = errMsg;
         reportError(e);
-        return null;
       }
-      if (isPromiseLike(maybePromisedValue)) {
-        return maybePromisedValue.then(value => cache.set(cacheKey, value));
-      } else {
-        const value = maybePromisedValue;
-        cache.set(cacheKey, value);
       return null;
-      }
     },
 
     clear() {

api-server/server/utils/in-memory-cache.test.js

@@ -35,7 +35,8 @@ describe('InMemoryCache', () => {
 
     it('can handle promises correctly', done => {
       const cache = inMemoryCache(before, reportErrorStub);
-      cache.update(() => new Promise(resolve => resolve(after)));
+      const promisedUpdate = () => new Promise(resolve => resolve(after));
+      cache.update(promisedUpdate);
       // because async
       setImmediate(() => {
         expect(cache.get()).toBe(after);