Apply code review suggestions

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · Sep 7, 2022 · 7d387bc · 7d387bc
1 parent f455072
commit 7d387bc
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 24 deletions.
diff --git a/lib/modules/platform/azure/index.ts b/lib/modules/platform/azure/index.ts
@@ -747,7 +747,7 @@ export function massageMarkdown(input: string): string {
       'rename PR to start with "rebase!"'
     )
     .replace(regEx(`\n---\n\n.*?<!-- rebase-check -->.*?\n`), '')
-    .replace(regEx(/<!--renovate-(debug|config-hash):.*?-->/), '');
+    .replace(regEx(/<!--renovate-(debug|config-hash):.*?-->/g), '');
 }
 
 /* istanbul ignore next */

diff --git a/lib/modules/platform/bitbucket/index.ts b/lib/modules/platform/bitbucket/index.ts
@@ -487,7 +487,7 @@ export function massageMarkdown(input: string): string {
     .replace(regEx(/<\/?details>/g), '')
     .replace(regEx(`\n---\n\n.*?<!-- rebase-check -->.*?\n`), '')
     .replace(regEx(/\]\(\.\.\/pull\//g), '](../../pull-requests/')
-    .replace(regEx(/<!--renovate-(debug|config-hash):.*?-->/), '');
+    .replace(regEx(/<!--renovate-(debug|config-hash):.*?-->/g), '');
 }
 
 export async function ensureIssue({

diff --git a/lib/modules/platform/pr-body.spec.ts b/lib/modules/platform/pr-body.spec.ts
@@ -1,5 +1,4 @@
 import hasha from 'hasha';
-import { toBase64 } from '../../util/string';
 import { getPrBodyStruct, hashBody } from './pr-body';
 
 describe('modules/platform/pr-body', () => {
@@ -84,8 +83,7 @@ describe('modules/platform/pr-body', () => {
     it('returns raw config hash', () => {
       const config = '{}';
       const rawConfigHash = hasha(config, { algorithm: 'sha256' });
-      const encodedHash = toBase64(rawConfigHash);
-      const input = `<!--renovate-config-hash:${encodedHash})-->`;
+      const input = `<!--renovate-config-hash:${rawConfigHash}-->`;
       const hash = hashBody(input);
       expect(getPrBodyStruct(input)).toEqual({
         hash,

diff --git a/lib/modules/platform/pr-body.ts b/lib/modules/platform/pr-body.ts
@@ -10,13 +10,11 @@ export const prDebugDataRe = regEx(
   /\n?<!--renovate-debug:(?<payload>.*?)-->\n?/
 );
 
-export const renovateConfigHashRe = regEx(
+const renovateConfigHashRe = regEx(
   /\n?<!--renovate-config-hash:(?<payload>.*?)-->\n?/
 );
 
-export const prCheckboxRe = regEx(
-  /- (?<checkbox>\[[\sx]]) <!-- rebase-check -->/
-);
+const prCheckboxRe = regEx(/- (?<checkbox>\[[\sx]]) <!-- rebase-check -->/);
 
 function noWhitespaceOrHeadings(input: string): string {
   return input.replace(regEx(/\r?\n|\r|\s|#/g), '');
@@ -70,7 +68,7 @@ export function getPrBodyStruct(
 
   const rawConfigHash = getRenovateConfigHashPayload(body);
   if (rawConfigHash) {
-    result.rawConfigHash = fromBase64(rawConfigHash);
+    result.rawConfigHash = rawConfigHash;
   }
 
   const debugPayload = getRenovateDebugPayload(body);

diff --git a/lib/workers/repository/index.ts b/lib/workers/repository/index.ts
@@ -42,9 +42,9 @@ export async function renovateRepository(
     logger.debug('Using localDir: ' + localDir);
     config = await initRepo(config);
     addSplit('init');
-    const preformExtract =
+    const performExtract =
       config.repoIsOnboarded! || OnboardingState.prUpdateRequested;
-    const { branches, branchList, packageFiles } = preformExtract
+    const { branches, branchList, packageFiles } = performExtract
       ? await extractDependencies(config)
       : emptyExtract(config);
     if (
@@ -56,7 +56,7 @@ export async function renovateRepository(
       const res = await updateRepo(config, branches);
       setMeta({ repository: config.repository });
       addSplit('update');
-      if (preformExtract) {
+      if (performExtract) {
         await setBranchCache(branches); // update branch cache if preformed extraction
       }
       if (res === 'automerged') {

diff --git a/lib/workers/repository/onboarding/branch/index.spec.ts b/lib/workers/repository/onboarding/branch/index.spec.ts
@@ -264,7 +264,7 @@ describe('workers/repository/onboarding/branch/index', () => {
 
         await checkOnboardingBranch(config);
 
-        expect(logger.debug).toHaveBeenCalledWith(
+        expect(logger.trace).toHaveBeenCalledWith(
           `Platform '${pl}' does not support extended markdown`
         );
         expect(OnboardingState.prUpdateRequested).toBeTrue();

diff --git a/lib/workers/repository/onboarding/branch/index.ts b/lib/workers/repository/onboarding/branch/index.ts
@@ -39,8 +39,8 @@ export async function checkOnboardingBranch(
   if (onboardingPr) {
     const pl = GlobalConfig.get('platform')!;
     const { rebaseRequested, rawConfigHash } = onboardingPr.bodyStruct ?? {};
-    if (!['github', 'gitlab'].includes(pl)) {
-      logger.debug(`Platform '${pl}' does not support extended markdown`);
+    if (!['github', 'gitlab', 'gitea'].includes(pl)) {
+      logger.trace(`Platform '${pl}' does not support extended markdown`);
       OnboardingState.prUpdateRequested = true;
     } else if (is.nullOrUndefined(rebaseRequested)) {
       logger.debug('No rebase checkbox was found in the onboarding PR');

diff --git a/lib/workers/repository/onboarding/common.ts b/lib/workers/repository/onboarding/common.ts
@@ -12,15 +12,15 @@ export class OnboardingState {
   private static updateRequested = false;
 
   static get prUpdateRequested(): boolean {
-    logger.debug(
+    logger.trace(
       { value: this.updateRequested },
       'Get OnboardingState.prUpdateRequested'
     );
     return this.updateRequested;
   }
 
   static set prUpdateRequested(value: boolean) {
-    logger.debug({ value }, 'Set OnboardingState.prUpdateRequested');
+    logger.trace({ value }, 'Set OnboardingState.prUpdateRequested');
     this.updateRequested = value;
   }
 }

diff --git a/lib/workers/repository/onboarding/pr/__snapshots__/index.spec.ts.snap b/lib/workers/repository/onboarding/pr/__snapshots__/index.spec.ts.snap
@@ -33,7 +33,7 @@ If you need any further assistance then you can also [request help here](https:/
 
 
 
-<!--renovate-config-hash:ZTNiMGM0NDI5OGZjMWMxNDlhZmJmNGM4OTk2ZmI5MjQyN2FlNDFlNDY0OWI5MzRjYTQ5NTk5MWI3ODUyYjg1NQ==-->"
+<!--renovate-config-hash:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855-->"
 `;
 
 exports[`workers/repository/onboarding/pr/index ensureOnboardingPr() creates PR with footer and header using templating 1`] = `
@@ -69,7 +69,7 @@ If you need any further assistance then you can also [request help here](https:/
 
 And this is a footer for repository:test baseBranch:some-branch
 
-<!--renovate-config-hash:ZTNiMGM0NDI5OGZjMWMxNDlhZmJmNGM4OTk2ZmI5MjQyN2FlNDFlNDY0OWI5MzRjYTQ5NTk5MWI3ODUyYjg1NQ==-->"
+<!--renovate-config-hash:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855-->"
 `;
 
 exports[`workers/repository/onboarding/pr/index ensureOnboardingPr() creates PR with footer and header with trailing and leading newlines 1`] = `
@@ -110,5 +110,5 @@ There should be several empty lines at the end of the PR
 
 
 
-<!--renovate-config-hash:ZTNiMGM0NDI5OGZjMWMxNDlhZmJmNGM4OTk2ZmI5MjQyN2FlNDFlNDY0OWI5MzRjYTQ5NTk5MWI3ODUyYjg1NQ==-->"
+<!--renovate-config-hash:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855-->"
 `;
diff --git a/lib/workers/repository/onboarding/pr/index.spec.ts b/lib/workers/repository/onboarding/pr/index.spec.ts
@@ -23,7 +23,7 @@ describe('workers/repository/onboarding/pr/index', () => {
     let branches: BranchConfig[];
 
     const bodyStruct = {
-      hash: '852f207771e73bd098c86c641fc7c1881529f859c3b078359c79b26565a5179c',
+      hash: '6aa71f8cb7b1503b883485c8f5bd564b31923b9c7fa765abe2a7338af40e03b1',
     };
 
     beforeEach(() => {

diff --git a/lib/workers/repository/onboarding/pr/index.ts b/lib/workers/repository/onboarding/pr/index.ts
@@ -12,7 +12,6 @@ import {
   isBranchConflicted,
   isBranchModified,
 } from '../../../../util/git';
-import { toBase64 } from '../../../../util/string';
 import * as template from '../../../../util/template';
 import type { BranchConfig } from '../../../types';
 import {
@@ -135,7 +134,7 @@ If you need any further assistance then you can also [request help here](${
   const existingContents =
     (await getFile(configFile, config.onboardingBranch)) ?? '';
   const hash = toSha256(existingContents);
-  prBody += `\n<!--renovate-config-hash:${toBase64(hash)}-->`;
+  prBody += `\n<!--renovate-config-hash:${hash}-->`;
 
   logger.trace('prBody:\n' + prBody);