fix(gitlabci): avoid capturing quotation marks in currentValue (#6584)

Closes #6516
renovatebot · Jun 25, 2020 · b58b90d · b58b90d
1 parent 14f9270
commit b58b90d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/lib/manager/gitlabci/__fixtures__/gitlab-ci.yaml b/lib/manager/gitlabci/__fixtures__/gitlab-ci.yaml
@@ -1,3 +1,5 @@
+image: 'ruby:2.5.0'
+
 .executor-docker: &executor-docker
     tags:
         - docker

diff --git a/lib/manager/gitlabci/__snapshots__/extract.spec.ts.snap b/lib/manager/gitlabci/__snapshots__/extract.spec.ts.snap
@@ -2,6 +2,15 @@
 
 exports[`lib/manager/gitlabci/extract extractPackageFile() extracts multiple image lines 1`] = `
 Array [
+  Object {
+    "autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
+    "currentDigest": undefined,
+    "currentValue": "2.5.0",
+    "datasource": "docker",
+    "depName": "ruby",
+    "depType": "image",
+    "replaceString": "ruby:2.5.0",
+  },
   Object {
     "autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
     "currentDigest": undefined,

diff --git a/lib/manager/gitlabci/extract.spec.ts b/lib/manager/gitlabci/extract.spec.ts
@@ -19,7 +19,10 @@ describe('lib/manager/gitlabci/extract', () => {
     it('extracts multiple image lines', () => {
       const res = extractPackageFile(yamlFile);
       expect(res.deps).toMatchSnapshot();
-      expect(res.deps).toHaveLength(6);
+      expect(res.deps).toHaveLength(7);
+      expect(res.deps.some((dep) => dep.currentValue.includes("'"))).toBe(
+        false
+      );
     });
 
     it('extracts multiple image lines with comments', () => {

diff --git a/lib/manager/gitlabci/extract.ts b/lib/manager/gitlabci/extract.ts
@@ -20,12 +20,12 @@ export function extractPackageFile(content: string): PackageFile | null {
     const lines = content.split('\n');
     for (let lineNumber = 0; lineNumber < lines.length; lineNumber += 1) {
       const line = lines[lineNumber];
-      const imageMatch = /^\s*image:\s*'?"?([^\s]+|)'?"?\s*$/.exec(line);
+      const imageMatch = /^\s*image:\s*'?"?([^\s'"]+|)'?"?\s*$/.exec(line);
       if (imageMatch) {
         switch (imageMatch[1]) {
           case '': {
             const imageNameLine = skipCommentLines(lines, lineNumber + 1);
-            const imageNameMatch = /^\s*name:\s*'?"?([^\s]+|)'?"?\s*$/.exec(
+            const imageNameMatch = /^\s*name:\s*'?"?([^\s'"]+|)'?"?\s*$/.exec(
               imageNameLine.line
             );