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

fix(terraform): handle greater than with full version (#9632)

Browse source
This commit is contained in:
Sebastian Poxhofer 2021-04-19 21:43:13 +02:00 committed by GitHub
parent 8b8d7767bc
commit df2f451e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/versioning/hashicorp/index.spec.ts
View file

@ -67,6 +67,30 @@ describe('semver.getNewValue()', () => {
newVersion: '2.0.7', newVersion: '2.0.7',
}) })
).toEqual('~> 2.0.0'); ).toEqual('~> 2.0.0');
expect(
semver.getNewValue({
currentValue: '~> 0.14.0',
rangeStrategy: 'replace',
currentVersion: '0.14.1',
newVersion: '0.15.0',
})
).toEqual('~> 0.15.0');
expect(
semver.getNewValue({
currentValue: '~> 0.14.0',
rangeStrategy: 'replace',
currentVersion: '0.14.1',
newVersion: '0.15.1',
})
).toEqual('~> 0.15.0');
expect(
semver.getNewValue({
currentValue: '~> 0.14.6',
rangeStrategy: 'replace',
currentVersion: '0.14.6',
newVersion: '0.15.0',
})
).toEqual('~> 0.15.0');
}); });
it('handles comma dividers', () => { it('handles comma dividers', () => {
expect( expect(

12
lib/versioning/hashicorp/index.ts
View file

@ -36,10 +36,14 @@ function getNewValue({
newVersion, newVersion,
}: NewValueConfig): string { }: NewValueConfig): string {
if (/~>\s*0\.\d+/.test(currentValue) && npm.getMajor(newVersion) === 0) { if (/~>\s*0\.\d+/.test(currentValue) && npm.getMajor(newVersion) === 0) {
return currentValue.replace( const testFullVersion = /(~>\s*0\.)(\d+)\.\d$/;
/(~>\s*0\.).*$/, let replaceValue = '';
`$1${npm.getMinor(newVersion)}` if (testFullVersion.test(currentValue)) {
); replaceValue = `$1${npm.getMinor(newVersion)}.0`;
} else {
replaceValue = `$1${npm.getMinor(newVersion)}$3`;
}
return currentValue.replace(/(~>\s*0\.)(\d+)(.*)$/, replaceValue);
} }
// handle special ~> 1.2 case // handle special ~> 1.2 case
if (/(~>\s*)\d+\.\d+$/.test(currentValue)) { if (/(~>\s*)\d+\.\d+$/.test(currentValue)) {