feat(http): Throw errors for schema mismatch (#21395)

renovatebot · Apr 11, 2023 · e1d5012 · e1d5012
1 parent 2dae252
commit e1d5012
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/lib/util/http/index.spec.ts b/lib/util/http/index.spec.ts
@@ -349,7 +349,7 @@ describe('util/http/index', () => {
         expect(logger.logger.once.info).not.toHaveBeenCalled();
       });
 
-      it('returns original body if schema does not match', async () => {
+      it('throws on schema mismatch', async () => {
         httpMock
           .scope(baseUrl, {
             reqheaders: {
@@ -359,10 +359,9 @@ describe('util/http/index', () => {
           .get('/')
           .reply(200, JSON.stringify({ foo: 'bar' }));
 
-        const { body } = await http.getJson('http://renovate.com', SomeSchema);
-
-        expect(body).toEqual({ foo: 'bar' });
-        expect(logger.logger.once.info).toHaveBeenCalled();
+        await expect(
+          http.getJson('http://renovate.com', SomeSchema)
+        ).rejects.toThrow(z.ZodError);
       });
     });
 
@@ -382,16 +381,15 @@ describe('util/http/index', () => {
         expect(logger.logger.once.info).not.toHaveBeenCalled();
       });
 
-      it('returns original body if schema does not match', async () => {
+      it('throws on schema mismatch', async () => {
         httpMock
           .scope(baseUrl)
           .post('/')
           .reply(200, JSON.stringify({ foo: 'bar' }));
 
-        const { body } = await http.postJson('http://renovate.com', SomeSchema);
-
-        expect(body).toEqual({ foo: 'bar' });
-        expect(logger.logger.once.info).toHaveBeenCalled();
+        await expect(
+          http.postJson('http://renovate.com', SomeSchema)
+        ).rejects.toThrow(z.ZodError);
       });
     });
   });

diff --git a/lib/util/http/index.ts b/lib/util/http/index.ts
@@ -259,19 +259,10 @@ export class Http<Opts extends HttpOptions = HttpOptions> {
     const res = await this.request<ResT>(url, opts);
 
     if (!schema) {
-      return { ...res, body: res.body };
-    }
-
-    const parsed = await schema.safeParseAsync(res.body);
-    if (!parsed.success) {
-      logger.once.info(
-        { err: parsed.error },
-        `Response does not match schema: please report this to https://github.com/renovatebot/renovate/pull/21338`
-      );
       return res;
     }
 
-    res.body = parsed.data;
+    res.body = await schema.parseAsync(res.body);
     return res;
   }