fix(ansible-galaxy): space parsing (#20679)

Co-authored-by: Rhys Arkins <rhys@arkins.net> Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · Apr 12, 2023 · c02cf6a · c02cf6a
1 parent b1424dd
commit c02cf6a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/lib/modules/manager/ansible-galaxy/extract.spec.ts b/lib/modules/manager/ansible-galaxy/extract.spec.ts
@@ -1,3 +1,4 @@
+import { codeBlock } from 'common-tags';
 import { Fixtures } from '../../../../test/fixtures';
 import { getSliceEndNumber } from './extract';
 import { extractPackageFile } from './';
@@ -27,6 +28,16 @@ describe('modules/manager/ansible-galaxy/extract', () => {
       expect(res?.deps).toHaveLength(2);
     });
 
+    it('extracts dependencies from requirements.yml with a space at the end of line', () => {
+      const yamlFile = codeBlock`collections:
+      - name: https://github.com/lowlydba/lowlydba.sqlserver.git
+      type: git 
+      version: 1.1.3`;
+      const res = extractPackageFile(yamlFile, 'requirements.yml');
+      expect(res?.deps).toHaveLength(1);
+      expect(res?.deps[0].currentValue).toBe('1.1.3');
+    });
+
     it('check if an empty file returns null', () => {
       const res = extractPackageFile('\n', 'requirements.yml');
       expect(res).toBeNull();
@@ -75,7 +86,7 @@ describe('modules/manager/ansible-galaxy/extract', () => {
 
     it('choose second block', () => {
       const res = getSliceEndNumber(5, 10, 5);
-      expect(res).toBe(9);
+      expect(res).toBe(10);
     });
   });
 });
diff --git a/lib/modules/manager/ansible-galaxy/extract.ts b/lib/modules/manager/ansible-galaxy/extract.ts
@@ -13,7 +13,7 @@ export function getSliceEndNumber(
   if (start < 0 || start > numberOfLines - 1) {
     return -1;
   }
-  let nearestEnd = numberOfLines - 1;
+  let nearestEnd = numberOfLines;
   for (const blocksKey of blocks) {
     if (start < blocksKey && blocksKey < nearestEnd) {
       nearestEnd = blocksKey;

diff --git a/lib/modules/manager/ansible-galaxy/util.ts b/lib/modules/manager/ansible-galaxy/util.ts
@@ -1,7 +1,7 @@
 import { regEx } from '../../../util/regex';
 
 export const newBlockRegEx = /^\s*-\s*((\w+):\s*(.*))$/;
-export const blockLineRegEx = /^\s*((\w+):\s*(.*))$/;
+export const blockLineRegEx = /^\s*((\w+):\s*(\S+))\s*$/;
 export const galaxyDepRegex = /[\w-]+\.[\w-]+/;
 export const dependencyRegex = /^dependencies:/;
 export const galaxyRegEx = regEx(