refactor: use yaml instead of js-yaml for parsing YAML files (#31336)

lib/modules/datasource/bitrise/index.ts

@@ -115,12 +115,9 @@ export class BitriseDatasource extends Datasource {
         customSchema: BitriseStepFile,
       });
 
-      const releaseTimestamp = is.string(published_at)
-        ? published_at
-        : published_at.toISOString();
       result.releases.push({
         version: versionDir.name,
-        releaseTimestamp,
+        releaseTimestamp: published_at,
         sourceUrl: source_code_url,
       });
     }

lib/modules/datasource/bitrise/schema.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
 export const BitriseStepFile = z.object({
-  published_at: z.date().or(z.string()),
+  published_at: z.string(),
   source_code_url: z.string().optional(),
 });

lib/modules/datasource/conan/index.ts

@@ -63,9 +63,7 @@ export class ConanDatasource extends Datasource {
       headers: { accept: 'application/vnd.github.v3.raw' },
     });
     // TODO: use schema (#9610)
-    const doc = parseSingleYaml<ConanYAML>(res.body, {
-      json: true,
-    });
+    const doc = parseSingleYaml<ConanYAML>(res.body);
     return {
       releases: Object.keys(doc?.versions ?? {}).map((version) => ({
         version,

lib/modules/datasource/helm/common.spec.ts

@@ -4,9 +4,7 @@ import { findSourceUrl } from './common';
 import type { HelmRepository } from './types';
 
 // Truncated index.yaml file
-const repo = parseSingleYaml<HelmRepository>(Fixtures.get('sample.yaml'), {
-  json: true,
-});
+const repo = parseSingleYaml<HelmRepository>(Fixtures.get('sample.yaml'));
 
 describe('modules/datasource/helm/common', () => {
   describe('findSourceUrl', () => {

lib/modules/datasource/helm/index.ts

@@ -56,9 +56,7 @@ export class HelmDatasource extends Datasource {
     }
     try {
       // TODO: use schema (#9610)
-      const doc = parseSingleYaml<HelmRepository>(res.body, {
-        json: true,
-      });
+      const doc = parseSingleYaml<HelmRepository>(res.body);
       if (!is.plainObject<HelmRepository>(doc)) {
         logger.warn(
           { helmRepository },

lib/modules/manager/argocd/extract.ts

@@ -36,17 +36,11 @@ export function extractPackageFile(
     return null;
   }
 
-  let definitions: ApplicationDefinition[];
-  try {
-    definitions = parseYaml(content, {
-      customSchema: ApplicationDefinition,
-      failureBehaviour: 'filter',
-      removeTemplates: true,
-    });
-  } catch (err) {
-    logger.debug({ err, packageFile }, 'Failed to parse ArgoCD definition.');
-    return null;
-  }
+  const definitions = parseYaml(content, {
+    customSchema: ApplicationDefinition,
+    failureBehaviour: 'filter',
+    removeTemplates: true,
+  });
 
   const deps = definitions.flatMap(processAppSpec);
 

lib/modules/manager/crossplane/extract.spec.ts

@@ -13,10 +13,8 @@ describe('modules/manager/crossplane/extract', () => {
       expect(extractPackageFile('nothing here', 'packages.yml')).toBeNull();
     });
 
-    it('returns null for invalid', () => {
-      expect(
-        extractPackageFile(`${malformedPackages}\n123`, 'packages.yml'),
-      ).toBeNull();
+    it('strips invalid templates', () => {
+      expect(extractPackageFile(`test: test: 123`, 'packages.yml')).toBeNull();
     });
 
     it('return null for kubernetes manifest', () => {

lib/modules/manager/crossplane/extract.ts

@@ -6,7 +6,7 @@ import type {
   PackageDependency,
   PackageFileContent,
 } from '../types';
-import { type XPKG, XPKGSchema } from './schema';
+import { XPKGSchema } from './schema';
 
 export function extractPackageFile(
   content: string,
@@ -19,19 +19,11 @@ export function extractPackageFile(
     return null;
   }
 
-  let list: XPKG[] = [];
-  try {
-    list = parseYaml(content, {
-      customSchema: XPKGSchema,
-      failureBehaviour: 'filter',
-    });
-  } catch (err) {
-    logger.debug(
-      { err, packageFile },
-      'Failed to parse Crossplane package file.',
-    );
-    return null;
-  }
+  // not try and catching this as failureBehaviour is set to filter and therefore it will not throw
+  const list = parseYaml(content, {
+    customSchema: XPKGSchema,
+    failureBehaviour: 'filter',
+  });
 
   const deps: PackageDependency[] = [];
   for (const xpkg of list) {

lib/modules/manager/docker-compose/extract.ts

@@ -37,7 +37,6 @@ export function extractPackageFile(
   let config: DockerComposeFile;
   try {
     config = parseSingleYaml(content, {
-      json: true,
       customSchema: DockerComposeFile,
       removeTemplates: true,
     });

lib/modules/manager/fleet/extract.ts

@@ -1,5 +1,4 @@
 import is from '@sindresorhus/is';
-import { logger } from '../../../logger';
 import { regEx } from '../../../util/regex';
 import { parseYaml } from '../../../util/yaml';
 import { GitTagsDatasource } from '../../datasource/git-tags';
@@ -137,27 +136,21 @@ export function extractPackageFile(
   }
   const deps: PackageDependency[] = [];
 
-  try {
-    if (regEx('fleet.ya?ml').test(packageFile)) {
-      const docs = parseYaml(content, {
-        json: true,
-        customSchema: FleetFile,
-        failureBehaviour: 'filter',
-      });
-      const fleetDeps = docs.flatMap(extractFleetFile);
-
-      deps.push(...fleetDeps);
-    } else {
-      const docs = parseYaml(content, {
-        json: true,
-        customSchema: GitRepo,
-        failureBehaviour: 'filter',
-      });
-      const gitRepoDeps = docs.flatMap(extractGitRepo);
-      deps.push(...gitRepoDeps);
-    }
-  } catch (err) {
-    logger.debug({ error: err, packageFile }, 'Failed to parse fleet YAML');
+  if (regEx('fleet.ya?ml').test(packageFile)) {
+    const docs = parseYaml(content, {
+      customSchema: FleetFile,
+      failureBehaviour: 'filter',
+    });
+    const fleetDeps = docs.flatMap(extractFleetFile);
+
+    deps.push(...fleetDeps);
+  } else {
+    const docs = parseYaml(content, {
+      customSchema: GitRepo,
+      failureBehaviour: 'filter',
+    });
+    const gitRepoDeps = docs.flatMap(extractGitRepo);
+    deps.push(...gitRepoDeps);
   }
 
   return deps.length ? { deps } : null;

lib/modules/manager/flux/extract.ts

@@ -47,21 +47,14 @@ function readManifest(
     };
   }
 
-  try {
-    const manifest: FluxManifest = {
-      kind: 'resource',
-      file: packageFile,
-      resources: parseYaml(content, {
-        json: true,
-        customSchema: FluxResource,
-        failureBehaviour: 'filter',
-      }),
-    };
-    return manifest;
-  } catch (err) {
-    logger.debug({ err, packageFile }, 'Failed to parse Flux manifest');
-    return null;
-  }
+  return {
+    kind: 'resource',
+    file: packageFile,
+    resources: parseYaml(content, {
+      customSchema: FluxResource,
+      failureBehaviour: 'filter',
+    }),
+  };
 }
 
 const githubUrlRegex = regEx(

lib/modules/manager/github-actions/extract.ts

@@ -187,7 +187,7 @@ function extractWithYAMLParser(
   let pkg: Workflow;
   try {
     // TODO: use schema (#9610)
-    pkg = parseSingleYaml(content, { json: true });
+    pkg = parseSingleYaml(content);
   } catch (err) {
     logger.debug(
       { packageFile, err },

lib/modules/manager/gitlabci-include/extract.ts

@@ -72,9 +72,7 @@ export function extractPackageFile(
   const endpoint = GlobalConfig.get('endpoint');
   try {
     // TODO: use schema (#9610)
-    const doc = parseSingleYaml<GitlabPipeline>(replaceReferenceTags(content), {
-      json: true,
-    });
+    const doc = parseSingleYaml<GitlabPipeline>(replaceReferenceTags(content));
     const includes = getAllIncludeProjects(doc);
     for (const includeObj of includes) {
       const dep = extractDepFromIncludeFile(includeObj);

lib/modules/manager/gitlabci/__fixtures__/gitlab-ci.4.yaml

@@ -1,7 +1,7 @@
 include:
   - local: 'lib/modules/manager/gitlabci/__fixtures__/include.yml'
 
-test:
+test: test:
   script:
     - !abc [.setup, script]
     - echo running my own command

lib/modules/manager/gitlabci/extract.ts

@@ -25,7 +25,7 @@ import type {
   Job,
   Services,
 } from './types';
-import { getGitlabDep, replaceReferenceTags } from './utils';
+import { getGitlabDep } from './utils';
 
 // See https://docs.gitlab.com/ee/ci/components/index.html#use-a-component
 const componentReferenceRegex = regEx(
@@ -170,8 +170,8 @@ export function extractPackageFile(
   let deps: PackageDependency[] = [];
   try {
     // TODO: use schema (#9610)
-    const docs = parseYaml<GitlabPipeline>(replaceReferenceTags(content), {
-      json: true,
+    const docs = parseYaml<GitlabPipeline>(content, {
+      uniqueKeys: false,
     });
     for (const doc of docs) {
       if (is.object(doc)) {
@@ -259,8 +259,8 @@ export async function extractAllPackageFiles(
     let docs: GitlabPipeline[];
     try {
       // TODO: use schema (#9610)
-      docs = parseYaml(replaceReferenceTags(content), {
-        json: true,
+      docs = parseYaml(content, {
+        uniqueKeys: false,
       });
     } catch (err) {
       logger.debug(

lib/modules/manager/glasskube/extract.ts

@@ -20,7 +20,6 @@ function parseResources(
   packageFile: string,
 ): GlasskubeResources {
   const resources: GlasskubeResource[] = parseYaml(content, {
-    json: true,
     customSchema: GlasskubeResource,
     failureBehaviour: 'filter',
   });

lib/modules/manager/helm-requirements/extract.ts

@@ -17,7 +17,7 @@ export function extractPackageFile(
   // TODO: fix type
   let doc: any;
   try {
-    doc = parseSingleYaml(content, { json: true }); // TODO #9610
+    doc = parseSingleYaml(content); // TODO #9610
   } catch {
     logger.debug({ packageFile }, `Failed to parse helm requirements.yaml`);
     return null;

lib/modules/manager/helm-values/extract.ts

@@ -77,7 +77,7 @@ export function extractPackageFile(
     // a parser that allows extracting line numbers would be preferable, with
     // the current approach we need to match anything we find again during the update
     // TODO: fix me (#9610)
-    parsedContent = parseYaml(content, { json: true }) as any;
+    parsedContent = parseYaml(content) as any;
   } catch (err) {
     logger.debug({ err, packageFile }, 'Failed to parse helm-values YAML');
     return null;

lib/modules/manager/helmfile/extract.ts

@@ -33,24 +33,14 @@ export async function extractPackageFile(
   config: ExtractConfig,
 ): Promise<PackageFileContent | null> {
   const deps: PackageDependency[] = [];
-  let docs: Doc[];
   let registryData: Record<string, HelmRepository> = {};
   // Record kustomization usage for all deps, since updating artifacts is run on the helmfile.yaml as a whole.
   let needKustomize = false;
-  try {
-    docs = parseYaml(content, {
-      customSchema: documentSchema,
-      failureBehaviour: 'filter',
-      removeTemplates: true,
-      json: true,
-    });
-  } catch (err) {
-    logger.debug(
-      { err, packageFile },
-      'Failed to parse helmfile helmfile.yaml',
-    );
-    return null;
-  }
+  const docs: Doc[] = parseYaml(content, {
+    customSchema: documentSchema,
+    failureBehaviour: 'filter',
+    removeTemplates: true,
+  });
 
   for (const doc of docs) {
     // Always check for repositories in the current document and override the existing ones if any (as YAML does)

lib/modules/manager/helmsman/extract.ts

@@ -69,9 +69,7 @@ export function extractPackageFile(
 ): PackageFileContent | null {
   try {
     // TODO: use schema (#9610)
-    const doc = parseSingleYaml<HelmsmanDocument>(content, {
-      json: true,
-    });
+    const doc = parseSingleYaml<HelmsmanDocument>(content);
     if (!doc.apps) {
       logger.debug({ packageFile }, `Missing apps keys`);
       return null;

lib/modules/manager/helmv3/extract.ts

@@ -23,7 +23,7 @@ export async function extractPackageFile(
   };
   try {
     // TODO: use schema (#9610)
-    chart = parseSingleYaml(content, { json: true });
+    chart = parseSingleYaml(content);
     if (!(chart?.apiVersion && chart.name && chart.version)) {
       logger.debug(
         { packageFile },

lib/modules/manager/jenkins/extract.ts

@@ -58,7 +58,7 @@ function extractYaml(
 
   try {
     // TODO: use schema (#9610)
-    const doc = parseSingleYaml<JenkinsPlugins>(content, { json: true });
+    const doc = parseSingleYaml<JenkinsPlugins>(content);
     if (is.nonEmptyArray(doc?.plugins)) {
       for (const plugin of doc.plugins) {
         if (plugin.artifactId) {

lib/modules/manager/kubernetes/extract.ts

@@ -72,9 +72,7 @@ function extractApis(
   try {
     // TODO: use schema (#9610)
     doc = parseYaml(content, {
-      filename: packageFile,
       removeTemplates: true,
-      json: true,
     });
   } catch (err) {
     logger.debug({ err, packageFile }, 'Failed to parse Kubernetes manifest.');

lib/modules/manager/kustomize/extract.ts

@@ -178,7 +178,7 @@ export function parseKustomize(
   let pkg: Kustomize | null = null;
   try {
     // TODO: use schema (#9610)
-    pkg = parseSingleYaml(content, { json: true });
+    pkg = parseSingleYaml(content);
   } catch /* istanbul ignore next */ {
     logger.debug({ packageFile }, 'Error parsing kustomize file');
     return null;

lib/modules/manager/npm/extract/pnpm.ts

@@ -26,9 +26,6 @@ export async function extractPnpmFilters(
     // TODO: use schema (#9610,#22198)
     const contents = parseSingleYaml<PnpmWorkspaceFile>(
       (await readLocalFile(fileName, 'utf8'))!,
-      {
-        json: true,
-      },
     );
     if (
       !Array.isArray(contents.packages) ||

lib/modules/manager/pre-commit/extract.ts

@@ -159,7 +159,7 @@ export function extractPackageFile(
   let parsedContent: ParsedContent;
   try {
     // TODO: use schema (#9610)
-    parsedContent = parseSingleYaml(content, { json: true });
+    parsedContent = parseSingleYaml(content);
   } catch (err) {
     logger.debug(
       { filename: packageFile, err },