fixup! fix(git-node): handle multi-line trailers

Author: aduh95

lib/landing_session.js

@@ -326,24 +326,25 @@ export default class LandingSession extends Session {
     const originalTrailers = interpretTrailers(original);
     const containCVETrailer = CVE_RE.test(originalTrailers);
 
-    const filterTrailer = (line) => ([key]) =>
-      line.startsWith(key) &&
-          new RegExp(`^${RegExp.escape?.(key) ?? key}\\s*:`).test(line);
     const amended = original.trim().split('\n');
-    const stillInTrailers = () => {
-      const result = interpretTrailers(amended.join('\n'));
-      return result.length && originalTrailers.startsWith(result.trim());
-    };
-    for (let i = amended.length - 1; amended[i] === '' || stillInTrailers(); i--) {
-      // Remove last line until git no longer detects any trailers
-      amended.pop();
-    }
+    let keptTrailers = [];
+    if (originalTrailers) {
+      const stillInTrailers = () => {
+        const result = interpretTrailers(amended.join('\n'));
+        return result.length && originalTrailers.startsWith(result.trim());
+      };
+      // Remove all lines until we find an empty string, which should get of all
+      // trailers in most cases.
+      amended.splice(amended.lastIndexOf(''), Infinity);
+      for (let i = amended.length - 1; amended[i] === '' || stillInTrailers(); i--) {
+        // Remove last line until git no longer detects any trailers
+        amended.pop();
+      }
 
-    // Only keep existing trailers that we won't add ourselves
-    const trailersToFilterOut = ['BACKPORT-PR-URL', 'REVIEWED-BY'];
-    if (!this.backport) trailersToFilterOut.push('PR-URL');
-    const keptTrailers =
-      originalTrailers
+      // Only keep existing trailers that we won't add ourselves
+      const trailersToFilterOut = ['BACKPORT-PR-URL', 'REVIEWED-BY'];
+      if (!this.backport) trailersToFilterOut.push('PR-URL');
+      keptTrailers = originalTrailers
         .split('\n')
         .map(trailer => {
           const separatorIndex = trailer.indexOf(':');
@@ -353,11 +354,11 @@ export default class LandingSession extends Session {
         .filter(
           ([key]) => !trailersToFilterOut.includes(key.toUpperCase())
         );
+    }
     amended.push('', ...keptTrailers.map(([key, value]) => `${key}: ${value}`));
 
     for (const line of metadata.trim().split('\n')) {
-      const foundMatchingTrailer = keptTrailers.find(filterTrailer(line));
-      if (foundMatchingTrailer && line === foundMatchingTrailer.join(': ')) {
+      if (keptTrailers.some((trailer) => line.toUpperCase() === trailer.join(': ').toUpperCase())) {
         cli.warn(`Found ${line}, skipping..`);
         continue;
       }

test/unit/amend.test.js

@@ -105,11 +105,11 @@ describe('LandingSession.prototype.generateAmendedMessage', () => {
     t.assert.strictEqual(result, 'subsystem: foobar\n\nTrailer: Value\nPR-URL: http://example.com/123\nReviewed-By: user1 <[email protected]>');
   });
 
-  it('should handle empty message', async(t) => {
+  it('should handle empty message (although not supported)', async(t) => {
     const session = createSession();
     const result = await session.generateAmendedMessage('');
 
-    t.assert.strictEqual(result, '\nPR-URL: http://example.com/123\nReviewed-By: user1 <[email protected]>');
+    t.assert.strictEqual(result, '\n\nPR-URL: http://example.com/123\nReviewed-By: user1 <[email protected]>');
   });
 
   it('should handle multi-line trailers', async(t) => {