From 2169c56e0590589c1cffe31d08751372fae6a60f Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 4 May 2021 04:27:58 +0200
Subject: [PATCH] fix(hashicorp): shortcut getNewValue only on replace
---
lib/versioning/hashicorp/index.ts | 32 ++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/lib/versioning/hashicorp/index.ts b/lib/versioning/hashicorp/index.ts
index ad1feef333..288c0a210b 100644
--- a/lib/versioning/hashicorp/index.ts
+++ b/lib/versioning/hashicorp/index.ts
@@ -35,22 +35,24 @@ function getNewValue({
currentVersion,
newVersion,
}: NewValueConfig): string {
- if (/~>\s*0\.\d+/.test(currentValue) && npm.getMajor(newVersion) === 0) {
- const testFullVersion = /(~>\s*0\.)(\d+)\.\d$/;
- let replaceValue = '';
- if (testFullVersion.test(currentValue)) {
- replaceValue = `$1${npm.getMinor(newVersion)}.0`;
- } else {
- replaceValue = `$1${npm.getMinor(newVersion)}$3`;
+ if (rangeStrategy === 'replace') {
+ if (/~>\s*0\.\d+/.test(currentValue) && npm.getMajor(newVersion) === 0) {
+ const testFullVersion = /(~>\s*0\.)(\d+)\.\d$/;
+ let replaceValue = '';
+ 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
+ if (/(~>\s*)\d+\.\d+$/.test(currentValue)) {
+ return currentValue.replace(
+ /(~>\s*)\d+\.\d+$/,
+ `$1${npm.getMajor(newVersion)}.0`
+ );
}
- return currentValue.replace(/(~>\s*0\.)(\d+)(.*)$/, replaceValue);
- }
- // handle special ~> 1.2 case
- if (/(~>\s*)\d+\.\d+$/.test(currentValue)) {
- return currentValue.replace(
- /(~>\s*)\d+\.\d+$/,
- `$1${npm.getMajor(newVersion)}.0`
- );
}
return npm.getNewValue({
currentValue,
--
GitLab