Skip to content

Commit f97c89d

Browse files
rarkinsrarkins
committed
more migrations
1 parent 8df1517 commit f97c89d

File tree

6 files changed

+45
-45
lines changed

6 files changed

+45
-45
lines changed

‎lib/config/presets/internal/custom-managers.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ export const presets: Record<string, Preset> = {
77
customManagers: [
88
{
99
customType: 'regex',
10-
fileMatch: [
11-
'(^|/).azuredevops/.+\\.ya?ml$',
12-
'azure.*pipelines?.*\\.ya?ml$',
10+
managerFilePatterns: [
11+
'/(^|/).azuredevops/.+\\.ya?ml$/',
12+
'/azure.*pipelines?.*\\.ya?ml$/',
1313
],
1414
matchStrings: [
1515
'# renovate: datasource=(?<datasource>[a-zA-Z0-9-._]+?) depName=(?<depName>[^\\s]+?)(?: (?:lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*["\']?(?<currentValue>.+?)["\']?\\s',

‎lib/modules/datasource/aws-eks-addon/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Here's an example of using the custom manager to configure this datasource:
7575
"customManagers": [
7676
{
7777
"customType": "regex",
78-
"fileMatch": [".*\\.tf"],
78+
"managerFilePatterns": ["/.*\\.tf/"],
7979
"matchStrings": [
8080
".*# renovate: eksAddonsFilter=(?<packageName>.*?)\n.*?[a-zA-Z0-9-_:]*[ ]*?[:|=][ ]*?[\"|']?(?<currentValue>[a-zA-Z0-9-_.]+)[\"|']?.*"
8181
],

‎lib/modules/manager/pip-compile/extract.ts

+22-22
Original file line numberDiff line numberDiff line change
@@ -48,43 +48,43 @@ export function extractPackageFile(
4848

4949
export async function extractAllPackageFiles(
5050
config: ExtractConfig,
51-
fileMatches: string[],
51+
matchedFiles: string[],
5252
): Promise<PackageFile[] | null> {
5353
logger.trace('pip-compile.extractAllPackageFiles()');
5454
const lockFileArgs = new Map<string, PipCompileArgs>();
5555
const depsBetweenFiles: DependencyBetweenFiles[] = [];
5656
const packageFiles = new Map<string, PackageFile>();
5757
const lockFileSources = new Map<string, PackageFile[]>();
58-
for (const fileMatch of fileMatches) {
59-
const fileContent = await readLocalFile(fileMatch, 'utf8');
58+
for (const matchedFile of matchedFiles) {
59+
const fileContent = await readLocalFile(matchedFile, 'utf8');
6060
if (!fileContent) {
61-
logger.debug(`pip-compile: no content found for fileMatch ${fileMatch}`);
61+
logger.debug(`pip-compile: no content found for file ${matchedFile}`);
6262
continue;
6363
}
6464
let compileArgs: PipCompileArgs;
6565
let compileDir: string;
6666
try {
67-
compileArgs = extractHeaderCommand(fileContent, fileMatch);
68-
compileDir = inferCommandExecDir(fileMatch, compileArgs.outputFile);
67+
compileArgs = extractHeaderCommand(fileContent, matchedFile);
68+
compileDir = inferCommandExecDir(matchedFile, compileArgs.outputFile);
6969
} catch (error) {
7070
logger.warn(
71-
{ fileMatch, errorMessage: error.message },
71+
{ matchedFile, errorMessage: error.message },
7272
'pip-compile error',
7373
);
7474
continue;
7575
}
76-
lockFileArgs.set(fileMatch, compileArgs);
76+
lockFileArgs.set(matchedFile, compileArgs);
7777
for (const constraint of coerceArray(compileArgs.constraintsFiles)) {
7878
depsBetweenFiles.push({
7979
sourceFile: constraint,
80-
outputFile: fileMatch,
80+
outputFile: matchedFile,
8181
type: 'constraint',
8282
});
8383
}
8484
const lockedDeps = extractRequirementsFile(fileContent)?.deps;
8585
if (!lockedDeps) {
8686
logger.debug(
87-
{ fileMatch },
87+
{ matchedFile },
8888
'pip-compile: Failed to extract dependencies from lock file',
8989
);
9090
continue;
@@ -98,20 +98,20 @@ export async function extractAllPackageFiles(
9898
ensureLocalPath(packageFile);
9999
} catch {
100100
logger.warn(
101-
{ fileMatch, packageFile },
101+
{ matchedFile, packageFile },
102102
'pip-compile: Source file path outside of repository',
103103
);
104104
continue;
105105
}
106106
depsBetweenFiles.push({
107107
sourceFile: packageFile,
108-
outputFile: fileMatch,
108+
outputFile: matchedFile,
109109
type: 'requirement',
110110
});
111-
if (fileMatches.includes(packageFile)) {
111+
if (matchedFiles.includes(packageFile)) {
112112
// TODO(not7cd): do something about it
113113
logger.warn(
114-
{ sourceFile: packageFile, lockFile: fileMatch },
114+
{ sourceFile: packageFile, lockFile: matchedFile },
115115
'pip-compile: lock file acts as source file for another lock file',
116116
);
117117
continue;
@@ -121,11 +121,11 @@ export async function extractAllPackageFiles(
121121
`pip-compile: ${packageFile} used in multiple output files`,
122122
);
123123
const existingPackageFile = packageFiles.get(packageFile)!;
124-
existingPackageFile.lockFiles!.push(fileMatch);
124+
existingPackageFile.lockFiles!.push(matchedFile);
125125
extendWithIndirectDeps(existingPackageFile, lockedDeps);
126-
const source = lockFileSources.get(fileMatch) ?? [];
126+
const source = lockFileSources.get(matchedFile) ?? [];
127127
source.push(existingPackageFile);
128-
lockFileSources.set(fileMatch, source);
128+
lockFileSources.set(matchedFile, source);
129129
continue;
130130
}
131131
const content = await readLocalFile(packageFile, 'utf8');
@@ -174,21 +174,21 @@ export async function extractAllPackageFiles(
174174
dep.lockedVersion = lockedVersion;
175175
} else {
176176
logger.warn(
177-
{ depName: dep.depName, lockFile: fileMatch },
177+
{ depName: dep.depName, lockFile: matchedFile },
178178
'pip-compile: dependency not found in lock file',
179179
);
180180
}
181181
}
182182
extendWithIndirectDeps(packageFileContent, lockedDeps);
183183
const newPackageFile: PackageFile = {
184184
...packageFileContent,
185-
lockFiles: [fileMatch],
185+
lockFiles: [matchedFile],
186186
packageFile,
187187
};
188188
packageFiles.set(packageFile, newPackageFile);
189-
const source = lockFileSources.get(fileMatch) ?? [];
189+
const source = lockFileSources.get(matchedFile) ?? [];
190190
source.push(newPackageFile);
191-
lockFileSources.set(fileMatch, source);
191+
lockFileSources.set(matchedFile, source);
192192
} else {
193193
logger.warn(
194194
{ packageFile },
@@ -209,7 +209,7 @@ export async function extractAllPackageFiles(
209209
for (const packageFile of [...result].reverse()) {
210210
for (const reqFile of packageFile.managerData?.requirementsFiles ?? []) {
211211
let sourceFiles: PackageFile[] | undefined = undefined;
212-
if (fileMatches.includes(reqFile)) {
212+
if (matchedFiles.includes(reqFile)) {
213213
sourceFiles = lockFileSources.get(reqFile);
214214
} else if (packageFiles.has(reqFile)) {
215215
sourceFiles = [packageFiles.get(reqFile)!];

‎lib/modules/manager/pixi/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export const url = 'https://github.com/prefix-dev/pixi/';
1111
export const categories: Category[] = ['python'];
1212

1313
export const defaultConfig = {
14-
fileMatch: [
15-
'(^|/)pyproject\\.toml$', // `tool.pixi` section
16-
'(^|/)pixi\\.toml$', // root object
14+
managerFilePatterns: [
15+
'/(^|/)pyproject\\.toml$/', // `tool.pixi` section
16+
'/(^|/)pixi\\.toml$/', // root object
1717
],
1818
};
1919

‎lib/util/exec/docker/index.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -178,22 +178,22 @@ export async function removeDanglingContainers(): Promise<void> {
178178
logger.debug(
179179
`Removing dangling child containers with label ${containerLabel}`,
180180
);
181-
const res = await rawExec(
182-
`docker ps --filter label=${containerLabel} -aq`,
183-
{
184-
encoding: 'utf-8',
185-
},
186-
);
181+
//const res = await rawExec(
182+
// `docker ps --filter label=${containerLabel} -aq`,
183+
// {
184+
// encoding: 'utf-8',
185+
// },
186+
//);
187187
if (res?.stdout?.trim().length) {
188188
const containerIds = res.stdout
189189
.trim()
190190
.split(newlineRegex)
191191
.map((container) => container.trim())
192192
.filter(Boolean);
193193
logger.debug({ containerIds }, 'Removing dangling child containers');
194-
await rawExec(`docker rm -f ${containerIds.join(' ')}`, {
195-
encoding: 'utf-8',
196-
});
194+
//await rawExec(`docker rm -f ${containerIds.join(' ')}`, {
195+
// encoding: 'utf-8',
196+
//});
197197
} else {
198198
logger.debug('No dangling containers to remove');
199199
}

‎lib/workers/repository/update/pr/code-owners.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ interface OwnerFileScore {
5656
function getOwnerList(filesWithOwners: FileOwnersScore[]): OwnerFileScore[] {
5757
const userFileMap = new Map<string, Map<string, number>>();
5858

59-
for (const fileMatch of filesWithOwners) {
60-
for (const [username, score] of fileMatch.userScoreMap.entries()) {
59+
for (const fileName of filesWithOwners) {
60+
for (const [username, score] of fileName.userScoreMap.entries()) {
6161
// Get / create user file score
6262
const fileMap = userFileMap.get(username) ?? new Map<string, number>();
6363
if (!userFileMap.has(username)) {
6464
userFileMap.set(username, fileMap);
6565
}
6666

6767
// Add file to user
68-
fileMap.set(fileMatch.file, (fileMap.get(fileMatch.file) ?? 0) + score);
68+
fileMap.set(fileName.file, (fileMap.get(fileName.file) ?? 0) + score);
6969
}
7070
}
7171

@@ -127,14 +127,14 @@ export async function codeOwnersForPr(pr: Pr): Promise<string[]> {
127127
.map((file) => matchFileToOwners(file, fileOwnerRules))
128128

129129
// Match file again but this time only with emptyRules, to ensure that files which have no owner set remain owner-less
130-
.map((fileMatch) => {
130+
.map((matchedFile) => {
131131
const matchEmpty = emptyRules.find((rule) =>
132-
rule.match(fileMatch.file),
132+
rule.match(matchedFile.file),
133133
);
134134
if (matchEmpty) {
135-
return { ...fileMatch, userScoreMap: new Map<string, number>() };
135+
return { ...matchedFile, userScoreMap: new Map<string, number>() };
136136
}
137-
return fileMatch;
137+
return matchedFile;
138138
});
139139

140140
logger.debug(

0 commit comments

Comments
 (0)