diff --git a/lib/datasource/helm/index.js b/lib/datasource/helm/index.js index f80da4b394740a92a135da34b87c89aadbed3ae8..10722a2ab2a1aaabf257db1452912d93d17b7d82 100644 --- a/lib/datasource/helm/index.js +++ b/lib/datasource/helm/index.js @@ -62,7 +62,7 @@ export async function getRepositoryData(repository) { } let result; try { - const doc = yaml.safeLoad(res.body); + const doc = yaml.safeLoad(res.body, { json: true }); if (!doc) { logger.warn(`Failed to parse index.yaml from ${repository}`); return null; diff --git a/lib/manager/gitlabci-include/extract.ts b/lib/manager/gitlabci-include/extract.ts index 42cee41ae4bfec2f168d235c2affdad50e2628ee..e403214a4525590a2be496f4e43c03acfd147c41 100644 --- a/lib/manager/gitlabci-include/extract.ts +++ b/lib/manager/gitlabci-include/extract.ts @@ -31,7 +31,7 @@ export function extractPackageFile( ): PackageFile | null { const deps: PackageDependency[] = []; try { - const doc = yaml.safeLoad(content); + const doc = yaml.safeLoad(content, { json: true }); if (doc.include && is.array(doc.include)) { for (const includeObj of doc.include) { const dep = extractDepFromInclude(includeObj); diff --git a/lib/manager/helm-requirements/extract.ts b/lib/manager/helm-requirements/extract.ts index 6a9339764cdcf951b8b076b4ecb61d676a53864e..1cb380779e5c797c9c62d2d1abd68320668d2549 100644 --- a/lib/manager/helm-requirements/extract.ts +++ b/lib/manager/helm-requirements/extract.ts @@ -18,7 +18,7 @@ export async function extractPackageFile( logger.debug({ fileName }, 'Failed to find helm Chart.yaml'); return null; } - const chart = yaml.safeLoad(chartContents); + const chart = yaml.safeLoad(chartContents, { json: true }); if (!(chart && chart.apiVersion && chart.name && chart.version)) { logger.debug( { fileName }, @@ -33,7 +33,7 @@ export async function extractPackageFile( let deps = []; let doc; try { - doc = yaml.safeLoad(content); + doc = yaml.safeLoad(content, { json: true }); } catch (err) { logger.debug({ fileName }, 'Failed to parse helm requirements.yaml'); return null; diff --git a/lib/manager/helm-requirements/update.ts b/lib/manager/helm-requirements/update.ts index e17c23e73c7a3918ea93ec8b6cdbe7581153ae90..ff0f65160885b93b8b02181173eb0b9ca86acb48 100644 --- a/lib/manager/helm-requirements/update.ts +++ b/lib/manager/helm-requirements/update.ts @@ -10,7 +10,7 @@ export function updateDependency(fileContent, upgrade) { logger.debug('Failed to update dependency, invalid upgrade'); return fileContent; } - const doc = yaml.safeLoad(fileContent); + const doc = yaml.safeLoad(fileContent, { json: true }); if (!doc || !is.array(doc.dependencies)) { logger.debug('Failed to update dependency, invalid requirements.yaml file'); return fileContent; @@ -48,7 +48,7 @@ export function updateDependency(fileContent, upgrade) { newString ); // Compare the parsed yaml structure of old and new - if (_.isEqual(doc, yaml.safeLoad(testContent))) { + if (_.isEqual(doc, yaml.safeLoad(testContent, { json: true }))) { newFileContent = testContent; break; } else { diff --git a/lib/manager/travis/extract.ts b/lib/manager/travis/extract.ts index 554ecb7a718e14f46c9d484e4b38f036b5adc774..302d706216f0fd32a181a6895f2ed3ab0e94fad1 100644 --- a/lib/manager/travis/extract.ts +++ b/lib/manager/travis/extract.ts @@ -6,7 +6,7 @@ import { logger } from '../../logger'; export function extractPackageFile(content: string): PackageFile | null { let doc; try { - doc = yaml.safeLoad(content); + doc = yaml.safeLoad(content, { json: true }); } catch (err) { logger.warn({ err, content }, 'Failed to parse .travis.yml file.'); return null;