refactor: reduce platform defaultBranch storage (#6833)

renovatebot · Jul 23, 2020 · 04949af · 04949af
1 parent f37697e
commit 04949af
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/lib/platform/azure/index.ts b/lib/platform/azure/index.ts
@@ -40,7 +40,6 @@ import { AzurePr } from './types';
 interface Config {
   repoForceRebase: boolean;
   mergeMethod: GitPullRequestMergeStrategy;
-  defaultBranch: string;
   owner: string;
   repoId: string;
   project: string;
@@ -116,8 +115,8 @@ export async function initRepo({
   config.owner = '?owner?';
   logger.debug(`${repository} owner = ${config.owner}`);
   // Use default branch as PR target unless later overridden
-  config.defaultBranch = repo.defaultBranch.replace('refs/heads/', '');
-  logger.debug(`${repository} default branch = ${config.defaultBranch}`);
+  const defaultBranch = repo.defaultBranch.replace('refs/heads/', '');
+  logger.debug(`${repository} default branch = ${defaultBranch}`);
   config.mergeMethod = await azureHelper.getMergeMethod(repo.id, names.project);
   config.repoForceRebase = false;
 
@@ -131,7 +130,7 @@ export async function initRepo({
       const json = await azureHelper.getFile(
         repo.id,
         'renovate.json',
-        config.defaultBranch
+        defaultBranch
       );
       renovateConfig = JSON.parse(json);
     } catch {
@@ -159,7 +158,7 @@ export async function initRepo({
     gitAuthorEmail: global.gitAuthor?.email,
   });
   const repoConfig: RepoConfig = {
-    defaultBranch: config.defaultBranch,
+    defaultBranch,
     isFork: false,
   };
   return repoConfig;

diff --git a/lib/platform/bitbucket-server/index.ts b/lib/platform/bitbucket-server/index.ts
@@ -196,14 +196,14 @@ export async function initRepo({
     ).body;
     config.owner = info.project.key;
     logger.debug(`${repository} owner = ${config.owner}`);
-    config.defaultBranch = (
+    const defaultBranch = (
       await bitbucketServerHttp.getJson<{ displayId: string }>(
         `./rest/api/1.0/projects/${config.projectKey}/repos/${config.repositorySlug}/branches/default`
       )
     ).body.displayId;
     config.mergeMethod = 'merge';
     const repoConfig: RepoConfig = {
-      defaultBranch: config.defaultBranch,
+      defaultBranch,
       isFork: !!info.parent,
     };
     return repoConfig;

diff --git a/lib/platform/bitbucket-server/types.ts b/lib/platform/bitbucket-server/types.ts
@@ -2,7 +2,6 @@ import { Pr } from '../common';
 
 export interface BbsConfig {
   bbUseDefaultReviewers: boolean;
-  defaultBranch: string;
   fileList: any[];
   mergeMethod: string;
   owner: string;

diff --git a/lib/platform/bitbucket/index.ts b/lib/platform/bitbucket/index.ts
@@ -125,7 +125,6 @@ export async function initRepo({
 
     Object.assign(config, {
       owner: info.owner,
-      defaultBranch: info.mainbranch,
       mergeMethod: info.mergeMethod,
       has_issues: info.has_issues,
     });
@@ -161,7 +160,7 @@ export async function initRepo({
     gitAuthorEmail: global.gitAuthor?.email,
   });
   const repoConfig: RepoConfig = {
-    defaultBranch: config.defaultBranch,
+    defaultBranch: info.mainbranch,
     isFork: info.isFork,
   };
   return repoConfig;

diff --git a/lib/platform/gitea/index.ts b/lib/platform/gitea/index.ts
@@ -46,7 +46,6 @@ type GiteaRenovateConfig = {
 interface GiteaRepoConfig {
   repository: string;
   localDir: string;
-  defaultBranch: string;
   mergeMethod: helper.PRMergeMethod;
 
   prList: Promise<Pr[]> | null;
@@ -278,15 +277,15 @@ const platform: Platform = {
     }
 
     // Determine author email and branches
-    config.defaultBranch = repo.default_branch;
-    logger.debug(`${repository} default branch = ${config.defaultBranch}`);
+    const defaultBranch = repo.default_branch;
+    logger.debug(`${repository} default branch = ${defaultBranch}`);
 
     // Optionally check if Renovate is disabled by attempting to fetch default configuration file
     if (optimizeForDisabled) {
       try {
         renovateConfig = await retrieveDefaultConfig(
           config.repository,
-          config.defaultBranch
+          defaultBranch
         );
       } catch (err) {
         // Do nothing
@@ -319,7 +318,7 @@ const platform: Platform = {
     config.labelList = null;
 
     return {
-      defaultBranch: config.defaultBranch,
+      defaultBranch,
       isFork: !!repo.fork,
     };
   },

diff --git a/lib/platform/gitlab/index.ts b/lib/platform/gitlab/index.ts
@@ -59,7 +59,6 @@ const defaultConfigFile = configFileNames[0];
 let config: {
   repository: string;
   localDir: string;
-  defaultBranch: string;
   email: string;
   prList: any[];
   issueList: any[];
@@ -147,6 +146,7 @@ export async function initRepo({
   config.localDir = localDir;
 
   let res: HttpResponse<RepoResponse>;
+  let defaultBranch: string;
   try {
     res = await gitlabApi.getJson<RepoResponse>(
       `projects/${config.repository}`
@@ -198,9 +198,9 @@ export async function initRepo({
         throw new Error(REPOSITORY_DISABLED);
       }
     }
-    config.defaultBranch = res.body.default_branch;
+    defaultBranch = res.body.default_branch;
     config.mergeMethod = res.body.merge_method || 'merge';
-    logger.debug(`${repository} default branch = ${config.defaultBranch}`);
+    logger.debug(`${repository} default branch = ${defaultBranch}`);
     delete config.prList;
     logger.debug('Enabling Git FS');
     const opts = hostRules.find({
@@ -253,7 +253,7 @@ export async function initRepo({
     throw err;
   }
   const repoConfig: RepoConfig = {
-    defaultBranch: config.defaultBranch,
+    defaultBranch,
     isFork: !!res.body.forked_from_project,
   };
   return repoConfig;