fix(lookup): use newValue for digest lookup, not compareValue (#27596)

renovatebot · Feb 28, 2024 · b3c27af · b3c27af
1 parent 992527f
commit b3c27af
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 19 deletions.
diff --git a/lib/workers/repository/process/lookup/index.spec.ts b/lib/workers/repository/process/lookup/index.spec.ts
@@ -3489,6 +3489,27 @@ describe('workers/repository/process/lookup/index', () => {
         lookup.lookupUpdates(config),
       ).unwrapOrThrow();
 
+      expect(getDockerDigest.mock.calls).toEqual([
+        [
+          {
+            currentDigest: 'aaa111',
+            currentValue: '18.10.0-alpine',
+            packageName: 'node',
+            registryUrl: 'https://index.docker.io',
+          },
+          '18.19.0-alpine',
+        ],
+        [
+          {
+            currentDigest: 'aaa111',
+            currentValue: '18.10.0-alpine',
+            packageName: 'node',
+            registryUrl: 'https://index.docker.io',
+          },
+          '18.10.0-alpine',
+        ],
+      ]);
+
       expect(res).toEqual({
         currentVersion: '18.10.0',
         fixedVersion: '18.10.0',

diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts
@@ -442,14 +442,32 @@ export async function lookupUpdates(
     } else if (compareValue && versioning.isSingleVersion(compareValue)) {
       res.fixedVersion = compareValue.replace(regEx(/^=+/), '');
     }
+
+    // massage versionCompatibility
+    if (
+      is.string(config.currentValue) &&
+      is.string(compareValue) &&
+      is.string(config.versionCompatibility)
+    ) {
+      for (const update of res.updates) {
+        logger.debug({ update });
+        if (is.string(config.currentValue) && is.string(update.newValue)) {
+          update.newValue = config.currentValue.replace(
+            compareValue,
+            update.newValue,
+          );
+        }
+      }
+    }
+
     // Add digests if necessary
     if (supportsDigests(config.datasource)) {
       if (config.currentDigest) {
         if (!config.digestOneAndOnly || !res.updates.length) {
           // digest update
           res.updates.push({
             updateType: 'digest',
-            newValue: compareValue,
+            newValue: config.currentValue,
           });
         }
       } else if (config.pinDigests) {
@@ -459,7 +477,7 @@ export async function lookupUpdates(
           res.updates.push({
             isPinDigest: true,
             updateType: 'pinDigest',
-            newValue: compareValue,
+            newValue: config.currentValue,
           });
         }
       }
@@ -520,23 +538,6 @@ export async function lookupUpdates(
       }
     }
 
-    // massage versionCompatibility
-    if (
-      is.string(config.currentValue) &&
-      is.string(compareValue) &&
-      is.string(config.versionCompatibility)
-    ) {
-      for (const update of res.updates) {
-        logger.debug({ update });
-        if (is.string(config.currentValue) && is.string(update.newValue)) {
-          update.newValue = config.currentValue.replace(
-            compareValue,
-            update.newValue,
-          );
-        }
-      }
-    }
-
     if (res.updates.length) {
       delete res.skipReason;
     }