renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

feat(golang): digest updates

Browse source 
Adds support to update dependencies that have pseudo-versions like v0.0.0-20140422174119-9fd32a8b3d3d.
This commit is contained in:
Rhys Arkins 2018-10-02 10:34:37 +02:00
parent 9ec385d6d7
commit 99df4f0f31
7 changed files with 86 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/config/definitions.js
View file

@ -975,6 +975,11 @@ const options = [
type: 'json',
default: {
fileMatch: ['(^|/)go.mod$'],
digest: {
prBodyDefinitions: {
Change: '`{{{currentValue}}}` -> `{{{newDigestShort}}}`',
},
},
},
mergeable: true,
},

11
lib/datasource/github.js
View file

@ -38,22 +38,21 @@ function getCacheKey(repo, type) {
}
async function getDigest(config) {
const githubRepo = config.githubRepo || config.depNameShort;
const cachedResult = await renovateCache.get(
cacheNamespace,
getCacheKey(config.githubRepo, 'commit')
getCacheKey(githubRepo, 'commit')
);
if (cachedResult) {
return cachedResult;
}
let digest;
try {
const url = `https://api.github.com/repos/${
config.githubRepo
}/commits?per_page=1`;
const url = `https://api.github.com/repos/${githubRepo}/commits?per_page=1`;
digest = (await ghGot(url)).body[0].sha;
} catch (err) {
logger.info(
{ githubRepo: config.githubRepo, err },
{ githubRepo, err },
'Error getting latest commit from GitHub repo'
);
}
@ -63,7 +62,7 @@ async function getDigest(config) {
const cacheMinutes = 10;
await renovateCache.set(
cacheNamespace,
getCacheKey(config.githubRepo, 'commit'),
getCacheKey(githubRepo, 'commit'),
digest,
cacheMinutes
);

4
lib/manager/gomod/extract.js
View file

@ -32,6 +32,10 @@ function getDep(lineNumber, match) {
dep.purl = `pkg:go/${depName}`;
dep.depNameShort = depName;
}
const digestMatch = currentValue.match(/v0\.0.0-\d{14}-([a-f0-9]{12})/);
if (digestMatch) {
[, dep.currentDigest] = digestMatch;
}
return dep;
}

18
lib/manager/gomod/update.js
View file

@ -1,3 +1,5 @@
const { DateTime } = require('luxon');
module.exports = {
updateDependency,
};
@ -24,7 +26,21 @@ function updateDependency(currentFileContent, upgrade) {
logger.debug('No image line found');
return null;
}
const newLine = lineToChange.replace(requireLine, `$1${upgrade.newValue}`);
let newLine;
if (upgrade.updateType === 'digest') {
const newDigestRightSized = upgrade.newDigest.substring(
0,
upgrade.currentDigest.length
);
if (lineToChange.includes(newDigestRightSized)) {
return currentFileContent;
}
const currentDateTime = DateTime.local().toFormat('yyyyMMddHHmmss');
const newValue = `v0.0.0-${currentDateTime}-${newDigestRightSized}`;
newLine = lineToChange.replace(requireLine, `$1${newValue}`);
} else {
newLine = lineToChange.replace(requireLine, `$1${upgrade.newValue}`);
}
if (newLine === lineToChange) {
logger.debug('No changes necessary');
return currentFileContent;

2
lib/workers/repository/onboarding/pr/pr-list.js
View file

@ -39,7 +39,7 @@ function getPrList(config, branches) {
} else {
text += upgrade.depName.replace(prTitleRe, '@​$1');
}
text += ` to \`${upgrade.newValue || upgrade.newDigest}\``;
text += ` to \`${upgrade.newDigest || upgrade.newValue}\``;
text += '\n';
}
if (!seen.includes(text)) {

26
test/manager/gomod/__snapshots__/extract.spec.js.snap
View file

@ -13,6 +13,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "9fd32a8b3d3d",
"currentValue": "v0.0.0-20140422174119-9fd32a8b3d3d",
"depName": "github.com/bgentry/go-netrc",
"depNameShort": "bgentry/go-netrc",
@ -23,6 +24,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "bcc4c8345a21",
"currentValue": "v0.0.0-20151120183258-bcc4c8345a21",
"depName": "github.com/cloudfoundry/jibber_jabber",
"depNameShort": "cloudfoundry/jibber_jabber",
@ -83,6 +85,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "604e922904d3",
"currentValue": "v0.0.0-20130729185459-604e922904d3",
"depName": "github.com/golang-collections/collections",
"depNameShort": "golang-collections/collections",
@ -93,6 +96,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "d5fe4b57a186",
"currentValue": "v0.0.0-20171218145408-d5fe4b57a186",
"depName": "github.com/hashicorp/go-cleanhttp",
"depNameShort": "hashicorp/go-cleanhttp",
@ -103,6 +107,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "4bda8fa99001",
"currentValue": "v0.0.0-20180809191950-4bda8fa99001",
"depName": "github.com/hashicorp/go-getter",
"depNameShort": "hashicorp/go-getter",
@ -113,6 +118,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "b1a1dbde6fdc",
"currentValue": "v0.0.0-20180326211150-b1a1dbde6fdc",
"depName": "github.com/hashicorp/go-safetemp",
"depNameShort": "hashicorp/go-safetemp",
@ -133,6 +139,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "ef8a98b0bbce",
"currentValue": "v0.0.0-20180404174102-ef8a98b0bbce",
"depName": "github.com/hashicorp/hcl",
"depNameShort": "hashicorp/hcl",
@ -143,6 +150,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "fc0cef2ff331",
"currentValue": "v0.0.0-20180515183152-fc0cef2ff331",
"depName": "github.com/heroku/rollrus",
"depNameShort": "heroku/rollrus",
@ -153,6 +161,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "d14ea06fba99",
"currentValue": "v0.0.0-20150711004518-d14ea06fba99",
"depName": "github.com/jbenet/go-context",
"depNameShort": "jbenet/go-context",
@ -163,6 +172,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "906e15686e63",
"currentValue": "v0.0.0-20180822080847-906e15686e63",
"depName": "github.com/jesseduffield/go-getter",
"depNameShort": "jesseduffield/go-getter",
@ -173,6 +183,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "03e26ff3f1de",
"currentValue": "v0.0.0-20180921065632-03e26ff3f1de",
"depName": "github.com/jesseduffield/gocui",
"depNameShort": "jesseduffield/gocui",
@ -183,6 +194,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "1e272ff78dcb",
"currentValue": "v0.0.0-20180919093808-1e272ff78dcb",
"depName": "github.com/jesseduffield/termbox-go",
"depNameShort": "jesseduffield/termbox-go",
@ -193,6 +205,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "0b12d6b521d8",
"currentValue": "v0.0.0-20160202185014-0b12d6b521d8",
"depName": "github.com/jmespath/go-jmespath",
"depNameShort": "jmespath/go-jmespath",
@ -203,6 +216,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "ae77be60afb1",
"currentValue": "v0.0.0-20170510131534-ae77be60afb1",
"depName": "github.com/kardianos/osext",
"depNameShort": "kardianos/osext",
@ -213,6 +227,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "9fc7bb800b55",
"currentValue": "v0.0.0-20180317175531-9fc7bb800b55",
"depName": "github.com/kevinburke/ssh_config",
"depNameShort": "kevinburke/ssh_config",
@ -273,6 +288,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "58046073cbff",
"currentValue": "v0.0.0-20180801233206-58046073cbff",
"depName": "github.com/mitchellh/go-homedir",
"depNameShort": "mitchellh/go-homedir",
@ -283,6 +299,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "a61a99592b77",
"currentValue": "v0.0.0-20171004221916-a61a99592b77",
"depName": "github.com/mitchellh/go-testing-interface",
"depNameShort": "mitchellh/go-testing-interface",
@ -293,6 +310,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "f15292f7a699",
"currentValue": "v0.0.0-20180715050151-f15292f7a699",
"depName": "github.com/mitchellh/mapstructure",
"depNameShort": "mitchellh/mapstructure",
@ -303,6 +321,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "a16b91a3ba80",
"currentValue": "v0.0.0-20180803040939-a16b91a3ba80",
"depName": "github.com/nicksnyder/go-i18n",
"depNameShort": "nicksnyder/go-i18n",
@ -363,6 +382,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "e180dbdc8da0",
"currentValue": "v0.0.0-20170330084843-e180dbdc8da0",
"depName": "github.com/shibukawa/configdir",
"depNameShort": "shibukawa/configdir",
@ -403,6 +423,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "14d3d4c51834",
"currentValue": "v0.0.0-20180814060501-14d3d4c51834",
"depName": "github.com/spf13/jwalterweatherman",
"depNameShort": "spf13/jwalterweatherman",
@ -433,6 +454,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "59b7046e48ad",
"currentValue": "v0.0.0-20160624110644-59b7046e48ad",
"depName": "github.com/spkg/bom",
"depNameShort": "spkg/bom",
@ -463,6 +485,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "3627a5cbeaea",
"currentValue": "v0.0.0-20170522205222-3627a5cbeaea",
"depName": "github.com/stvp/roll",
"depNameShort": "stvp/roll",
@ -503,6 +526,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "de0752318171",
"currentValue": "v0.0.0-20180808211826-de0752318171",
"depName": "golang.org/x/crypto",
"depNameShort": "golang.org/x/crypto",
@ -513,6 +537,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "c39426892332",
"currentValue": "v0.0.0-20180811021610-c39426892332",
"depName": "golang.org/x/net",
"depNameShort": "golang.org/x/net",
@ -523,6 +548,7 @@ Array [
"versionScheme": "semver",
},
Object {
"currentDigest": "98c5dad5d1a0",
"currentValue": "v0.0.0-20180810173357-98c5dad5d1a0",
"depName": "golang.org/x/sys",
"depNameShort": "golang.org/x/sys",

28
test/manager/gomod/update.spec.js
View file

@ -78,6 +78,34 @@ describe('manager/gomod/update', () => {
expect(res).not.toEqual(gomod2);
expect(res.includes(upgrade.newValue)).toBe(true);
});
it('update multiline digest', () => {
const upgrade = {
depName: 'github.com/spf13/jwalterweatherman',
lineNumber: 43,
multiLine: true,
currentVersion: 'v0.0.0',
updateType: 'digest',
currentDigest: '14d3d4c51834',
newDigest: '123456123456abcdef',
};
const res = goUpdate.updateDependency(gomod2, upgrade);
expect(res).not.toEqual(gomod2);
expect(res.includes(upgrade.newDigest)).toBe(false);
expect(res.includes(upgrade.newDigest.substring(0, 12))).toBe(true);
});
it('skips already-updated multiline digest', () => {
const upgrade = {
depName: 'github.com/spf13/jwalterweatherman',
lineNumber: 43,
multiLine: true,
currentVersion: 'v0.0.0',
updateType: 'digest',
currentDigest: 'abcdefabcdef',
newDigest: '14d3d4c51834000000',
};
const res = goUpdate.updateDependency(gomod2, upgrade);
expect(res).toEqual(gomod2);
});
it('handles multiline mismatch', () => {
const upgrade = {
depName: 'github.com/fatih/color',