From 5f1286ff0015823990cac8d9196b65c6545479e8 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Sat, 4 May 2024 16:41:41 +0200 Subject: [PATCH] fix: massage depName if missing (#28831) --- .../repository/extract/manager-files.spec.ts | 4 ++-- lib/workers/repository/extract/manager-files.ts | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/workers/repository/extract/manager-files.spec.ts b/lib/workers/repository/extract/manager-files.spec.ts index 58d074b7898ae7..0b22e14973f5c9 100644 --- a/lib/workers/repository/extract/manager-files.spec.ts +++ b/lib/workers/repository/extract/manager-files.spec.ts @@ -52,13 +52,13 @@ describe('workers/repository/extract/manager-files', () => { fileMatch.getMatchingFiles.mockReturnValue(['Dockerfile']); fs.readLocalFile.mockResolvedValueOnce('some content'); html.extractPackageFile = jest.fn(() => ({ - deps: [{}, { replaceString: 'abc' }], + deps: [{}, { replaceString: 'abc', packageName: 'p' }], })) as never; const res = await getManagerPackageFiles(managerConfig); expect(res).toEqual([ { packageFile: 'Dockerfile', - deps: [{}, { replaceString: 'abc' }], + deps: [{}, { replaceString: 'abc', packageName: 'p', depName: 'p' }], }, ]); }); diff --git a/lib/workers/repository/extract/manager-files.ts b/lib/workers/repository/extract/manager-files.ts index d247968c8ce72b..abfeaa39a2fe6f 100644 --- a/lib/workers/repository/extract/manager-files.ts +++ b/lib/workers/repository/extract/manager-files.ts @@ -9,6 +9,18 @@ import type { PackageFile } from '../../../modules/manager/types'; import { readLocalFile } from '../../../util/fs'; import type { WorkerExtractConfig } from '../../types'; +function massageDepNames(packageFiles: PackageFile[] | null): void { + if (packageFiles) { + for (const packageFile of packageFiles) { + for (const dep of packageFile.deps) { + if (dep.packageName && !dep.depName) { + dep.depName = dep.packageName; + } + } + } + } +} + export async function getManagerPackageFiles( config: WorkerExtractConfig, ): Promise { @@ -35,6 +47,7 @@ export async function getManagerPackageFiles( config, fileList, ); + massageDepNames(allPackageFiles); return allPackageFiles; } const packageFiles: PackageFile[] = []; @@ -58,5 +71,6 @@ export async function getManagerPackageFiles( logger.debug(`${packageFile} has no content`); } } + massageDepNames(packageFiles); return packageFiles; }