From 9ebf804d4e3ae16c4e0554f7c5d37d1f7915841c Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 19 May 2021 12:27:37 +0200
Subject: [PATCH] fix(cache): cacheDir adminConfig
---
lib/config/types.ts | 3 +--
lib/util/cache/repository/index.spec.ts | 3 ++-
lib/util/cache/repository/index.ts | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/config/types.ts b/lib/config/types.ts
index e0cfa91a98..3c4dc8e078 100644
--- a/lib/config/types.ts
+++ b/lib/config/types.ts
@@ -70,6 +70,7 @@ export interface GlobalOnlyConfig {
autodiscover?: boolean;
autodiscoverFilter?: string;
baseDir?: string;
+ cacheDir?: string;
forceCli?: boolean;
gitPrivateKey?: string;
logFile?: string;
@@ -99,8 +100,6 @@ export interface RepoAdminConfig {
}
export interface LegacyAdminConfig {
- cacheDir?: string;
-
endpoint?: string;
localDir?: string;
diff --git a/lib/util/cache/repository/index.spec.ts b/lib/util/cache/repository/index.spec.ts
index 1095e227df..1e7f0e8250 100644
--- a/lib/util/cache/repository/index.spec.ts
+++ b/lib/util/cache/repository/index.spec.ts
@@ -1,5 +1,6 @@
import * as _fs from 'fs-extra';
import { getName, mocked } from '../../../../test/util';
+import { setAdminConfig } from '../../../config/admin';
import * as repositoryCache from '.';
jest.mock('fs-extra');
@@ -9,9 +10,9 @@ const fs = mocked(_fs);
describe(getName(), () => {
beforeEach(() => {
jest.resetAllMocks();
+ setAdminConfig({ cacheDir: '/tmp/renovate/cache/' });
});
const config = {
- cacheDir: '/tmp/renovate/cache/',
platform: 'github',
repository: 'abc/def',
};
diff --git a/lib/util/cache/repository/index.ts b/lib/util/cache/repository/index.ts
index c8949ac215..27779993b7 100644
--- a/lib/util/cache/repository/index.ts
+++ b/lib/util/cache/repository/index.ts
@@ -1,5 +1,6 @@
import * as fs from 'fs-extra';
import { join } from 'upath';
+import { getAdminConfig } from '../../../config/admin';
import type {
RenovateConfig,
RepositoryCacheConfig,
@@ -16,7 +17,7 @@ let cache: Cache = Object.create({});
export function getCacheFileName(config: RenovateConfig): string {
return join(
- config.cacheDir,
+ getAdminConfig().cacheDir,
'/renovate/repository/',
config.platform,
config.repository + '.json'
--
GitLab