refactor(manager/gitlabci): remove method "replaceReferenceTags"

Since renovatebot#31336 the replacement of the reference tag from GitLab is not needed anymore
dkd · Oct 4, 2024 · 4e4d181 · 4e4d181
1 parent 4d04357
commit 4e4d181
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/lib/modules/manager/gitlabci-include/extract.ts b/lib/modules/manager/gitlabci-include/extract.ts
@@ -14,7 +14,6 @@ import type {
   GitlabIncludeProject,
   GitlabPipeline,
 } from '../gitlabci/types';
-import { replaceReferenceTags } from '../gitlabci/utils';
 import type { PackageDependency, PackageFileContent } from '../types';
 
 function extractDepFromIncludeFile(
@@ -76,7 +75,7 @@ export function extractPackageFile(
       : null;
   try {
     // TODO: use schema (#9610)
-    const docs = parseYaml<GitlabPipeline>(replaceReferenceTags(content), {
+    const docs = parseYaml<GitlabPipeline>(content, {
       uniqueKeys: false,
     });
     for (const doc of docs) {

diff --git a/lib/modules/manager/gitlabci/common.spec.ts b/lib/modules/manager/gitlabci/common.spec.ts
@@ -1,7 +1,6 @@
 import { codeBlock } from 'common-tags';
 import { parseSingleYaml } from '../../../util/yaml';
 import type { GitlabPipeline } from '../gitlabci/types';
-import { replaceReferenceTags } from '../gitlabci/utils';
 import {
   filterIncludeFromGitlabPipeline,
   isGitlabIncludeComponent,
@@ -12,7 +11,7 @@ import {
 
 // TODO: use schema (#9610)
 const pipeline = parseSingleYaml<GitlabPipeline>(
-  replaceReferenceTags(codeBlock`
+  codeBlock`
     include:
     - project: mikebryant/include-source-example
       file: /template.yaml
@@ -25,7 +24,7 @@ const pipeline = parseSingleYaml<GitlabPipeline>(
 
     script:
     - !reference [.setup, script]
-    - !reference [arbitrary job name with space and no starting dot, nested1, nested2, nested3]`),
+    - !reference [arbitrary job name with space and no starting dot, nested1, nested2, nested3]`,
 );
 const includeLocal = { local: 'something' };
 const includeProject = { project: 'something' };
@@ -37,7 +36,15 @@ describe('modules/manager/gitlabci/common', () => {
       const filtered_pipeline = filterIncludeFromGitlabPipeline(pipeline);
       expect(filtered_pipeline).not.toHaveProperty('include');
       expect(filtered_pipeline).toEqual({
-        script: [null, null],
+        script: [
+          ['.setup', 'script'],
+          [
+            'arbitrary job name with space and no starting dot',
+            'nested1',
+            'nested2',
+            'nested3',
+          ],
+        ],
       });
     });
   });

diff --git a/lib/modules/manager/gitlabci/utils.spec.ts b/lib/modules/manager/gitlabci/utils.spec.ts
@@ -1,6 +1,5 @@
-import { Fixtures } from '../../../../test/fixtures';
 import type { PackageDependency } from '../types';
-import { getGitlabDep, replaceReferenceTags } from './utils';
+import { getGitlabDep } from './utils';
 
 describe('modules/manager/gitlabci/utils', () => {
   describe('getGitlabDep', () => {
@@ -82,12 +81,4 @@ describe('modules/manager/gitlabci/utils', () => {
       });
     });
   });
-
-  describe('replaceReferenceTags', () => {
-    it('replaces all !reference tags with empty strings', () => {
-      const yamlFileReferenceConfig = Fixtures.get('gitlab-ci.reference.yaml');
-      const replaced = replaceReferenceTags(yamlFileReferenceConfig);
-      expect(replaced).not.toContain('!reference');
-    });
-  });
 });
diff --git a/lib/modules/manager/gitlabci/utils.ts b/lib/modules/manager/gitlabci/utils.ts
@@ -2,19 +2,6 @@ import { regEx } from '../../../util/regex';
 import { getDep } from '../dockerfile/extract';
 import type { PackageDependency } from '../types';
 
-const re = /!reference \[[^\]]+\]/g;
-
-/**
- * Replaces GitLab reference tags before parsing, because our yaml parser cannot process them anyway.
- * @param content pipeline yaml
- * @returns replaced pipeline content
- * https://docs.gitlab.com/ee/ci/yaml/#reference-tags
- */
-export function replaceReferenceTags(content: string): string {
-  const res = content.replace(re, '');
-  return res;
-}
-
 const depProxyRe = regEx(
   `(?<prefix>\\$\\{?CI_DEPENDENCY_PROXY_(?:DIRECT_)?GROUP_IMAGE_PREFIX\\}?/)(?<depName>.+)`,
 );