From 4591729a058557db3619b981d1a2ae1080f50de0 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 22 Jul 2019 09:05:53 +0200
Subject: [PATCH] refactor: buildkite managerData
---
lib/manager/buildkite/extract.js | 2 +-
lib/manager/buildkite/update.js | 4 +--
.../__snapshots__/extract.spec.js.snap | 32 ++++++++++++++-----
test/manager/buildkite/update.spec.js | 12 +++----
4 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/lib/manager/buildkite/extract.js b/lib/manager/buildkite/extract.js
index c31963bdd1..ef2a946fff 100644
--- a/lib/manager/buildkite/extract.js
+++ b/lib/manager/buildkite/extract.js
@@ -47,7 +47,7 @@ function extractPackageFile(content) {
}
}
const dep = {
- lineNumber,
+ managerData: { lineNumber },
depName,
currentValue,
skipReason,
diff --git a/lib/manager/buildkite/update.js b/lib/manager/buildkite/update.js
index e5f80fc98d..9275ba513a 100644
--- a/lib/manager/buildkite/update.js
+++ b/lib/manager/buildkite/update.js
@@ -8,7 +8,7 @@ function updateDependency(currentFileContent, upgrade) {
try {
logger.debug(`buildkite.updateDependency: ${upgrade.newValue}`);
const lines = currentFileContent.split('\n');
- const lineToChange = lines[upgrade.lineNumber];
+ const lineToChange = lines[upgrade.managerData.lineNumber];
const depLine = new RegExp(/^(\s+[^#]+#)[^:]+(:.*)$/);
if (!lineToChange.match(depLine)) {
logger.debug('No image line found');
@@ -19,7 +19,7 @@ function updateDependency(currentFileContent, upgrade) {
logger.debug('No changes necessary');
return currentFileContent;
}
- lines[upgrade.lineNumber] = newLine;
+ lines[upgrade.managerData.lineNumber] = newLine;
return lines.join('\n');
} catch (err) {
logger.info({ err }, 'Error setting new buildkite version');
diff --git a/test/manager/buildkite/__snapshots__/extract.spec.js.snap b/test/manager/buildkite/__snapshots__/extract.spec.js.snap
index cc4e1f4a9f..6539de18fb 100644
--- a/test/manager/buildkite/__snapshots__/extract.spec.js.snap
+++ b/test/manager/buildkite/__snapshots__/extract.spec.js.snap
@@ -5,19 +5,25 @@ Array [
Object {
"currentValue": "v1.3.2.5",
"depName": "namespace/docker-compose",
- "lineNumber": 4,
+ "managerData": Object {
+ "lineNumber": 4,
+ },
"skipReason": "invalid-version",
},
Object {
"currentValue": "v1.3.2",
"depName": "https://github.com/buildkite/plugin-docker-compose",
- "lineNumber": 15,
+ "managerData": Object {
+ "lineNumber": 15,
+ },
"skipReason": "git-plugin",
},
Object {
"currentValue": "v1.3.2",
"depName": "github.com/buildkite/plugin-docker-compose",
- "lineNumber": 22,
+ "managerData": Object {
+ "lineNumber": 22,
+ },
"skipReason": "unknown",
},
]
@@ -29,16 +35,20 @@ Array [
"currentValue": "v2.0.1",
"datasource": "github",
"depName": "docker-login",
- "lineNumber": 2,
"lookupName": "buildkite-plugins/docker-login-buildkite-plugin",
+ "managerData": Object {
+ "lineNumber": 2,
+ },
"skipReason": undefined,
},
Object {
"currentValue": "v2.0.1",
"datasource": "github",
"depName": "docker-login",
- "lineNumber": 10,
"lookupName": "buildkite-plugins/docker-login-buildkite-plugin",
+ "managerData": Object {
+ "lineNumber": 10,
+ },
"skipReason": undefined,
},
]
@@ -50,16 +60,20 @@ Array [
"currentValue": "v1.3.2",
"datasource": "github",
"depName": "docker-compose",
- "lineNumber": 4,
"lookupName": "buildkite-plugins/docker-compose-buildkite-plugin",
+ "managerData": Object {
+ "lineNumber": 4,
+ },
"skipReason": undefined,
},
Object {
"currentValue": "v1.3.2",
"datasource": "github",
"depName": "docker-compose",
- "lineNumber": 15,
"lookupName": "buildkite-plugins/docker-compose-buildkite-plugin",
+ "managerData": Object {
+ "lineNumber": 15,
+ },
"skipReason": undefined,
},
]
@@ -71,8 +85,10 @@ Array [
"currentValue": "v2.0.0",
"datasource": "github",
"depName": "abc/detect-clowns",
- "lineNumber": 2,
"lookupName": "abc/detect-clowns-buildkite-plugin",
+ "managerData": Object {
+ "lineNumber": 2,
+ },
"skipReason": undefined,
},
]
diff --git a/test/manager/buildkite/update.spec.js b/test/manager/buildkite/update.spec.js
index 30db0d08b3..c1e80933e0 100644
--- a/test/manager/buildkite/update.spec.js
+++ b/test/manager/buildkite/update.spec.js
@@ -18,7 +18,7 @@ describe('manager/buildkite/update', () => {
describe('updateDependency', () => {
it('replaces existing value', () => {
const upgrade = {
- lineNumber: 2,
+ managerData: { lineNumber: 2 },
newValue: 'v2.2.0',
};
const res = bkUpdate.updateDependency(pipeline1, upgrade);
@@ -27,7 +27,7 @@ describe('manager/buildkite/update', () => {
});
it('replaces arrays', () => {
const upgrade = {
- lineNumber: 10,
+ managerData: { lineNumber: 10 },
newValue: 'v2.2.0',
};
const res = bkUpdate.updateDependency(pipeline4, upgrade);
@@ -36,14 +36,14 @@ describe('manager/buildkite/update', () => {
});
it('replaces two values in one file', () => {
const upgrade1 = {
- lineNumber: 4,
+ managerData: { lineNumber: 4 },
newValue: 'v1.5.0',
};
const res1 = bkUpdate.updateDependency(pipeline2, upgrade1);
expect(res1).not.toEqual(pipeline2);
expect(res1.includes(upgrade1.newValue)).toBe(true);
const upgrade2 = {
- lineNumber: 15,
+ managerData: { lineNumber: 15 },
newValue: 'v1.5.0',
};
const res2 = bkUpdate.updateDependency(res1, upgrade2);
@@ -52,7 +52,7 @@ describe('manager/buildkite/update', () => {
});
it('returns same', () => {
const upgrade = {
- lineNumber: 2,
+ managerData: { lineNumber: 2 },
newValue: 'v2.0.0',
};
const res = bkUpdate.updateDependency(pipeline1, upgrade);
@@ -60,7 +60,7 @@ describe('manager/buildkite/update', () => {
});
it('returns null if mismatch', () => {
const upgrade = {
- lineNumber: 3,
+ managerData: { lineNumber: 3 },
newValue: 'v2.2.0',
};
const res = bkUpdate.updateDependency(pipeline1, upgrade);
--
GitLab