From f5a0b52be4d9b718e6266335c64b2f989566d6cb Mon Sep 17 00:00:00 2001 From: Malavika Date: Wed, 18 Dec 2024 19:10:19 +0530 Subject: [PATCH 1/4] Added the summary --- src/LCT.PackageIdentifier/BomHelper.cs | 4 ++++ src/LCT.PackageIdentifier/ConanProcessor.cs | 17 +++++++++++++++++ src/LCT.PackageIdentifier/DebianProcessor.cs | 17 +++++++++++++++++ src/LCT.PackageIdentifier/MavenProcessor.cs | 17 +++++++++++++++++ src/LCT.PackageIdentifier/Model/BomKpiData.cs | 13 +++++++++++++ src/LCT.PackageIdentifier/NpmProcessor.cs | 17 +++++++++++++++++ src/LCT.PackageIdentifier/NugetProcessor.cs | 16 ++++++++++++++++ src/LCT.PackageIdentifier/PythonProcessor.cs | 17 +++++++++++++++++ 8 files changed, 118 insertions(+) diff --git a/src/LCT.PackageIdentifier/BomHelper.cs b/src/LCT.PackageIdentifier/BomHelper.cs index 7821d676..5ce7b1d9 100644 --- a/src/LCT.PackageIdentifier/BomHelper.cs +++ b/src/LCT.PackageIdentifier/BomHelper.cs @@ -51,6 +51,10 @@ public void WriteBomKpiDataToConsole(BomKpiData bomKpiData) {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.ComponentsExcluded)),bomKpiData.ComponentsExcluded}, {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.DuplicateComponents)),bomKpiData.DuplicateComponents}, {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.InternalComponents)),bomKpiData.InternalComponents}, + {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.ThirdPartyRepoComponents)),bomKpiData.ThirdPartyRepoComponents}, + {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.DevdependencyComponents)),bomKpiData.DevdependencyComponents}, + {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.ReleaseRepoComponents)),bomKpiData.ReleaseRepoComponents}, + {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.UnofficialComponents)),bomKpiData.UnofficialComponents}, {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.ComponentsinSBOMTemplateFile)),bomKpiData.ComponentsinSBOMTemplateFile}, {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.ComponentsUpdatedFromSBOMTemplateFile)),bomKpiData.ComponentsUpdatedFromSBOMTemplateFile}, {CommonHelper.Convert(bomKpiData,nameof(bomKpiData.ComponentsInComparisonBOM)),bomKpiData.ComponentsInComparisonBOM } diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs index 936da4a4..e603ce8a 100644 --- a/src/LCT.PackageIdentifier/ConanProcessor.cs +++ b/src/LCT.PackageIdentifier/ConanProcessor.cs @@ -133,6 +133,23 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List(); diff --git a/src/LCT.PackageIdentifier/Model/BomKpiData.cs b/src/LCT.PackageIdentifier/Model/BomKpiData.cs index e402b4b3..83c83245 100644 --- a/src/LCT.PackageIdentifier/Model/BomKpiData.cs +++ b/src/LCT.PackageIdentifier/Model/BomKpiData.cs @@ -33,6 +33,19 @@ public class BomKpiData [DisplayName(@"Internal Components Identified")] public int InternalComponents { get; set; } + [DisplayName(@"Components already present in 3rd party repo(s) ")] + public int ThirdPartyRepoComponents { get; set; } + + [DisplayName(@"Components already present in devdep repo(s)")] + public int DevdependencyComponents { get; set; } + + [DisplayName(@"Components already present in release repo(s)")] + public int ReleaseRepoComponents { get; set; } + + [DisplayName(@"Components not from official repo(s)")] + public int UnofficialComponents { get; set; } + + [DisplayName(@"Total Components Excluded")] public int ComponentsExcluded { get; set; } diff --git a/src/LCT.PackageIdentifier/NpmProcessor.cs b/src/LCT.PackageIdentifier/NpmProcessor.cs index d269025b..b8f2d48a 100644 --- a/src/LCT.PackageIdentifier/NpmProcessor.cs +++ b/src/LCT.PackageIdentifier/NpmProcessor.cs @@ -411,6 +411,23 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List(); diff --git a/src/LCT.PackageIdentifier/PythonProcessor.cs b/src/LCT.PackageIdentifier/PythonProcessor.cs index 2daadc33..c9246ee5 100644 --- a/src/LCT.PackageIdentifier/PythonProcessor.cs +++ b/src/LCT.PackageIdentifier/PythonProcessor.cs @@ -415,6 +415,23 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List Date: Wed, 18 Dec 2024 21:26:14 +0530 Subject: [PATCH 2/4] changes in package file --- src/LCT.PackageIdentifier/ConanProcessor.cs | 2 +- src/LCT.PackageIdentifier/DebianProcessor.cs | 2 +- src/LCT.PackageIdentifier/MavenProcessor.cs | 2 +- src/LCT.PackageIdentifier/NpmProcessor.cs | 2 +- src/LCT.PackageIdentifier/NugetProcessor.cs | 2 +- src/LCT.PackageIdentifier/PythonProcessor.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs index e603ce8a..8001eb8c 100644 --- a/src/LCT.PackageIdentifier/ConanProcessor.cs +++ b/src/LCT.PackageIdentifier/ConanProcessor.cs @@ -146,7 +146,7 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List Date: Thu, 19 Dec 2024 14:01:28 +0530 Subject: [PATCH 3/4] changes for unoffical --- src/LCT.PackageIdentifier/ConanProcessor.cs | 2 +- src/LCT.PackageIdentifier/DebianProcessor.cs | 2 +- src/LCT.PackageIdentifier/MavenProcessor.cs | 2 +- src/LCT.PackageIdentifier/NpmProcessor.cs | 3 ++- src/LCT.PackageIdentifier/NugetProcessor.cs | 2 +- src/LCT.PackageIdentifier/PythonProcessor.cs | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs index 8001eb8c..7cb5a1d6 100644 --- a/src/LCT.PackageIdentifier/ConanProcessor.cs +++ b/src/LCT.PackageIdentifier/ConanProcessor.cs @@ -146,7 +146,7 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List Date: Thu, 19 Dec 2024 14:35:28 +0530 Subject: [PATCH 4/4] Data constant change --- src/LCT.Common/Constants/Dataconstant.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LCT.Common/Constants/Dataconstant.cs b/src/LCT.Common/Constants/Dataconstant.cs index 84f537d5..ace66df6 100644 --- a/src/LCT.Common/Constants/Dataconstant.cs +++ b/src/LCT.Common/Constants/Dataconstant.cs @@ -47,6 +47,7 @@ public static class Dataconstant public const string PackageUrlNotFound = "Package URL not found"; public const string PackageNameNotFoundInJfrog = "Package name not found in Jfrog"; public const string JfrogRepoPathNotFound = "Jfrog repo path not found"; + public const string NotFoundInJFrog = "Not Found in JFrogRepo"; public const string LinkedByCATool = "Linked by CA Tool"; public const string LinkedByCAToolReleaseRelation = "UNKNOWN"; public const string LinkedByCAToolReleaseRelationContained = "CONTAINED";