mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-31 01:37:24 +00:00
3412de84ce
* refactor(lint): enable oxlint prefer-named-capture-group at error Numbered capture groups (m[1], $1) break silently when a regex is edited and group order shifts. Named groups (?<name>...) make intent explicit and accesses (m.groups.name) resilient to reordering. This enables the built-in eslint rule prefer-named-capture-group, surfacing 321 pre-existing unnamed-group violations across ~121 files to be burned down incrementally in follow-up commits. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(versioning): name capture groups for prefer-named-capture-group Burns down all prefer-named-capture-group violations in lib/modules/versioning/. Unused capture groups (only reachable via .test() or whole-match) become non-capturing (?:...); groups whose value is read become named (?<name>...), with accesses rewritten to match.groups!.<name> (or destructured from .groups!) instead of positional match[n]/$n so a future edit that reorders groups cannot silently break the reader. Two cases needed extra care to preserve behavior: - semver/common.ts and poetry/patterns.ts split() on a regex whose capture group is relied upon by String.prototype.split to keep the separator in the output array; the group is kept capturing and named, not converted to non-capturing. - hashicorp/convertor.ts's semverRegex is only ever embedded via .source into a named `(?<version>...)` group elsewhere and never matched directly, so its internal groups are safe to make non-capturing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(datasource): name capture groups for prefer-named-capture-group Burns down all prefer-named-capture-group violations under lib/modules/datasource/. Same treatment as the versioning module: unused groups become non-capturing, used groups get names, and positional match[n] reads move to match.groups!.<name>. docker/ecr.ts and pypi/common.ts keep their positional destructuring (`const [, region] = ...`, `!!m &&`) working unchanged since a named capture group is still addressable by its numeric index in JavaScript — only pypi/common.ts's access was rewritten to m.groups!.owner for clarity since it read a single group directly. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(platform): name capture groups for prefer-named-capture-group Burns down all prefer-named-capture-group violations under lib/modules/platform/. Uses the repo's established idiom of `match.groups?.<name>` after an optional-chained exec()/match() (see bitbucket/index.ts hostnameWithoutApiPrefix, gerrit/utils.ts extractSourceBranch) and `$<name>` in String.replace replacement strings. Unused groups (markdown/HTML massaging regexes matched only to be stripped) become non-capturing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(manager): name capture groups in ansible-galaxy for prefer-named-capture-group Burns down prefer-named-capture-group violations in lib/modules/manager/ansible-galaxy/. newBlockRegEx and blockLineRegEx dropped their unused outer wrapping group (only the inner key/value groups were ever read) and named the key/value groups; nameMatchRegex's remaining unused groups (protocol/user-info/port alternatives) become non-capturing since only source/hostname/depName/version are read via .groups. Accesses in collections.ts and roles.ts move from lineMatch[2]/lineMatch[3] to lineMatch.groups!.key/value. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(manager): name capture groups for prefer-named-capture-group (batch 1) Burns down prefer-named-capture-group violations across the first alphabetical slice of lib/modules/manager/ (ansible through mix). Used groups get names with accesses rewritten to match.groups!.<name> (or $<name> in replacement strings); groups whose value is never read become non-capturing (?:...). Two String.split() call sites (git-submodules/extract.ts, meteor/extract.ts) keep the established "named group still readable positionally from the split() result array" idiom instead of restructuring the destructuring. bazel/rules/go.ts and buildpacks/extract.ts dockerRef verified byte-for-byte equivalent before/after via a quick node script since several nested groups collapsed to non-capturing at once. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(manager): name capture groups for prefer-named-capture-group (batch 2) Burns down prefer-named-capture-group violations across the remaining alphabetical slice of lib/modules/manager/ (npm through terragrunt). Same treatment as batch 1: used groups get names with accesses moved to match.groups!.<name> or $<name> replacement strings; unused groups (wrapping alternations, quantifier repetition groups only consumed via .test(), or values never read from a match) become non-capturing. terraform/extractors/others/modules.ts and terragrunt/modules.ts share near-identical URL-parsing regexes (github/bitbucket/git/azure-devops ref matchers) — the same set of always-unused `depth=`/`&depth=` query-string groups is converted to non-capturing in both files. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(config): name capture groups for prefer-named-capture-group Burns down prefer-named-capture-group violations in lib/config/. Used groups get names with replacement strings switched from $1/$2 to $<name>; the unused separator group in schedule-migration.ts's afterBeforeRegex becomes non-capturing. presets/parse.ts keeps assigning through the already-declared `repo` variable rather than array-destructuring the exec() result, matching this file's existing style for the other named-group regexes just above it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(util): name capture groups for prefer-named-capture-group Burns down prefer-named-capture-group violations across lib/util/ and lib/logger/. Same treatment as previous batches: named groups for values that are read (via $<name> replacement strings, .groups!.<name>, or destructured from .groups), non-capturing groups where nothing reads the captured value (e.g. semantic.ts's angular-commit .test()-only regex). www-authenticate.ts's tokenizer entries each get their own named group but keep accessing the match generically via match[1], since a positionally-indexed named group is still readable by index. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(workers): name capture groups for prefer-named-capture-group Burns down prefer-named-capture-group violations in lib/workers/. Used groups get names with $<name> replacement strings; unused wrapper/alternation groups (e.g. semantic-commit-message.ts's optional scope/issue wrappers, release-notes.ts's date-heading and horizontal-rule matchers that are only probed with .search()/replaced wholesale) become non-capturing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * refactor(test,tools): name capture groups for prefer-named-capture-group Finishes the prefer-named-capture-group burndown: test/, tools/, and vitest.config.mts. Groups whose value is read get names ($<name> replacement strings or .groups.<name> access); groups only used via .test()/.search() or that feed a .match(/…/g) call (whose return value is the array of whole matches, not captured groups) become non-capturing. This is the last remaining slice of pre-existing violations, so the rule (already enabled at error repo-wide) now passes with zero findings across the whole codebase. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RxHFNsSworLcv23xXk9Hk * fix prettier failure * refactor(lint): use a named capture group in `v8-ignore-no-count` New rule from main trips the newly enabled `prefer-named-capture-group` oxlint rule. --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
265 lines
6.4 KiB
TypeScript
265 lines
6.4 KiB
TypeScript
import { isFalsy, isNullOrUndefined, isTruthy } from '@sindresorhus/is';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import { coerceArray } from '../../../util/array.ts';
|
|
import { regEx } from '../../../util/regex.ts';
|
|
import { parseYaml } from '../../../util/yaml.ts';
|
|
import { GitTagsDatasource } from '../../datasource/git-tags/index.ts';
|
|
import { GithubReleasesDatasource } from '../../datasource/github-releases/index.ts';
|
|
import { getDep } from '../dockerfile/extract.ts';
|
|
import type { PackageDependency, PackageFileContent } from '../types.ts';
|
|
import type {
|
|
TektonBundle,
|
|
TektonResolverParamsField,
|
|
TektonResource,
|
|
TektonResourceSpec,
|
|
} from './types.ts';
|
|
|
|
export function extractPackageFile(
|
|
content: string,
|
|
packageFile: string,
|
|
): PackageFileContent | null {
|
|
logger.trace(`tekton.extractPackageFile(${packageFile})`);
|
|
const deps: PackageDependency[] = [];
|
|
let docs: TektonResource[];
|
|
try {
|
|
// TODO: use schema (#9610)
|
|
docs = parseYaml(content);
|
|
} catch (err) {
|
|
logger.debug(
|
|
{ err, packageFile },
|
|
'Failed to parse YAML resource as a Tekton resource',
|
|
);
|
|
return null;
|
|
}
|
|
for (const doc of docs) {
|
|
deps.push(...getDeps(doc));
|
|
}
|
|
if (!deps.length) {
|
|
return null;
|
|
}
|
|
return { deps };
|
|
}
|
|
|
|
function getDeps(doc: TektonResource): PackageDependency[] {
|
|
const deps: PackageDependency[] = [];
|
|
if (isFalsy(doc)) {
|
|
return deps;
|
|
}
|
|
|
|
// Handle StepAction resource
|
|
addStepActionImage(doc.spec, deps);
|
|
|
|
// Handle TaskRun resource
|
|
addDep(doc.spec?.taskRef, deps);
|
|
addStepImageSpec(doc.spec?.taskSpec, deps);
|
|
|
|
// Handle Task resource
|
|
addStepImageSpec(doc.spec, deps);
|
|
|
|
// Handle PipelineRun resource
|
|
addDep(doc.spec?.pipelineRef, deps);
|
|
|
|
addPipelineAsCodeAnnotations(doc.metadata?.annotations, deps);
|
|
|
|
// Handle PipelineRun resource with inline Pipeline definition
|
|
const pipelineSpec = doc.spec?.pipelineSpec;
|
|
if (isTruthy(pipelineSpec)) {
|
|
deps.push(...getDeps({ spec: pipelineSpec }));
|
|
}
|
|
|
|
// Handle regular tasks of Pipeline resource
|
|
for (const task of [
|
|
...coerceArray(doc.spec?.tasks),
|
|
...coerceArray(doc.spec?.finally),
|
|
]) {
|
|
addDep(task.taskRef, deps);
|
|
addStepImageSpec(task.taskSpec, deps);
|
|
}
|
|
|
|
// Handle TriggerTemplate resource
|
|
for (const resource of coerceArray(doc.spec?.resourcetemplates)) {
|
|
deps.push(...getDeps(resource));
|
|
}
|
|
|
|
// Handle list of TektonResources
|
|
for (const item of coerceArray(doc.items)) {
|
|
deps.push(...getDeps(item));
|
|
}
|
|
|
|
return deps;
|
|
}
|
|
|
|
const annotationRegex = regEx(
|
|
/^pipelinesascode\.tekton\.dev\/(?:task(?:-[0-9]+)?|pipeline)$/,
|
|
);
|
|
|
|
function addPipelineAsCodeAnnotations(
|
|
annotations: Record<string, string> | undefined | null,
|
|
deps: PackageDependency[],
|
|
): void {
|
|
if (isNullOrUndefined(annotations)) {
|
|
return;
|
|
}
|
|
|
|
for (const [key, value] of Object.entries(annotations)) {
|
|
if (!annotationRegex.test(key)) {
|
|
continue;
|
|
}
|
|
|
|
const values = value
|
|
.replace(regEx(/]$/), '')
|
|
.replace(regEx(/^\[/), '')
|
|
.split(',');
|
|
for (const value of values) {
|
|
const dep = getAnnotationDep(value.trim());
|
|
if (!dep) {
|
|
continue;
|
|
}
|
|
deps.push(dep);
|
|
}
|
|
}
|
|
}
|
|
|
|
const githubRelease = regEx(
|
|
/^(?<url>(?:(?:http|https):\/\/)?(?<path>(?:[^:/\s]+[:/])?(?<project>[^/\s]+\/[^/\s]+)))\/releases\/download\/(?<currentValue>.+)\/(?<subdir>[^?\s]*)$/,
|
|
);
|
|
|
|
const gitUrl = regEx(
|
|
/^(?<url>(?:(?:http|https):\/\/)?(?<path>(?:[^:/\s]+[:/])?(?<project>[^/\s]+\/[^/\s]+)))(?:\/raw)?\/(?<currentValue>.+?)\/(?<subdir>[^?\s]*)$/,
|
|
);
|
|
|
|
function getAnnotationDep(url: string): PackageDependency | null {
|
|
const dep: PackageDependency = {};
|
|
dep.depType = 'tekton-annotation';
|
|
|
|
let groups = githubRelease.exec(url)?.groups;
|
|
|
|
if (groups) {
|
|
dep.datasource = GithubReleasesDatasource.id;
|
|
|
|
dep.depName = groups.path;
|
|
dep.packageName = groups.project;
|
|
dep.currentValue = groups.currentValue;
|
|
return dep;
|
|
}
|
|
|
|
groups = gitUrl.exec(url)?.groups;
|
|
if (groups) {
|
|
dep.datasource = GitTagsDatasource.id;
|
|
|
|
dep.depName = groups.path.replace(
|
|
'raw.githubusercontent.com',
|
|
'github.com',
|
|
);
|
|
dep.packageName = groups.url.replace(
|
|
'raw.githubusercontent.com',
|
|
'github.com',
|
|
);
|
|
dep.currentValue = groups.currentValue;
|
|
return dep;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
function addDep(ref: TektonBundle, deps: PackageDependency[]): void {
|
|
if (isFalsy(ref)) {
|
|
return;
|
|
}
|
|
let imageRef: string | undefined;
|
|
|
|
// First, find a bundle reference from the Bundle resolver
|
|
if (ref.resolver === 'bundles') {
|
|
imageRef = getBundleValue(ref.params);
|
|
if (isNullOrUndefined(imageRef)) {
|
|
// Fallback to the deprecated Bundle resolver attribute
|
|
imageRef = getBundleValue(ref.resource);
|
|
}
|
|
}
|
|
|
|
if (isNullOrUndefined(imageRef)) {
|
|
// Fallback to older style bundle reference
|
|
imageRef = ref.bundle;
|
|
}
|
|
|
|
const dep = getDep(imageRef);
|
|
dep.depType = 'tekton-bundle';
|
|
logger.trace(
|
|
{
|
|
depName: dep.depName,
|
|
currentValue: dep.currentValue,
|
|
currentDigest: dep.currentDigest,
|
|
},
|
|
'Tekton bundle dependency found',
|
|
);
|
|
deps.push(dep);
|
|
}
|
|
|
|
function addStepImageSpec(
|
|
spec: TektonResourceSpec | undefined,
|
|
deps: PackageDependency[],
|
|
): void {
|
|
if (isNullOrUndefined(spec)) {
|
|
return;
|
|
}
|
|
|
|
const steps = [
|
|
...coerceArray(spec.steps),
|
|
...coerceArray(spec.sidecars),
|
|
spec.stepTemplate,
|
|
];
|
|
for (const step of steps) {
|
|
if (isNullOrUndefined(step?.image)) {
|
|
continue;
|
|
}
|
|
const dep = getDep(step?.image);
|
|
dep.depType = 'tekton-step-image';
|
|
logger.trace(
|
|
{
|
|
depName: dep.depName,
|
|
currentValue: dep.currentValue,
|
|
currentDigest: dep.currentDigest,
|
|
},
|
|
'Tekton step image dependency found',
|
|
);
|
|
deps.push(dep);
|
|
}
|
|
}
|
|
|
|
function addStepActionImage(
|
|
spec: TektonResourceSpec | undefined,
|
|
deps: PackageDependency[],
|
|
): void {
|
|
if (isNullOrUndefined(spec)) {
|
|
return;
|
|
}
|
|
if (isFalsy(spec.image)) {
|
|
return;
|
|
}
|
|
|
|
const image = spec.image;
|
|
const dep = getDep(image);
|
|
|
|
dep.depType = 'tekton-step-image';
|
|
logger.trace(
|
|
{
|
|
depName: dep.depName,
|
|
currentValue: dep.currentValue,
|
|
currentDigest: dep.currentDigest,
|
|
},
|
|
'Tekton step image dependency found',
|
|
);
|
|
deps.push(dep);
|
|
}
|
|
|
|
function getBundleValue(
|
|
fields: TektonResolverParamsField[] | undefined,
|
|
): string | undefined {
|
|
for (const field of coerceArray(fields)) {
|
|
if (field.name === 'bundle') {
|
|
return field.value;
|
|
}
|
|
}
|
|
return undefined;
|
|
}
|