From 2902d17637d94ee44d3cff44822cb20117a8940b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 17 Apr 2024 12:59:13 +0200
Subject: [PATCH] fix(gomod): go.mod directive should not bump by default
 (#28475)

---
 .../versioning/go-mod-directive/index.spec.ts   | 17 ++++++++++-------
 .../versioning/go-mod-directive/index.ts        |  7 ++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/modules/versioning/go-mod-directive/index.spec.ts b/lib/modules/versioning/go-mod-directive/index.spec.ts
index e133594d30b22a..13b6d0c29753b9 100644
--- a/lib/modules/versioning/go-mod-directive/index.spec.ts
+++ b/lib/modules/versioning/go-mod-directive/index.spec.ts
@@ -2,12 +2,13 @@ import { api as semver } from '.';
 
 describe('modules/versioning/go-mod-directive/index', () => {
   it.each`
-    version     | range     | expected
-    ${'1.16.0'} | ${'1.16'} | ${true}
-    ${'1.16.1'} | ${'1.16'} | ${true}
-    ${'1.15.0'} | ${'1.16'} | ${false}
-    ${'1.19.1'} | ${'1.16'} | ${true}
-    ${'2.0.0'}  | ${'1.16'} | ${false}
+    version     | range       | expected
+    ${'1.16.0'} | ${'1.16'}   | ${true}
+    ${'1.16.1'} | ${'1.16'}   | ${true}
+    ${'1.15.0'} | ${'1.16'}   | ${false}
+    ${'1.19.1'} | ${'1.16'}   | ${true}
+    ${'2.0.0'}  | ${'1.16'}   | ${false}
+    ${'1.22.2'} | ${'1.21.9'} | ${true}
   `(
     'matches("$version", "$range") === "$expected"',
     ({ version, range, expected }) => {
@@ -70,10 +71,12 @@ describe('modules/versioning/go-mod-directive/index', () => {
     ${'1.16'}    | ${'bump'}     | ${'1.16.4'}    | ${'1.17.0'} | ${'1.17'}
     ${'1.16'}    | ${'bump'}     | ${'1.16.4'}    | ${'1.16.4'} | ${'1.16'}
     ${'1.16'}    | ${'replace'}  | ${'1.16.4'}    | ${'1.16.4'} | ${'1.16'}
-    ${'1.16'}    | ${'replace'}  | ${'1.21.2'}    | ${'1.21.2'} | ${'1.21.2'}
+    ${'1.16'}    | ${'replace'}  | ${'1.21.2'}    | ${'1.21.2'} | ${'1.16'}
     ${'1.16'}    | ${'widen'}    | ${'1.16.4'}    | ${'1.16.4'} | ${'1.16'}
     ${'1.16'}    | ${'bump'}     | ${'1.16.4'}    | ${'1.21.3'} | ${'1.21.3'}
     ${'1.21.2'}  | ${'bump'}     | ${'1.21.2'}    | ${'1.21.3'} | ${'1.21.3'}
+    ${'1.21.2'}  | ${'replace'}  | ${'1.21.2'}    | ${'1.22.2'} | ${'1.21.2'}
+    ${'1.21.2'}  | ${'replace'}  | ${'1.21.2'}    | ${'2.0.0'}  | ${'2.0.0'}
   `(
     'getNewValue("$currentValue", "$rangeStrategy", "$currentVersion", "$newVersion") === "$expected"',
     ({ currentValue, rangeStrategy, currentVersion, newVersion, expected }) => {
diff --git a/lib/modules/versioning/go-mod-directive/index.ts b/lib/modules/versioning/go-mod-directive/index.ts
index 820c4b62ddb8cd..b09f8a2775521e 100644
--- a/lib/modules/versioning/go-mod-directive/index.ts
+++ b/lib/modules/versioning/go-mod-directive/index.ts
@@ -30,11 +30,8 @@ function getNewValue({
     }
     return shorten(newVersion);
   }
-  if (rangeStrategy === 'replace' && !matches(currentValue, newVersion)) {
-    if (npm.matches(newVersion, '>=1.20.0')) {
-      return newVersion;
-    }
-    return shorten(newVersion);
+  if (rangeStrategy === 'replace' && !matches(newVersion, currentValue)) {
+    return newVersion;
   }
   return currentValue;
 }