From b8e8f8c79b53f5dff2baa6697bc5ff9a9cd133ae Mon Sep 17 00:00:00 2001 From: Nish Sinha Date: Thu, 22 Jun 2023 16:04:51 -0400 Subject: [PATCH] Pull the group name from commit metadata --- src/dependabot/update_metadata.test.ts | 3 +++ src/dependabot/update_metadata.ts | 2 +- src/main.test.ts | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/dependabot/update_metadata.test.ts b/src/dependabot/update_metadata.test.ts index 3569473d..63a8cb94 100644 --- a/src/dependabot/update_metadata.test.ts +++ b/src/dependabot/update_metadata.test.ts @@ -197,12 +197,15 @@ test('it supports returning information about grouped updates', async () => { '- dependency-name: github.com/docker/cli\n' + ' dependency-type: direct:production\n' + ' update-type: version-update:semver-patch\n' + + ' dependency-group: docker\n' + '- dependency-name: github.com/docker/docker\n' + ' dependency-type: direct:production\n' + ' update-type: version-update:semver-patch\n' + + ' dependency-group: docker\n' + '- dependency-name: github.com/moby/moby\n' + ' dependency-type: direct:production\n' + ' update-type: version-update:semver-patch\n' + + ' dependency-group: docker\n' + '...\n' + '\n' + 'Signed-off-by: dependabot[bot] \n' diff --git a/src/dependabot/update_metadata.ts b/src/dependabot/update_metadata.ts index edc67663..64174ed2 100644 --- a/src/dependabot/update_metadata.ts +++ b/src/dependabot/update_metadata.ts @@ -32,7 +32,7 @@ export async function parse (commitMessage: string, body: string, branchName: st const bumpFragment = commitMessage.match(/^Bumps .* from (?v?\d[^ ]*) to (?v?\d[^ ]*)\.$/m) const updateFragment = commitMessage.match(/^Update .* requirement from \S*? ?(?v?\d\S*) to \S*? ?(?v?\d\S*)$/m) const yamlFragment = commitMessage.match(/^-{3}\n(?[\S|\s]*?)\n^\.{3}\n/m) - const groupName = commitMessage.match(/^Bumps the (?\S*) group with/m) + const groupName = commitMessage.match(/dependency-group:\s(?\S*)/m) const newMaintainer = !!body.match(/Maintainer changes/m) const lookupFn = lookup ?? (() => Promise.resolve({ alertState: '', ghsaId: '', cvss: 0 })) const scoreFn = getScore ?? (() => Promise.resolve(0)) diff --git a/src/main.test.ts b/src/main.test.ts index cee29499..fb73e7c4 100644 --- a/src/main.test.ts +++ b/src/main.test.ts @@ -229,12 +229,15 @@ test('it supports returning information about grouped updates', async () => { '- dependency-name: github.com/docker/cli\n' + ' dependency-type: direct:production\n' + ' update-type: version-update:semver-patch\n' + + ' dependency-group: docker\n' + '- dependency-name: github.com/docker/docker\n' + ' dependency-type: direct:production\n' + ' update-type: version-update:semver-patch\n' + + ' dependency-group: docker\n' + '- dependency-name: github.com/moby/moby\n' + ' dependency-type: direct:production\n' + ' update-type: version-update:semver-patch\n' + + ' dependency-group: docker\n' + '...\n' + '\n' + 'Signed-off-by: dependabot[bot] \n'