Skip to content

Display resources for .yml files #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nephio-prow merged 4 commits into from
Aug 19, 2025
Merged

Display resources for .yml files #80

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c0143e
Display yml files
r-yabyab Jun 20, 2025
15ff054
Add null check to yaml resources
r-yabyab Jun 20, 2025
110620a
Fix PackageResource lint error
r-yabyab Aug 5, 2025
b5057b4
Fix formatting with Prettier
r-yabyab Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions plugins/cad/src/utils/packageRevisionResources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,32 +109,36 @@ export const getPackageRevisionResourcesResource = (

export const getPackageResourcesFromResourcesMap = (resourcesMap: PackageRevisionResourcesMap): PackageResource[] => {
const yamlFileEntries = Object.entries(resourcesMap).filter(
file => file[0].endsWith('.yaml') || file[0] === 'Kptfile' || file[0].endsWith('/Kptfile'),
file =>
file[0].endsWith('.yaml') || file[0].endsWith('.yml') || file[0] === 'Kptfile' || file[0].endsWith('/Kptfile'),
);

const resources = yamlFileEntries.map(([filename, multiResourceYaml]) => {
const resources = yamlFileEntries.flatMap(([filename, multiResourceYaml]) => {
const resourcesYaml = getResourcesFromMultiResourceYaml(multiResourceYaml);

return resourcesYaml.map((resourceYaml, index) => {
const k8sResource = loadYaml(resourceYaml) as KubernetesResource;
return resourcesYaml.flatMap((resourceYaml, index) => {
const k8sResource = loadYaml(resourceYaml) as KubernetesResource | null;

if (!k8sResource) return [];
const uniqueId = `${k8sResource.kind}:${filename ?? k8sResource.metadata.name}:${index}`;

return {
id: uniqueId,
component: filename.substring(0, filename.lastIndexOf('/')),
filename: filename,
kind: k8sResource.kind,
name: k8sResource.metadata.name,
namespace: k8sResource.metadata.namespace,
yaml: resourceYaml,
resourceIndex: index,
isLocalConfigResource: !!k8sResource.metadata.annotations?.['config.kubernetes.io/local-config'],
};
return [
{
id: uniqueId,
component: filename.substring(0, filename.lastIndexOf('/')),
filename: filename,
kind: k8sResource.kind,
name: k8sResource.metadata.name,
namespace: k8sResource.metadata.namespace,
yaml: resourceYaml,
resourceIndex: index,
isLocalConfigResource: !!k8sResource.metadata.annotations?.['config.kubernetes.io/local-config'],
},
];
});
});

return resources.flat();
return resources;
};

const getResourcesForFile = (resourcesMap: PackageRevisionResourcesMap, filename: string): string[] => {
Expand Down