Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(rubygems): fallback to info when version fails #7323

Merged
merged 14 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 39 additions & 16 deletions lib/datasource/rubygems/get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,46 @@ export async function getDependency(
return null;
}

const versions = (await fetch(dependency, registry, VERSIONS_PATH)) || [];
let versions = [];
let releases = [];
try {
versions = await fetch(dependency, registry, VERSIONS_PATH);
} catch (err) {
rarkins marked this conversation as resolved.
Show resolved Hide resolved
if (err.statusCode === 400 || err.statusCode === 404) {
logger.debug(
{ registry },
'versions endpoint returns error - falling back to info endpoint'
);
} else {
throw err;
}
}

const releases = versions.map(
({
number: version,
platform: rubyPlatform,
created_at: releaseTimestamp,
rubygems_version: rubygemsVersion,
ruby_version: rubyVersion,
}) => ({
version,
rubyPlatform,
releaseTimestamp,
rubygemsVersion,
rubyVersion,
})
);
if (versions.length === 0 && info.version) {
logger.warn('falling back to the version from the info endpoint');
releases = [
{
version: info.version,
rubyPlatform: info.platform,
},
];
} else {
releases = versions.map(
({
number: version,
platform: rubyPlatform,
created_at: releaseTimestamp,
rubygems_version: rubygemsVersion,
ruby_version: rubyVersion,
}) => ({
version,
rubyPlatform,
releaseTimestamp,
rubygemsVersion,
rubyVersion,
})
);
}

return {
releases,
Expand Down
20 changes: 20 additions & 0 deletions lib/datasource/rubygems/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,25 @@ describe('datasource/rubygems', () => {
expect(await getPkgReleases(params)).toBeNull();
expect(httpMock.getTrace()).toMatchSnapshot();
});
it('falls back to info when version request fails', async () => {
httpMock
.scope('https://thirdparty.com/')
.get('/api/v1/gems/rails.json')
.reply(200, railsInfo)
.get('/api/v1/versions/rails.json')
.reply(400, {});
const res = await getPkgReleases(params);
expect(res.releases).toHaveLength(1);
expect(res.releases[0].version).toBe(railsInfo.version);
});
it('errors when version request fails with anything other than 400 or 404', async () => {
httpMock
.scope('https://thirdparty.com/')
.get('/api/v1/gems/rails.json')
.reply(200, railsInfo)
.get('/api/v1/versions/rails.json')
.reply(500, {});
expect(await getPkgReleases(params)).toBeNull();
});
});
});
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
"Viral Ruparel <[email protected]>",
"Vladimir Starkov <[email protected]>",
"Mikhail Yakushin <[email protected]>",
"Sebastian Poxhofer <[email protected]>"
"Sebastian Poxhofer <[email protected]>",
"Henry Sachs <[email protected]>"
],
"license": "AGPL-3.0",
"bugs": {
Expand Down