Skip to content

Commit

Permalink
fix(go): Fetch data for respectLatest in goproxy (#22908)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zharinov
zharinov authored Jun 21, 2023
1 parent 808653b commit 8ec9527
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 2 deletions.
34 changes: 32 additions & 2 deletions lib/modules/datasource/go/releases-goproxy.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
)
.get('/@v/v1.0.1.info')
.reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' })
.get('/@latest')
.reply(200, { Version: 'v1.0.1' })
.get('/v2/@v/list')
.reply(404);

Expand All @@ -361,6 +363,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2019-10-16T16:15:28Z', version: 'v1.0.1' },
],
sourceUrl: 'https://github.com/google/btree',
tags: { latest: 'v1.0.1' },
});
});

Expand All @@ -381,9 +384,9 @@ describe('modules/datasource/go/releases-goproxy', () => {
.replyWithError('unknown')
.get('/@v/v1.0.1.info')
.reply(410)
.get('/@latest')
.reply(200, { Version: 'v1.0.1' })
.get('/v2/@v/list')
.reply(200)
.get('/v3/@v/list')
.reply(404);

const res = await datasource.getReleases({
Expand All @@ -393,6 +396,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
expect(res).toEqual({
releases: [{ version: 'v1.0.0' }, { version: 'v1.0.1' }],
sourceUrl: 'https://github.com/google/btree',
tags: { latest: 'v1.0.1' },
});
});

Expand All @@ -418,6 +422,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
.reply(200, { Version: 'v1.0.0', Time: '2018-08-13T15:31:12Z' })
.get('/@v/v1.0.1.info')
.reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' })
.get('/@latest')
.reply(200, { Version: 'v1.0.1' })
.get('/v2/@v/list')
.reply(404);

Expand All @@ -431,6 +437,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2019-10-16T16:15:28Z', version: 'v1.0.1' },
],
sourceUrl: 'https://github.com/google/btree',
tags: { latest: 'v1.0.1' },
});
});

Expand Down Expand Up @@ -465,6 +472,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
.reply(200, { Version: 'v1.0.0', Time: '2018-08-13T15:31:12Z' })
.get('/@v/v1.0.1.info')
.reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' })
.get('/@latest')
.reply(200, { Version: 'v1.0.1' })
.get('/v2/@v/list')
.reply(404);

Expand All @@ -478,6 +487,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2019-10-16T16:15:28Z', version: 'v1.0.1' },
],
sourceUrl: 'https://github.com/google/btree',
tags: { latest: 'v1.0.1' },
});
});

Expand Down Expand Up @@ -579,6 +589,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
.reply(200, ['v1.0.0 2018-08-13T15:31:12Z', 'v1.0.1'].join('\n'))
.get('/@v/v1.0.1.info')
.reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' })
.get('/@latest')
.reply(200, { Version: 'v1.0.1' })
.get('/v2/@v/list')
.reply(404);
httpMock
Expand All @@ -595,6 +607,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2018-08-13T15:31:12Z', version: 'v1.0.0' },
{ releaseTimestamp: '2019-10-16T16:15:28Z', version: 'v1.0.1' },
],
tags: { latest: 'v1.0.1' },
});
});

Expand All @@ -615,6 +628,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
.reply(200, { Version: 'v1.0.0', Time: '2018-08-13T15:31:12Z' })
.get('/@v/v1.0.1.info')
.reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' })
.get('/@latest')
.reply(200, { Version: 'v1.0.1' })
.get('/v2/@v/list')
.reply(
200,
Expand All @@ -624,6 +639,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
)
.get('/v2/@v/v2.0.0.info')
.reply(200, { Version: 'v2.0.0', Time: '2020-10-16T16:15:28Z' })
.get('/v2/@latest')
.reply(200, { Version: 'v2.0.0' })
.get('/v3/@v/list')
.reply(404);

Expand All @@ -638,6 +655,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2020-10-16T16:15:28Z', version: 'v2.0.0' },
],
sourceUrl: 'https://github.com/google/btree',
tags: { latest: 'v2.0.0' },
});
});

Expand All @@ -652,12 +670,16 @@ describe('modules/datasource/go/releases-goproxy', () => {
.reply(200, { Version: 'v2.3.0', Time: '2020-05-06T23:08:38Z' })
.get('.v2/@v/v2.4.0.info')
.reply(200, { Version: 'v2.4.0', Time: '2020-11-17T15:46:20Z' })
.get('.v2/@latest')
.reply(200, { Version: 'v2.4.0' })
.get('.v3/@v/list')
.reply(200, ['v3.0.0', 'v3.0.1', ' \n'].join('\n'))
.get('.v3/@v/v3.0.0.info')
.reply(200, { Version: 'v3.0.0', Time: '2022-05-21T10:33:21Z' })
.get('.v3/@v/v3.0.1.info')
.reply(200, { Version: 'v3.0.1', Time: '2022-05-27T08:35:30Z' })
.get('.v3/@latest')
.reply(200, { Version: 'v3.0.1' })
.get('.v4/@v/list')
.reply(404);

Expand All @@ -673,6 +695,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2022-05-27T08:35:30Z', version: 'v3.0.1' },
],
sourceUrl: 'https://github.com/go-yaml/yaml',
tags: { latest: 'v3.0.1' },
});
});

Expand All @@ -687,10 +710,14 @@ describe('modules/datasource/go/releases-goproxy', () => {
.reply(200, { Version: 'v0.1.0', Time: '2017-01-01T00:00:00Z' })
.get('.v0/@v/v0.2.0.info')
.reply(200, { Version: 'v0.2.0', Time: '2017-02-01T00:00:00Z' })
.get('.v0/@latest')
.reply(200, { Version: 'v0.2.0' })
.get('.v1/@v/list')
.reply(200, ['v1.0.0', '\n'].join('\n'))
.get('.v1/@v/v1.0.0.info')
.reply(200, { Version: 'v1.0.0', Time: '2018-01-01T00:00:00Z' })
.get('.v1/@latest')
.reply(200, { Version: 'v1.0.0' })
.get('.v2/@v/list')
.reply(404);

Expand All @@ -705,6 +732,7 @@ describe('modules/datasource/go/releases-goproxy', () => {
{ releaseTimestamp: '2018-01-01T00:00:00Z', version: 'v1.0.0' },
],
sourceUrl: 'https://github.com/go-foo/foo',
tags: { latest: 'v1.0.0' },
});
});

Expand All @@ -715,6 +743,8 @@ describe('modules/datasource/go/releases-goproxy', () => {
.scope(`${baseUrl}/github.com/google/btree`)
.get('/@v/list')
.reply(200)
.get('/@latest')
.reply(404)
.get('/v2/@v/list')
.reply(404);

Expand Down
24 changes: 24 additions & 0 deletions lib/modules/datasource/go/releases-goproxy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { cache } from '../../../util/cache/package/decorator';
import { HttpError } from '../../../util/http';
import * as p from '../../../util/promises';
import { newlineRegex, regEx } from '../../../util/regex';
import goVersioning from '../../versioning/go-mod-directive';
import { Datasource } from '../datasource';
import type { GetReleasesConfig, Release, ReleaseResult } from '../types';
import { BaseGoDatasource } from './base';
Expand Down Expand Up @@ -232,6 +233,20 @@ export class GoProxyDatasource extends Datasource {
return result;
}

async getLatestVersion(
baseUrl: string,
packageName: string
): Promise<string | null> {
try {
const url = `${baseUrl}/${this.encodeCase(packageName)}/@latest`;
const res = await this.http.getJson<VersionInfo>(url);
return res.body.Version;
} catch (err) {
logger.debug({ err }, 'Failed to get latest version');
return null;
}
}

async getVersionsWithInfo(
baseUrl: string,
packageName: string
Expand Down Expand Up @@ -278,6 +293,15 @@ export class GoProxyDatasource extends Datasource {

throw err;
}

const latestVersion = await this.getLatestVersion(baseUrl, pkg);
if (latestVersion) {
result.tags ??= {};
result.tags.latest ??= latestVersion;
if (goVersioning.isGreaterThan(latestVersion, result.tags.latest)) {
result.tags.latest = latestVersion;
}
}
}

return result;
Expand Down

0 comments on commit 8ec9527

Please sign in to comment.