Skip to content
Snippets Groups Projects
Commit 68bcb5e7 authored by Rhys Arkins's avatar Rhys Arkins Committed by singapore
Browse files

fix: convert for loop to for..of (#915)

* fix: convert for loop to for..of

* chore: lessen preset debugging

* chore: set detectPackageFiles to debug

* fix lint
parent bf2491bf
No related branches found
No related tags found
No related merge requests found
...@@ -22,13 +22,15 @@ async function resolveConfigPresets( ...@@ -22,13 +22,15 @@ async function resolveConfigPresets(
let config = {}; let config = {};
// First, merge all the preset configs from left to right // First, merge all the preset configs from left to right
if (inputConfig.extends && inputConfig.extends.length) { if (inputConfig.extends && inputConfig.extends.length) {
logger.debug('Found presets'); if (existingPresets.length === 0) {
logger.info('Found presets');
}
for (const preset of inputConfig.extends) { for (const preset of inputConfig.extends) {
// istanbul ignore if // istanbul ignore if
if (existingPresets.indexOf(preset) !== -1) { if (existingPresets.indexOf(preset) !== -1) {
logger.warn(`Already seen preset ${preset} in ${existingPresets}`); logger.warn(`Already seen preset ${preset} in ${existingPresets}`);
} else { } else {
logger.debug(`Resolving preset "${preset}"`); logger.trace(`Resolving preset "${preset}"`);
const presetConfig = await resolveConfigPresets( const presetConfig = await resolveConfigPresets(
await getPreset(preset, logger), await getPreset(preset, logger),
logger, logger,
...@@ -138,7 +140,7 @@ function parsePreset(input) { ...@@ -138,7 +140,7 @@ function parsePreset(input) {
} }
async function getPreset(preset, logger) { async function getPreset(preset, logger) {
logger.debug(`getPreset(${preset})`); logger.trace(`getPreset(${preset})`);
const { packageName, presetName, params } = parsePreset(preset); const { packageName, presetName, params } = parsePreset(preset);
let presetConfig; let presetConfig;
try { try {
...@@ -167,7 +169,7 @@ async function getPreset(preset, logger) { ...@@ -167,7 +169,7 @@ async function getPreset(preset, logger) {
} }
presetConfig = replaceArgs(presetConfig, argMapping); presetConfig = replaceArgs(presetConfig, argMapping);
} }
logger.debug({ presetConfig }, `Applied params to preset ${preset}`); logger.trace({ presetConfig }, `Applied params to preset ${preset}`);
const presetKeys = Object.keys(presetConfig); const presetKeys = Object.keys(presetConfig);
if ( if (
presetKeys.length === 2 && presetKeys.length === 2 &&
......
...@@ -238,7 +238,7 @@ async function mergeRenovateJson(config, branchName) { ...@@ -238,7 +238,7 @@ async function mergeRenovateJson(config, branchName) {
async function detectPackageFiles(input) { async function detectPackageFiles(input) {
const config = { ...input }; const config = { ...input };
const { logger } = config; const { logger } = config;
logger.trace({ config }, 'detectPackageFiles'); logger.debug({ config }, 'detectPackageFiles');
config.types = {}; config.types = {};
if (config.npm.enabled !== false) { if (config.npm.enabled !== false) {
config.packageFiles = await config.api.findFilePaths('package.json'); config.packageFiles = await config.api.findFilePaths('package.json');
......
...@@ -21,7 +21,9 @@ async function determineRepoUpgrades(config) { ...@@ -21,7 +21,9 @@ async function determineRepoUpgrades(config) {
} }
let upgrades = []; let upgrades = [];
// Iterate through repositories sequentially // Iterate through repositories sequentially
for (let index = 0; index < config.packageFiles.length; index += 1) { let index = 0;
for (const packageFile of config.packageFiles) {
logger.trace({ packageFile }, 'Getting packageFile config');
const packageFileConfig = module.exports.getPackageFileConfig( const packageFileConfig = module.exports.getPackageFileConfig(
config, config,
index index
...@@ -45,6 +47,7 @@ async function determineRepoUpgrades(config) { ...@@ -45,6 +47,7 @@ async function determineRepoUpgrades(config) {
await packageFileWorker.renovateDockerfile(packageFileConfig) await packageFileWorker.renovateDockerfile(packageFileConfig)
); );
} }
index += 1;
} }
logger.info( logger.info(
{ seconds: convertHrTime(process.hrtime(startTime)).seconds }, { seconds: convertHrTime(process.hrtime(startTime)).seconds },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment