From 96c4df2776be58bda4e28ab6fd9f742e011048d3 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 30 Aug 2021 08:05:32 +0200
Subject: [PATCH] chore: clean up ManagerConfig types (#11469)
* chore: use ExtractConfig for git-submodules
* chore: drop ManagerConfig from config/types
* chore: remove unused ManagerConfig from manager types
---
lib/config/index.ts | 11 +++--------
lib/config/types.ts | 5 -----
lib/manager/git-submodules/extract.ts | 4 ++--
lib/manager/types.ts | 8 ++------
lib/workers/repository/process/fetch.ts | 6 +++---
5 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/lib/config/index.ts b/lib/config/index.ts
index 8fdf46e01b..c77ba6ca6a 100644
--- a/lib/config/index.ts
+++ b/lib/config/index.ts
@@ -1,12 +1,7 @@
import { logger } from '../logger';
import { get, getLanguageList, getManagerList } from '../manager';
import * as options from './options';
-import type {
- AllConfig,
- ManagerConfig,
- RenovateConfig,
- RenovateConfigStage,
-} from './types';
+import type { AllConfig, RenovateConfig, RenovateConfigStage } from './types';
import { mergeChildConfig } from './utils';
export { mergeChildConfig };
@@ -14,8 +9,8 @@ export { mergeChildConfig };
export function getManagerConfig(
config: RenovateConfig,
manager: string
-): ManagerConfig {
- let managerConfig: ManagerConfig = {
+): RenovateConfig {
+ let managerConfig: RenovateConfig = {
...config,
language: null,
manager: null,
diff --git a/lib/config/types.ts b/lib/config/types.ts
index 459458b720..0e5fbdff9f 100644
--- a/lib/config/types.ts
+++ b/lib/config/types.ts
@@ -375,11 +375,6 @@ export interface PackageRuleInputConfig extends Record<string, unknown> {
packageRules?: (PackageRule & PackageRuleInputConfig)[];
}
-export interface ManagerConfig extends RenovateConfig {
- language: string;
- manager: string;
-}
-
export interface MigratedConfig {
isMigrated: boolean;
migratedConfig: RenovateConfig;
diff --git a/lib/manager/git-submodules/extract.ts b/lib/manager/git-submodules/extract.ts
index c4dd814037..a8a0f6e55e 100644
--- a/lib/manager/git-submodules/extract.ts
+++ b/lib/manager/git-submodules/extract.ts
@@ -5,7 +5,7 @@ import { getGlobalConfig } from '../../config/global';
import * as datasourceGitRefs from '../../datasource/git-refs';
import { logger } from '../../logger';
import { getHttpUrl, getRemoteUrlWithToken } from '../../util/git/url';
-import type { ManagerConfig, PackageFile } from '../types';
+import type { ExtractConfig, PackageFile } from '../types';
import { GitModule } from './types';
async function getUrl(
@@ -86,7 +86,7 @@ async function getModules(
export default async function extractPackageFile(
_content: string,
fileName: string,
- config: ManagerConfig
+ config: ExtractConfig
): Promise<PackageFile | null> {
const { localDir } = getGlobalConfig();
const git = Git(localDir);
diff --git a/lib/manager/types.ts b/lib/manager/types.ts
index ef1ba6b9a7..6f09f08baa 100644
--- a/lib/manager/types.ts
+++ b/lib/manager/types.ts
@@ -9,10 +9,6 @@ import type { File } from '../util/git';
export type Result<T> = T | Promise<T>;
-export interface ManagerConfig {
- registryUrls?: string[];
-}
-
export interface ManagerData<T> {
managerData?: T;
}
@@ -38,7 +34,7 @@ export interface CustomExtractConfig extends ExtractConfig {
versioningTemplate?: string;
}
-export interface UpdateArtifactsConfig extends ManagerConfig {
+export interface UpdateArtifactsConfig {
isLockFileMaintenance?: boolean;
constraints?: Record<string, string>;
composerIgnorePlatformReqs?: string[];
@@ -259,7 +255,7 @@ export interface ManagerApi {
}
// TODO: name and properties used by npm manager
-export interface PostUpdateConfig extends ManagerConfig, Record<string, any> {
+export interface PostUpdateConfig extends Record<string, any> {
updatedPackageFiles?: File[];
postUpdateOptions?: string[];
skipInstalls?: boolean;
diff --git a/lib/workers/repository/process/fetch.ts b/lib/workers/repository/process/fetch.ts
index 126e613f97..e4d85cb67c 100644
--- a/lib/workers/repository/process/fetch.ts
+++ b/lib/workers/repository/process/fetch.ts
@@ -1,6 +1,6 @@
import pAll from 'p-all';
import { getManagerConfig, mergeChildConfig } from '../../../config';
-import type { ManagerConfig, RenovateConfig } from '../../../config/types';
+import type { RenovateConfig } from '../../../config/types';
import { getDefaultConfig } from '../../../datasource';
import { logger } from '../../../logger';
import type { PackageDependency, PackageFile } from '../../../manager/types';
@@ -11,7 +11,7 @@ import { lookupUpdates } from './lookup';
import type { LookupUpdateConfig } from './lookup/types';
async function fetchDepUpdates(
- packageFileConfig: ManagerConfig & PackageFile,
+ packageFileConfig: RenovateConfig & PackageFile,
indep: PackageDependency
): Promise<PackageDependency> {
let dep = clone(indep);
@@ -45,7 +45,7 @@ async function fetchDepUpdates(
async function fetchManagerPackagerFileUpdates(
config: RenovateConfig,
- managerConfig: ManagerConfig,
+ managerConfig: RenovateConfig,
pFile: PackageFile
): Promise<void> {
const { packageFile } = pFile;
--
GitLab