From 64dfb59c2189be6bf05009e48e8bbb9915641092 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Wed, 30 Jan 2019 10:34:04 +0100 Subject: [PATCH] refactor: purl registryUrls --- lib/datasource/maven.js | 4 ++-- lib/util/purl.js | 2 +- test/util/__snapshots__/purl.spec.js.snap | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/datasource/maven.js b/lib/datasource/maven.js index 683143bc8b..386c176a0b 100644 --- a/lib/datasource/maven.js +++ b/lib/datasource/maven.js @@ -12,11 +12,11 @@ module.exports = { async function getPkgReleases(purl) { const versions = []; const dependency = getDependencyParts(purl); - if (!is.nonEmptyArray(purl.repositoryUrls)) { + if (!is.nonEmptyArray(purl.registryUrls)) { logger.error(`No repositories defined for ${dependency.display}`); return null; } - const repositories = purl.repositoryUrls.map(repository => + const repositories = purl.registryUrls.map(repository => repository.replace(/\/?$/, '/') ); logger.debug( diff --git a/lib/util/purl.js b/lib/util/purl.js index 99a5f9f455..bc89cc3327 100644 --- a/lib/util/purl.js +++ b/lib/util/purl.js @@ -42,7 +42,7 @@ function parse(input) { res.qualifiers[key] = val; }); if (res.qualifiers.repository_url) { - res.repositoryUrls = res.qualifiers.repository_url.split(','); + res.registryUrls = res.qualifiers.repository_url.split(','); delete res.qualifiers.repository_url; } } else { diff --git a/test/util/__snapshots__/purl.spec.js.snap b/test/util/__snapshots__/purl.spec.js.snap index 564473a120..fed348fa3a 100644 --- a/test/util/__snapshots__/purl.spec.js.snap +++ b/test/util/__snapshots__/purl.spec.js.snap @@ -51,7 +51,7 @@ Object { "datasource": "maven", "lookupName": "org.apache.xmlgraphics/batik-anim", "qualifiers": Object {}, - "repositoryUrls": Array [ + "registryUrls": Array [ "repo.spring.io/release", ], } -- GitLab