fix(jsonata): updates when version and digest changed (#36461) (#38066)

Co-authored-by: Michael Kriese <[email protected]>

Author: jalil-salame

lib/workers/repository/update/branch/auto-replace.spec.ts

@@ -1347,6 +1347,69 @@ describe('workers/repository/update/branch/auto-replace', () => {
       );
     });
 
+    it('jsonata: update currentValue', async () => {
+      const source =
+        '[ { "version": "1.2.3", "digest": "abcdef", "package": "foo" } ]';
+      upgrade.manager = 'jsonata';
+      upgrade.depName = 'foo';
+      upgrade.currentValue = '1.2.3';
+      upgrade.newValue = '1.2.4';
+      upgrade.depIndex = 0;
+      upgrade.packageFile = 'deps.json';
+      upgrade.fileFormat = 'json';
+      upgrade.datasourceTemplate = 'github-releases';
+      upgrade.matchStrings = [
+        '*.{"depName": package, "currentDigest": digest, "currentValue": version }',
+      ];
+
+      const res = await doAutoReplace(upgrade, source, reuseExistingBranch);
+      expect(res).toBe(
+        '[ { "version": "1.2.4", "digest": "abcdef", "package": "foo" } ]',
+      );
+    });
+
+    it('jsonata: update currentDigest', async () => {
+      const source =
+        '[ { "version": "1.2.3", "digest": "abcdef", "package": "foo" } ]';
+      upgrade.manager = 'jsonata';
+      upgrade.depName = 'foo';
+      upgrade.currentDigest = 'abcdef';
+      upgrade.newDigest = 'badbeef';
+      upgrade.depIndex = 0;
+      upgrade.packageFile = 'deps.json';
+      upgrade.fileFormat = 'json';
+      upgrade.datasourceTemplate = 'github-releases';
+      upgrade.matchStrings = [
+        '*.{"depName": package, "currentDigest": digest, "currentValue": version }',
+      ];
+      const res = await doAutoReplace(upgrade, source, reuseExistingBranch);
+      expect(res).toBe(
+        '[ { "version": "1.2.3", "digest": "badbeef", "package": "foo" } ]',
+      );
+    });
+
+    it('jsonata: update currentValue and currentDigest', async () => {
+      const source =
+        '[ { "version": "1.2.3", "digest": "abcdef", "package": "foo" } ]';
+      upgrade.manager = 'jsonata';
+      upgrade.depName = 'foo';
+      upgrade.currentValue = '1.2.3';
+      upgrade.newValue = '1.2.4';
+      upgrade.currentDigest = 'abcdef';
+      upgrade.newDigest = 'badbeef';
+      upgrade.depIndex = 0;
+      upgrade.packageFile = 'deps.json';
+      upgrade.fileFormat = 'json';
+      upgrade.datasourceTemplate = 'github-releases';
+      upgrade.matchStrings = [
+        '*.{"depName": package, "currentDigest": digest, "currentValue": version }',
+      ];
+      const res = await doAutoReplace(upgrade, source, reuseExistingBranch);
+      expect(res).toBe(
+        '[ { "version": "1.2.4", "digest": "badbeef", "package": "foo" } ]',
+      );
+    });
+
     it('github-actions: updates with newValue only', async () => {
       const githubAction = codeBlock`
         jobs:

lib/workers/repository/update/branch/auto-replace.ts

@@ -196,6 +196,28 @@ async function checkExistingBranch(
   return existingContent;
 }
 
+/**
+ * Check if an update from `current` to `newString` should be performed and return 1 if so.
+ *
+ * @remarks
+ * Useful for counting the number of updates to do.
+ *
+ * @param current The current value (if undefined then no update is required)
+ * @param newString The new value (if undefined then no update is required)
+ *
+ * @returns 1 if `current !== newString` and 0 if they are equal or at least one is undefined.
+ */
+function updatedToInt(
+  current: string | undefined,
+  newString: string | undefined,
+): number {
+  if (current && newString && newString !== current) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
 export async function doAutoReplace(
   upgrade: BranchUpgradeConfig,
   existingContent: string,
@@ -224,11 +246,24 @@ export async function doAutoReplace(
   if (reuseExistingBranch) {
     return await checkExistingBranch(upgrade, existingContent);
   }
+
+  // count how many strings need to be updated
+  const changedCount =
+    updatedToInt(depName, newName) +
+    updatedToInt(currentValue, newValue) +
+    updatedToInt(currentDigest, newDigest) +
+    updatedToInt(currentDigestShort, newDigest);
+  logger.debug(
+    { packageFile, depName, changedCount },
+    'N values changed and need to be updated',
+  );
+
   const replaceWithoutReplaceString =
-    is.string(newName) &&
-    newName !== depName &&
-    (is.undefined(upgrade.replaceString) ||
-      !upgrade.replaceString?.includes(depName!));
+    (is.string(newName) &&
+      newName !== depName &&
+      (is.undefined(upgrade.replaceString) ||
+        !upgrade.replaceString?.includes(depName!))) ||
+    (is.undefined(upgrade.replaceString) && changedCount > 1);
   const replaceString = upgrade.replaceString ?? currentValue ?? currentDigest;
   logger.trace({ depName, replaceString }, 'autoReplace replaceString');
   let searchIndex: number;