From 75c0ca60656f7aae11c5548c22bfe683921e2120 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Tue, 2 Jun 2020 15:58:47 +0200 Subject: [PATCH] refactor(platform): pass CommitFilesConfig through --- lib/platform/bitbucket-server/index.ts | 27 +++++--------------------- lib/platform/bitbucket/index.ts | 15 +++++--------- lib/platform/gitea/index.ts | 12 ++---------- lib/platform/github/index.ts | 14 ++++--------- lib/platform/gitlab/index.ts | 15 +++++--------- 5 files changed, 21 insertions(+), 62 deletions(-) diff --git a/lib/platform/bitbucket-server/index.ts b/lib/platform/bitbucket-server/index.ts index a65f648a03..83d32dceee 100644 --- a/lib/platform/bitbucket-server/index.ts +++ b/lib/platform/bitbucket-server/index.ts @@ -443,32 +443,15 @@ export function getAllRenovateBranches( return config.storage.getAllRenovateBranches(branchPrefix); } -export async function commitFiles({ - branchName, - files, - message, -}: CommitFilesConfig): Promise<string | null> { - logger.debug( - `commitFiles(${JSON.stringify( - { - branchName, - filesLength: files.length, - message, - }, - null, - 2 - )})` - ); - const commit = config.storage.commitFiles({ - branchName, - files, - message, - }); +export async function commitFiles( + commitFilesConfig: CommitFilesConfig +): Promise<string | null> { + const commit = config.storage.commitFiles(commitFilesConfig); // wait for pr change propagation await delay(1000); // refresh cache - await getBranchPr(branchName, true); + await getBranchPr(commitFilesConfig.branchName, true); return commit; } diff --git a/lib/platform/bitbucket/index.ts b/lib/platform/bitbucket/index.ts index bd85cf7916..0b89dc1b6c 100644 --- a/lib/platform/bitbucket/index.ts +++ b/lib/platform/bitbucket/index.ts @@ -295,16 +295,11 @@ export function mergeBranch(branchName: string): Promise<void> { return config.storage.mergeBranch(branchName); } -export function commitFiles({ - branchName, - files, - message, -}: CommitFilesConfig): Promise<string | null> { - return config.storage.commitFiles({ - branchName, - files, - message, - }); +// istanbul ignore next +export function commitFiles( + commitFilesConfig: CommitFilesConfig +): Promise<string | null> { + return config.storage.commitFiles(commitFilesConfig); } export function getCommitMessages(): Promise<string[]> { diff --git a/lib/platform/gitea/index.ts b/lib/platform/gitea/index.ts index 62947e6bd2..fcd45dc121 100644 --- a/lib/platform/gitea/index.ts +++ b/lib/platform/gitea/index.ts @@ -865,16 +865,8 @@ const platform: Platform = { return Promise.resolve(); }, - commitFiles({ - branchName, - files, - message, - }: CommitFilesConfig): Promise<string | null> { - return config.storage.commitFiles({ - branchName, - files, - message, - }); + commitFiles(commitFilesConfig: CommitFilesConfig): Promise<string | null> { + return config.storage.commitFiles(commitFilesConfig); }, getPrBody(prBody: string): string { diff --git a/lib/platform/github/index.ts b/lib/platform/github/index.ts index f2017cbddb..62f77f00ab 100644 --- a/lib/platform/github/index.ts +++ b/lib/platform/github/index.ts @@ -568,16 +568,10 @@ export function mergeBranch(branchName: string): Promise<void> { } // istanbul ignore next -export function commitFiles({ - branchName, - files, - message, -}: CommitFilesConfig): Promise<string | null> { - return config.storage.commitFiles({ - branchName, - files, - message, - }); +export function commitFiles( + commitFilesConfig: CommitFilesConfig +): Promise<string | null> { + return config.storage.commitFiles(commitFilesConfig); } // istanbul ignore next diff --git a/lib/platform/gitlab/index.ts b/lib/platform/gitlab/index.ts index 532dcd9707..9fe89571d4 100644 --- a/lib/platform/gitlab/index.ts +++ b/lib/platform/gitlab/index.ts @@ -632,16 +632,11 @@ export function isBranchStale(branchName: string): Promise<boolean> { return config.storage.isBranchStale(branchName); } -export function commitFiles({ - branchName, - files, - message, -}: CommitFilesConfig): Promise<string | null> { - return config.storage.commitFiles({ - branchName, - files, - message, - }); +// istanbul ignore next +export function commitFiles( + commitFilesConfig: CommitFilesConfig +): Promise<string | null> { + return config.storage.commitFiles(commitFilesConfig); } export function getFile( -- GitLab