refactor: Remove 'util/got' (#6523)

renovatebot · Jun 16, 2020 · 2d6c12d · 2d6c12d
1 parent 2f767ea
commit 2d6c12d
Show file tree

Hide file tree

Showing 13 changed files with 372 additions and 329 deletions.
diff --git a/lib/datasource/docker/index.ts b/lib/datasource/docker/index.ts
@@ -465,15 +465,6 @@ async function getTags(
   }
 }
 
-export function getConfigResponse(
-  url: string,
-  headers: OutgoingHttpHeaders
-): Promise<HttpResponse> {
-  return http.get(url, {
-    headers,
-  });
-}
-
 /*
  * docker.getLabels
  *
@@ -535,7 +526,9 @@ async function getLabels(
       return {};
     }
     const url = `${registry}/v2/${repository}/blobs/${configDigest}`;
-    const configResponse = await getConfigResponse(url, headers);
+    const configResponse = await http.get(url, {
+      headers,
+    });
     labels = JSON.parse(configResponse.body).config.Labels;
 
     if (labels) {

diff --git a/lib/manager/bazel/__snapshots__/update.spec.ts.snap b/lib/manager/bazel/__snapshots__/update.spec.ts.snap
@@ -124,6 +124,20 @@ container_pull(
 "
 `;
 
+exports[`manager/bazel/update updateDependency updates commit-based http archive 1`] = `
+Array [
+  Object {
+    "headers": Object {
+      "accept-encoding": "gzip, deflate",
+      "host": "github.com",
+      "user-agent": "got/9.6.0 (https://github.com/sindresorhus/got)",
+    },
+    "method": "GET",
+    "url": "https://github.com/GoogleContainerTools/distroless/archive/033387ac8853e6cc1cd47df6c346bc53cbc490d8.tar.gz",
+  },
+]
+`;
+
 exports[`manager/bazel/update updateDependency updates container_pull deptype and prserves comment 1`] = `
 "container_pull(
           name=\\"hasura\\",
@@ -135,3 +149,54 @@ exports[`manager/bazel/update updateDependency updates container_pull deptype an
       )
 "
 `;
+
+exports[`manager/bazel/update updateDependency updates finds url instead of urls 1`] = `
+Array [
+  Object {
+    "headers": Object {
+      "accept-encoding": "gzip, deflate",
+      "host": "github.com",
+      "user-agent": "got/9.6.0 (https://github.com/sindresorhus/got)",
+    },
+    "method": "GET",
+    "url": "https://github.com/bazelbuild/bazel-skylib/archive/0.8.0.tar.gz",
+  },
+]
+`;
+
+exports[`manager/bazel/update updateDependency updates http archive with content other then WORKSPACE 1`] = `
+Array [
+  Object {
+    "headers": Object {
+      "accept-encoding": "gzip, deflate",
+      "host": "github.com",
+      "user-agent": "got/9.6.0 (https://github.com/sindresorhus/got)",
+    },
+    "method": "GET",
+    "url": "https://github.com/bazelbuild/bazel-skylib/archive/0.8.0.tar.gz",
+  },
+]
+`;
+
+exports[`manager/bazel/update updateDependency updates http_archive with urls array 1`] = `
+Array [
+  Object {
+    "headers": Object {
+      "accept-encoding": "gzip, deflate",
+      "host": "mirror.bazel.build",
+      "user-agent": "got/9.6.0 (https://github.com/sindresorhus/got)",
+    },
+    "method": "GET",
+    "url": "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/0.6.2.tar.gz",
+  },
+  Object {
+    "headers": Object {
+      "accept-encoding": "gzip, deflate",
+      "host": "github.com",
+      "user-agent": "got/9.6.0 (https://github.com/sindresorhus/got)",
+    },
+    "method": "GET",
+    "url": "https://github.com/bazelbuild/bazel-skylib/archive/0.6.2.tar.gz",
+  },
+]
+`;
diff --git a/lib/manager/bazel/update.spec.ts b/lib/manager/bazel/update.spec.ts
@@ -1,14 +1,10 @@
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
-import { fromStream as _fromStream } from 'hasha';
+import { Readable } from 'stream';
+import * as httpMock from '../../../test/httpMock';
 import { UpdateType } from '../../config';
 import { updateDependency } from './update';
 
-jest.mock('hasha');
-jest.mock('../../util/got');
-
-const fromStream: jest.Mock<Promise<string>> = _fromStream as any;
-
 const content = readFileSync(
   resolve('lib/manager/bazel/__fixtures__/WORKSPACE1'),
   'utf8'
@@ -36,7 +32,13 @@ describe('manager/bazel/update', () => {
   describe('updateDependency', () => {
     beforeEach(() => {
       jest.resetAllMocks();
+      httpMock.setup();
     });
+
+    afterEach(() => {
+      httpMock.reset();
+    });
+
     it('updates tag', async () => {
       const upgrade = {
         depName: 'build_bazel_rules_nodejs',
@@ -122,12 +124,18 @@ describe('manager/bazel/update', () => {
         },
         newDigest: '033387ac8853e6cc1cd47df6c346bc53cbc490d8',
       };
-      fromStream.mockResolvedValueOnce('abc123');
+      httpMock
+        .scope('https://github.com')
+        .get(
+          '/GoogleContainerTools/distroless/archive/033387ac8853e6cc1cd47df6c346bc53cbc490d8.tar.gz'
+        )
+        .reply(200, Readable.from(['foo']));
       const res = await updateDependency({
         fileContent: content,
         upgrade,
       });
       expect(res).not.toEqual(content);
+      expect(httpMock.getTrace()).toMatchSnapshot();
     });
     it('updates http archive with content other then WORKSPACE', async () => {
       const upgrade = {
@@ -145,13 +153,17 @@ describe('manager/bazel/update', () => {
         currentValue: '0.6.0',
         newValue: '0.8.0',
       };
-      fromStream.mockResolvedValueOnce('abc123');
+      httpMock
+        .scope('https://github.com')
+        .get('/bazelbuild/bazel-skylib/archive/0.8.0.tar.gz')
+        .reply(200, Readable.from(['foo']));
       const res = await updateDependency({
         fileContent: content,
         upgrade,
       });
       expect(res).not.toEqual(fileWithBzlExtension);
       expect(res.indexOf('0.8.0')).not.toBe(-1);
+      expect(httpMock.getTrace()).toMatchSnapshot();
     });
     it('updates finds url instead of urls', async () => {
       const upgrade = {
@@ -169,13 +181,17 @@ describe('manager/bazel/update', () => {
         currentValue: '0.6.0',
         newValue: '0.8.0',
       };
-      fromStream.mockResolvedValueOnce('abc123');
+      httpMock
+        .scope('https://github.com')
+        .get('/bazelbuild/bazel-skylib/archive/0.8.0.tar.gz')
+        .reply(200, Readable.from(['foo']));
       const res = await updateDependency({
         fileContent: content,
         upgrade,
       });
       expect(res).not.toEqual(fileWithBzlExtension);
       expect(res.indexOf('0.8.0')).not.toBe(-1);
+      expect(httpMock.getTrace()).toMatchSnapshot();
     });
     it('returns null if no urls resolve hashes', async () => {
       const upgrade = {
@@ -217,7 +233,6 @@ http_archive(
         currentValue: '0.5.0',
         newValue: '0.6.2',
       };
-      fromStream.mockResolvedValueOnce('abc123');
       const res = await updateDependency({
         fileContent: content,
         upgrade,
@@ -246,14 +261,22 @@ http_archive(
         currentValue: '0.5.0',
         newValue: '0.6.2',
       };
-      fromStream.mockResolvedValueOnce('abc123');
+      httpMock
+        .scope('https://github.com')
+        .get('/bazelbuild/bazel-skylib/archive/0.6.2.tar.gz')
+        .reply(200, Readable.from(['foo']));
+      httpMock
+        .scope('https://mirror.bazel.build')
+        .get('/github.com/bazelbuild/bazel-skylib/archive/0.6.2.tar.gz')
+        .reply(200, Readable.from(['foo']));
       const res = await updateDependency({
         fileContent: content,
         upgrade,
       });
       expect(res).not.toEqual(content);
       expect(res.indexOf('0.5.0')).toBe(-1);
       expect(res.indexOf('0.6.2')).not.toBe(-1);
+      expect(httpMock.getTrace()).toMatchSnapshot();
     });
   });
 });