fixup! Attempt to start list watch from last resourceVersion

Author: bbatha

src/cache.ts

@@ -120,7 +120,7 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
 
     private async doneHandler(err: any): Promise<any> {
         this._stop();
-        if (err?.message === 'Gone') {
+        if (err && err.statusCode === 410) {
             this.resourceVersion = '';
         } else if (err) {
             this.callbackCache[ERROR].forEach((elt: ErrorCallback) => elt(err));
@@ -131,12 +131,6 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
             return;
         }
         this.callbackCache[CONNECT].forEach((elt: ErrorCallback) => elt(undefined));
-        const queryParams = {
-            resourceVersion: this.resourceVersion
-        } as {
-            resourceVersion: string | undefined;
-            labelSelector: string | undefined;
-        };
         if (!this.resourceVersion) {
             const promise = this.listFn();
             const result = await promise;
@@ -151,8 +145,14 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
                 }
             });
             this.addOrUpdateItems(list.items);
-            queryParams.resourceVersion = list.metadata!.resourceVersion;
+            this.resourceVersion = list.metadata!.resourceVersion!;
         }
+        const queryParams = {
+            resourceVersion: this.resourceVersion,
+        } as {
+            resourceVersion: string | undefined;
+            labelSelector: string | undefined;
+        };
         if (this.labelSelector !== undefined) {
             queryParams.labelSelector = ObjectSerializer.serialize(this.labelSelector, 'string');
         }

src/cache_test.ts

@@ -197,7 +197,9 @@ describe('ListWatchCache', () => {
             } as V1ObjectMeta,
         } as V1Namespace);
 
-        await doneHandler(null);
+        const error = new Error('Gone') as Error & { statusCode: number | undefined };
+        error.statusCode = 410;
+        await doneHandler(error);
         expect(cache.list().length, 'all namespace list').to.equal(1);
         expect(cache.list('default').length, 'default namespace list').to.equal(1);
         expect(cache.list('other'), 'other namespace list').to.be.undefined;
@@ -570,7 +572,9 @@ describe('ListWatchCache', () => {
             });
         });
         listObj.items = list2;
-        doneHandler(null);
+        const error = new Error('Gone') as Error & { statusCode: number | undefined };
+        error.statusCode = 410;
+        await doneHandler(error);
         await promise;
         expect(addObjects).to.deep.equal(list);
         expect(updateObjects).to.deep.equal(list2);
@@ -1172,7 +1176,8 @@ describe('ListWatchCache', () => {
 
         const [, , , doneHandler] = mock.capture(fakeWatch.watch).last();
 
-        const error = new Error('Gone');
+        const error = new Error('Gone') as Error & { statusCode: number | undefined };
+        error.statusCode = 410;
         await doneHandler(error);
 
         mock.verify(

src/watch.ts

@@ -47,7 +47,9 @@ export class DefaultRequest implements RequestInterface {
             if (resp.statusCode === 200) {
                 req.resume();
             } else {
-                req.emit('error', new Error(resp.statusMessage));
+                const error = new Error(resp.statusMessage) as Error & { statusCode: number | undefined };
+                error.statusCode = resp.statusCode;
+                req.emit('error', error);
             }
         });
         return req;