From 281507e4210061e5d24d3b08fee61583c86a6321 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 1 Oct 2018 16:29:50 +0200
Subject: [PATCH] refactor: getArtifacts return nested object
---
lib/manager/composer/artifacts.js | 6 ++++--
lib/manager/gomod/artifacts.js | 6 ++++--
lib/workers/branch/get-updated.js | 9 ++++++---
test/workers/branch/get-updated.spec.js | 6 ++++--
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/lib/manager/composer/artifacts.js b/lib/manager/composer/artifacts.js
index 193a241d02..4aeb6205d8 100644
--- a/lib/manager/composer/artifacts.js
+++ b/lib/manager/composer/artifacts.js
@@ -104,8 +104,10 @@ async function getArtifacts(
}
logger.debug('Returning updated composer.lock');
return {
- name: lockFileName,
- contents: await fs.readFile(localLockFileName, 'utf8'),
+ file: {
+ name: lockFileName,
+ contents: await fs.readFile(localLockFileName, 'utf8'),
+ },
};
} catch (err) {
if (
diff --git a/lib/manager/gomod/artifacts.js b/lib/manager/gomod/artifacts.js
index 8b69ef4545..d4851dc57f 100644
--- a/lib/manager/gomod/artifacts.js
+++ b/lib/manager/gomod/artifacts.js
@@ -86,8 +86,10 @@ async function getArtifacts(
}
logger.debug('Returning updated go.sum');
return {
- name: sumFileName,
- contents: await fs.readFile(localGoSumFileName, 'utf8'),
+ file: {
+ name: sumFileName,
+ contents: await fs.readFile(localGoSumFileName, 'utf8'),
+ },
};
} catch (err) {
logger.warn({ err, message: err.message }, 'Failed to generate go.sum');
diff --git a/lib/workers/branch/get-updated.js b/lib/workers/branch/get-updated.js
index 7c6c288971..fdfe0c09ff 100644
--- a/lib/workers/branch/get-updated.js
+++ b/lib/workers/branch/get-updated.js
@@ -58,14 +58,17 @@ async function getUpdatedPackageFiles(config) {
const updatedDeps = packageFileUpdatedDeps[packageFile.name];
const getArtifacts = get(manager, 'getArtifacts');
if (getArtifacts) {
- const updatedLockFile = await getArtifacts(
+ const res = await getArtifacts(
packageFile.name,
updatedDeps,
packageFile.contents,
config
);
- if (updatedLockFile) {
- updatedLockFiles.push(updatedLockFile);
+ if (res) {
+ const { file } = res;
+ if (file) {
+ updatedLockFiles.push(file);
+ }
}
}
}
diff --git a/test/workers/branch/get-updated.spec.js b/test/workers/branch/get-updated.spec.js
index 8965ef312e..3a9027110f 100644
--- a/test/workers/branch/get-updated.spec.js
+++ b/test/workers/branch/get-updated.spec.js
@@ -50,8 +50,10 @@ describe('workers/branch/get-updated', () => {
});
composer.updateDependency.mockReturnValue('some new content');
composer.getArtifacts.mockReturnValue({
- name: 'composer.json',
- contents: 'some contents',
+ file: {
+ name: 'composer.json',
+ contents: 'some contents',
+ },
});
const res = await getUpdatedPackageFiles(config);
expect(res).toMatchSnapshot();
--
GitLab