Skip to content
Snippets Groups Projects
Commit bf57bb80 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

refactor: github ref => lookupType

parent 7e7ec8cc
No related branches found
No related tags found
No related merge requests found
......@@ -90,19 +90,19 @@ async function getDigest(config) {
*/
async function getPkgReleases(purl) {
const { lookupName: repo, qualifiers: options } = purl;
options.ref = options.ref || 'tags';
const { lookupName: repo, qualifiers } = purl;
const lookupType = qualifiers.lookupType || 'tags';
let versions;
const cachedResult = await renovateCache.get(
cacheNamespace,
getCacheKey(repo, options.ref)
getCacheKey(repo, lookupType)
);
// istanbul ignore if
if (cachedResult) {
return cachedResult;
}
try {
if (options.ref === 'release') {
if (lookupType === 'release') {
const url = `https://api.github.com/repos/${repo}/releases?per_page=100`;
versions = (await ghGot(url, { paginate: true })).body.map(
o => o.tag_name
......@@ -133,7 +133,7 @@ async function getPkgReleases(purl) {
const cacheMinutes = 10;
await renovateCache.set(
cacheNamespace,
getCacheKey(repo, options.ref),
getCacheKey(repo, lookupType),
dependency,
cacheMinutes
);
......
......@@ -128,7 +128,7 @@ function extractPackageFile(content) {
dep.depName = depName;
dep.repo = parsedUrl.repo;
dep.currentValue = parsedUrl.currentValue;
dep.purl = 'pkg:github/' + dep.repo + '?ref=release';
dep.purl = 'pkg:github/' + dep.repo + '?lookupType=release';
deps.push(dep);
} else {
logger.info(
......
......@@ -203,7 +203,7 @@ async function extractPackageFile(content, fileName, config) {
if (semver.isVersion(depRefPart)) {
dep.currentRawValue = dep.currentValue;
dep.currentValue = depRefPart;
dep.purl = `pkg:github/${githubOwnerRepo}?ref=tags`;
dep.purl = `pkg:github/${githubOwnerRepo}`;
dep.pinDigests = false;
} else if (
depRefPart.match(/^[0-9a-f]{7}$/) ||
......
......@@ -88,7 +88,7 @@ describe('datasource/github', () => {
];
ghGot.mockReturnValueOnce({ headers: {}, body });
const res = await datasource.getPkgReleases({
purl: 'pkg:github/some/dep?ref=release',
purl: 'pkg:github/some/dep?lookupType=release',
});
expect(res).toMatchSnapshot();
expect(res.releases).toHaveLength(2);
......
......@@ -90,7 +90,7 @@ Array [
",
"depName": "io_bazel_rules_go",
"depType": "http_archive",
"purl": "pkg:github/bazelbuild/rules_go?ref=release",
"purl": "pkg:github/bazelbuild/rules_go?lookupType=release",
"repo": "bazelbuild/rules_go",
},
Object {
......@@ -107,7 +107,7 @@ Array [
",
"depName": "bazel_skylib",
"depType": "http_archive",
"purl": "pkg:github/bazelbuild/bazel-skylib?ref=release",
"purl": "pkg:github/bazelbuild/bazel-skylib?lookupType=release",
"repo": "bazelbuild/bazel-skylib",
},
]
......
......@@ -152,7 +152,7 @@ Object {
"githubRepo": "owner/c",
"pinDigests": false,
"prettyDepType": "dependency",
"purl": "pkg:github/owner/c?ref=tags",
"purl": "pkg:github/owner/c",
"sourceUrl": "https://github.com/owner/c",
},
Object {
......@@ -183,7 +183,7 @@ Object {
"githubRepo": "owner/f",
"pinDigests": false,
"prettyDepType": "dependency",
"purl": "pkg:github/owner/f?ref=tags",
"purl": "pkg:github/owner/f",
"sourceUrl": "https://github.com/owner/f",
},
Object {
......@@ -247,7 +247,7 @@ Object {
"githubRepo": "owner/m",
"pinDigests": false,
"prettyDepType": "dependency",
"purl": "pkg:github/owner/m?ref=tags",
"purl": "pkg:github/owner/m",
"sourceUrl": "https://github.com/owner/m",
},
Object {
......@@ -259,7 +259,7 @@ Object {
"githubRepo": "owner/n",
"pinDigests": false,
"prettyDepType": "dependency",
"purl": "pkg:github/owner/n?ref=tags",
"purl": "pkg:github/owner/n",
"sourceUrl": "https://github.com/owner/n",
},
],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment