fix minor review findings

lib/modules/datasource/deb/checksum.ts

@@ -1,5 +1,5 @@
-import crypto from 'crypto';
 import { createCacheReadStream } from '../../../util/fs';
+import { hashStream } from '../../../util/hash';
 import { escapeRegExp, regEx } from '../../../util/regex';
 
 /**
@@ -35,12 +35,6 @@ export function parseChecksumsFromInRelease(
  * @returns resolves to the SHA256 checksum
  */
 export function computeFileChecksum(filePath: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const hash = crypto.createHash('sha256');
-    const stream = createCacheReadStream(filePath);
-
-    stream.on('data', (data) => hash.update(data));
-    stream.on('end', () => resolve(hash.digest('hex')));
-    stream.on('error', (error) => reject(error));
-  });
+  const stream = createCacheReadStream(filePath);
+  return hashStream(stream, 'sha256');
 }

lib/modules/datasource/deb/index.ts

@@ -1,11 +1,11 @@
-import { createHash } from 'crypto';
 import readline from 'readline';
 import { createUnzip } from 'zlib';
 import { nanoid } from 'nanoid';
 import upath from 'upath';
 import { logger } from '../../../logger';
 import { cache } from '../../../util/cache/package/decorator';
 import * as fs from '../../../util/fs';
+import { toSha256 } from '../../../util/hash';
 import type { HttpOptions } from '../../../util/http/types';
 import { joinUrlParts } from '../../../util/url';
 import { Datasource } from '../datasource';
@@ -120,9 +120,7 @@ export class DebDatasource extends Datasource {
   async downloadAndExtractPackage(
     componentUrl: string,
   ): Promise<{ extractedFile: string; lastTimestamp: Date }> {
-    const packageUrlHash = createHash('sha256')
-      .update(componentUrl)
-      .digest('hex');
+    const packageUrlHash = toSha256(componentUrl);
     const fullCacheDir = await fs.ensureCacheDir(DebDatasource.cacheSubDir);
     const extractedFile = upath.join(fullCacheDir, `${packageUrlHash}.txt`);
     let lastTimestamp = await this.getFileCreationTime(extractedFile);
@@ -225,21 +223,20 @@ export class DebDatasource extends Datasource {
       'Downloading Debian package file',
     );
 
-    const actualChecksum = await computeFileChecksum(compressedFile);
-
     let inReleaseContent = '';
 
     try {
       inReleaseContent = await this.fetchInReleaseFile(baseReleaseUrl);
     } catch (error) {
       // This is expected to fail for Artifactory if GPG verification is not enabled
       logger.debug(
-        { url: baseReleaseUrl, error },
+        { url: baseReleaseUrl, err: error },
         'Could not fetch InRelease file',
       );
     }
 
     if (inReleaseContent) {
+      const actualChecksum = await computeFileChecksum(compressedFile);
       const expectedChecksum = parseChecksumsFromInRelease(
         inReleaseContent,
         // path to the Package.gz file
@@ -304,7 +301,7 @@ export class DebDatasource extends Datasource {
    * @returns a list of packages with minimal Metadata.
    */
   @cache({
-    namespace: `datasource-${DebDatasource.id}-package`,
+    namespace: `datasource-${DebDatasource.id}`,
     key: (extractedFile: string, lastTimestamp: Date) =>
       `${extractedFile}:${lastTimestamp.getTime()}`,
     ttlMinutes: 24 * 60,
@@ -362,7 +359,7 @@ export class DebDatasource extends Datasource {
   }
 
   @cache({
-    namespace: `datasource-${DebDatasource.id}-package`,
+    namespace: `datasource-${DebDatasource.id}`,
     key: (componentUrl: string) => componentUrl,
   })
   async getPackageIndex(

lib/util/cache/package/types.ts

@@ -42,7 +42,7 @@ export type PackageCacheNamespace =
   | 'datasource-cpan'
   | 'datasource-crate-metadata'
   | 'datasource-crate'
-  | 'datasource-deb-package'
+  | 'datasource-deb'
   | 'datasource-deno-details'
   | 'datasource-deno-versions'
   | 'datasource-deno'