From fc9037a270d68b93442e288112c4a9fde60fd9fe Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 20 Sep 2018 12:13:18 +0200
Subject: [PATCH] logs: correct depName/dependency
---
lib/datasource/nuget.js | 2 +-
lib/datasource/pypi.js | 2 +-
lib/manager/bazel/extract.js | 2 +-
lib/manager/buildkite/extract.js | 4 ++--
lib/util/package-rules.js | 2 +-
lib/workers/repository/process/fetch.js | 6 +++---
lib/workers/repository/process/lookup/index.js | 2 +-
lib/workers/repository/process/lookup/rollback.js | 5 ++++-
8 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/lib/datasource/nuget.js b/lib/datasource/nuget.js
index 913b7c8aac..c7c08b289e 100644
--- a/lib/datasource/nuget.js
+++ b/lib/datasource/nuget.js
@@ -37,7 +37,7 @@ async function getPkgReleases(purl) {
}
}
} catch (err) /* istanbul ignore next */ {
- logger.debug({ depName: name }, 'Error looking up nuspec');
+ logger.debug({ dependency: name }, 'Error looking up nuspec');
}
logger.trace({ dep }, 'dep');
return dep;
diff --git a/lib/datasource/pypi.js b/lib/datasource/pypi.js
index 16770d4889..0dc0b05b9b 100644
--- a/lib/datasource/pypi.js
+++ b/lib/datasource/pypi.js
@@ -34,7 +34,7 @@ async function getPkgReleases(purl, config = {}) {
});
const dep = rep && rep.body;
if (!dep) {
- logger.debug({ depName }, 'pip package not found');
+ logger.debug({ dependency: depName }, 'pip package not found');
return null;
}
if (
diff --git a/lib/manager/bazel/extract.js b/lib/manager/bazel/extract.js
index ba5689adc4..ad51b54517 100644
--- a/lib/manager/bazel/extract.js
+++ b/lib/manager/bazel/extract.js
@@ -42,7 +42,7 @@ function extractDependencies(content) {
if (match) {
[, sha256] = match;
}
- logger.debug({ depName, remote, currentValue });
+ logger.debug({ dependency: depName, remote, currentValue });
const urlPattern = /^https:\/\/github.com\/([^\\/]+\/[^\\/]+)\/releases\/download\/([^\\/]+)\/.*?\.tar\.gz$/;
if (def.startsWith('git_repository') && depName && remote && currentValue) {
dep.depType = 'git_repository';
diff --git a/lib/manager/buildkite/extract.js b/lib/manager/buildkite/extract.js
index 10cbce2e81..a59ba5216c 100644
--- a/lib/manager/buildkite/extract.js
+++ b/lib/manager/buildkite/extract.js
@@ -27,7 +27,7 @@ function extractDependencies(content) {
let skipReason;
let repo;
if (depName.startsWith('https://') || depName.startsWith('git@')) {
- logger.debug({ depName }, 'Skipping git plugin');
+ logger.debug({ dependency: depName }, 'Skipping git plugin');
skipReason = 'git-plugin';
} else if (!isVersion(currentValue)) {
logger.debug(
@@ -43,7 +43,7 @@ function extractDependencies(content) {
repo = `${depName}-buildkite-plugin`;
} else {
logger.warn(
- { depName },
+ { dependency: depName },
'Something is wrong with buildkite plugin name'
);
skipReason = 'unknown';
diff --git a/lib/util/package-rules.js b/lib/util/package-rules.js
index b54cc3472f..7fbd6a2394 100644
--- a/lib/util/package-rules.js
+++ b/lib/util/package-rules.js
@@ -21,7 +21,7 @@ function applyPackageRules(inputConfig) {
} = config;
const packageRules = config.packageRules || [];
logger.trace(
- { depName, packageRules },
+ { dependency: depName, packageRules },
`Checking against ${packageRules.length} packageRules`
);
packageRules.forEach(packageRule => {
diff --git a/lib/workers/repository/process/fetch.js b/lib/workers/repository/process/fetch.js
index 7cc9e9f90a..5f758f1d89 100644
--- a/lib/workers/repository/process/fetch.js
+++ b/lib/workers/repository/process/fetch.js
@@ -22,19 +22,19 @@ async function fetchDepUpdates(packageFileConfig, dep) {
let depConfig = mergeChildConfig(packageFileConfig, dep);
depConfig = applyPackageRules(depConfig);
if (depConfig.ignoreDeps.includes(depName)) {
- logger.debug({ depName: dep.depName }, 'Dependency is ignored');
+ logger.debug({ dependency: dep.depName }, 'Dependency is ignored');
dep.skipReason = 'ignored';
} else if (
depConfig.internalPackages &&
depConfig.internalPackages.includes(depName)
) {
logger.debug(
- { depName: dep.depName },
+ { dependency: dep.depName },
'Dependency is ignored due to being internal'
);
dep.skipReason = 'internal-package';
} else if (depConfig.enabled === false) {
- logger.debug({ depName: dep.depName }, 'Dependency is disabled');
+ logger.debug({ dependency: dep.depName }, 'Dependency is disabled');
dep.skipReason = 'disabled';
} else {
let lookupResults;
diff --git a/lib/workers/repository/process/lookup/index.js b/lib/workers/repository/process/lookup/index.js
index d041c16657..27822416ea 100644
--- a/lib/workers/repository/process/lookup/index.js
+++ b/lib/workers/repository/process/lookup/index.js
@@ -14,7 +14,7 @@ module.exports = {
async function lookupUpdates(config) {
const { depName, currentValue } = config;
- logger.trace({ depName, currentValue }, 'lookupUpdates');
+ logger.trace({ dependency: depName, currentValue }, 'lookupUpdates');
const {
equals,
getMajor,
diff --git a/lib/workers/repository/process/lookup/rollback.js b/lib/workers/repository/process/lookup/rollback.js
index 823df334f1..fb87cea439 100644
--- a/lib/workers/repository/process/lookup/rollback.js
+++ b/lib/workers/repository/process/lookup/rollback.js
@@ -32,7 +32,10 @@ function getRollbackUpdate(config, versions) {
{ packageFile, depName, currentValue },
`Current version not found - rolling back`
);
- logger.debug({ depName, versions }, 'Versions found before rolling back');
+ logger.debug(
+ { dependency: depName, versions },
+ 'Versions found before rolling back'
+ );
lessThanVersions.sort(sortVersions);
const toVersion = lessThanVersions.pop();
let fromVersion;
--
GitLab