From 8c0143e3c85af8c0cd3c3627f10459b1357f3810 Mon Sep 17 00:00:00 2001 From: Scruffy pc Date: Fri, 20 Jun 2025 13:23:37 -0500 Subject: [PATCH 1/4] Display yml files --- plugins/cad/src/utils/packageRevision.ts | 14 +++----------- plugins/cad/src/utils/packageRevisionResources.ts | 6 +++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/plugins/cad/src/utils/packageRevision.ts b/plugins/cad/src/utils/packageRevision.ts index 2d05897a..84a0c28c 100644 --- a/plugins/cad/src/utils/packageRevision.ts +++ b/plugins/cad/src/utils/packageRevision.ts @@ -25,17 +25,9 @@ import { } from '../types/PackageRevision'; import { toLowerCase } from './string'; -const getRevisionNumber = (revision: string, defaultNumber: number = NaN): number => { - if (revision && revision.startsWith('v')) { - const revisionNumber = parseInt(revision.substring(1), 10); - - if (Number.isInteger(revisionNumber)) { - return revisionNumber; - } - } - - return defaultNumber; -}; +function getRevisionNumber(revision: number): number { + return revision; +} const getNextRevision = (revision: string): string => { const revisionNumber = getRevisionNumber(revision, 0); diff --git a/plugins/cad/src/utils/packageRevisionResources.ts b/plugins/cad/src/utils/packageRevisionResources.ts index 30a17c14..bb4e5db8 100644 --- a/plugins/cad/src/utils/packageRevisionResources.ts +++ b/plugins/cad/src/utils/packageRevisionResources.ts @@ -109,7 +109,11 @@ 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]) => { From 15ff05474ada9f1b8e5e01e72173bb6cdeffeade Mon Sep 17 00:00:00 2001 From: Scruffy pc Date: Fri, 20 Jun 2025 16:22:49 -0500 Subject: [PATCH 2/4] Add null check to yaml resources Fix null check --- plugins/cad/src/utils/packageRevision.ts | 14 +++++++++++--- plugins/cad/src/utils/packageRevisionResources.ts | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/plugins/cad/src/utils/packageRevision.ts b/plugins/cad/src/utils/packageRevision.ts index 84a0c28c..2d05897a 100644 --- a/plugins/cad/src/utils/packageRevision.ts +++ b/plugins/cad/src/utils/packageRevision.ts @@ -25,9 +25,17 @@ import { } from '../types/PackageRevision'; import { toLowerCase } from './string'; -function getRevisionNumber(revision: number): number { - return revision; -} +const getRevisionNumber = (revision: string, defaultNumber: number = NaN): number => { + if (revision && revision.startsWith('v')) { + const revisionNumber = parseInt(revision.substring(1), 10); + + if (Number.isInteger(revisionNumber)) { + return revisionNumber; + } + } + + return defaultNumber; +}; const getNextRevision = (revision: string): string => { const revisionNumber = getRevisionNumber(revision, 0); diff --git a/plugins/cad/src/utils/packageRevisionResources.ts b/plugins/cad/src/utils/packageRevisionResources.ts index bb4e5db8..e02adc04 100644 --- a/plugins/cad/src/utils/packageRevisionResources.ts +++ b/plugins/cad/src/utils/packageRevisionResources.ts @@ -120,8 +120,9 @@ export const getPackageResourcesFromResourcesMap = (resourcesMap: PackageRevisio const resourcesYaml = getResourcesFromMultiResourceYaml(multiResourceYaml); return resourcesYaml.map((resourceYaml, index) => { - const k8sResource = loadYaml(resourceYaml) as KubernetesResource; + const k8sResource = loadYaml(resourceYaml) as KubernetesResource | null; + if (!k8sResource) return null; const uniqueId = `${k8sResource.kind}:${filename ?? k8sResource.metadata.name}:${index}`; return { From 110620a40efe6b2cefbc321e34db143299c3b566 Mon Sep 17 00:00:00 2001 From: Scruffy pc Date: Mon, 4 Aug 2025 20:59:57 -0500 Subject: [PATCH 3/4] Fix PackageResource lint error --- plugins/cad/src/utils/packageRevisionResources.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/cad/src/utils/packageRevisionResources.ts b/plugins/cad/src/utils/packageRevisionResources.ts index e02adc04..5ae71f06 100644 --- a/plugins/cad/src/utils/packageRevisionResources.ts +++ b/plugins/cad/src/utils/packageRevisionResources.ts @@ -116,16 +116,16 @@ export const getPackageResourcesFromResourcesMap = (resourcesMap: PackageRevisio 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) => { + return resourcesYaml.flatMap((resourceYaml, index) => { const k8sResource = loadYaml(resourceYaml) as KubernetesResource | null; - if (!k8sResource) return null; + if (!k8sResource) return []; const uniqueId = `${k8sResource.kind}:${filename ?? k8sResource.metadata.name}:${index}`; - return { + return [{ id: uniqueId, component: filename.substring(0, filename.lastIndexOf('/')), filename: filename, @@ -135,11 +135,11 @@ export const getPackageResourcesFromResourcesMap = (resourcesMap: PackageRevisio 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[] => { From b5057b4fc823f988e7d12a60b0478b152afeca36 Mon Sep 17 00:00:00 2001 From: Scruffy pc Date: Mon, 4 Aug 2025 21:07:36 -0500 Subject: [PATCH 4/4] Fix formatting with Prettier --- .../cad/src/utils/packageRevisionResources.ts | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/plugins/cad/src/utils/packageRevisionResources.ts b/plugins/cad/src/utils/packageRevisionResources.ts index 5ae71f06..d806da2b 100644 --- a/plugins/cad/src/utils/packageRevisionResources.ts +++ b/plugins/cad/src/utils/packageRevisionResources.ts @@ -109,11 +109,8 @@ export const getPackageRevisionResourcesResource = ( export const getPackageResourcesFromResourcesMap = (resourcesMap: PackageRevisionResourcesMap): PackageResource[] => { const yamlFileEntries = Object.entries(resourcesMap).filter( - file => - file[0].endsWith('.yaml') || - file[0].endsWith('.yml') || - 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.flatMap(([filename, multiResourceYaml]) => { @@ -125,17 +122,19 @@ export const getPackageResourcesFromResourcesMap = (resourcesMap: PackageRevisio 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'], + }, + ]; }); });