renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-10 14:06:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat(manager/flux) undo refactoring upon review request

Browse source
This commit is contained in:
Sebastian Sams 2024-12-20 07:55:18 +00:00
parent 88fd3792b2
commit 0899693f72
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/modules/manager/flux/common.ts
View file

@ -1,6 +1,4 @@
import { regEx } from '../../../util/regex'; import { regEx } from '../../../util/regex';
import type { HelmRepository } from './schema';
import type { FluxManifest } from './types';
export const systemManifestFileNameRegex = '(?:^|/)gotk-components\\.ya?ml$'; export const systemManifestFileNameRegex = '(?:^|/)gotk-components\\.ya?ml$';
@ -10,19 +8,3 @@ export const systemManifestHeaderRegex =
export function isSystemManifest(file: string): boolean { export function isSystemManifest(file: string): boolean {
return regEx(systemManifestFileNameRegex).test(file); return regEx(systemManifestFileNameRegex).test(file);
} }
export function collectHelmRepos(manifests: FluxManifest[]): HelmRepository[] {
const helmRepositories: HelmRepository[] = [];
for (const manifest of manifests) {
if (manifest.kind === 'resource') {
for (const resource of manifest.resources) {
if (resource.kind === 'HelmRepository') {
helmRepositories.push(resource);
}
}
}
}
return helmRepositories;
}

21
lib/modules/manager/flux/extract.ts
View file

@ -22,7 +22,6 @@ import type {
PackageFileContent, PackageFileContent,
} from '../types'; } from '../types';
import { import {
collectHelmRepos,
isSystemManifest, isSystemManifest,
systemManifestHeaderRegex, systemManifestHeaderRegex,
} from './common'; } from './common';
@ -305,7 +304,14 @@ export function extractPackageFile(
if (!manifest) { if (!manifest) {
return null; return null;
} }
const helmRepositories = collectHelmRepos([manifest]); const helmRepositories: HelmRepository[] = [];
if (manifest.kind === 'resource') {
for (const resource of manifest.resources) {
if (resource.kind === 'HelmRepository') {
helmRepositories.push(resource);
}
}
}
let deps: PackageDependency[] | null = null; let deps: PackageDependency[] | null = null;
switch (manifest.kind) { switch (manifest.kind) {
case 'system': case 'system':
@ -339,7 +345,16 @@ export async function extractAllPackageFiles(
} }
} }
const helmRepositories = collectHelmRepos(manifests); const helmRepositories: HelmRepository[] = [];
for (const manifest of manifests) {
if (manifest.kind === 'resource') {
for (const resource of manifest.resources) {
if (resource.kind === 'HelmRepository') {
helmRepositories.push(resource);
}
}
}
}
for (const manifest of manifests) { for (const manifest of manifests) {
let deps: PackageDependency[] | null = null; let deps: PackageDependency[] | null = null;