Merge pull request #176 from siemens/feature/hashaddition

Bug fix : Conan and Debian
siemens · Jun 14, 2024 · cd044ce · cd044ce
2 parents 209a4b3 + 18c1f2a
commit cd044ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs
@@ -126,8 +126,9 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
             foreach (var component in componentsForBOM)
             {
                 string repoName = GetArtifactoryRepoName(aqlResultList, component);
-                string jfrogpackageName = $"{component.Name}-{component.Version}";
-                var hashes = aqlResultList.FirstOrDefault(x => x.Name == jfrogpackageName);
+                string jfrogpackageName = $"{component.Name}/{component.Version}";
+                Logger.Debug($"Repo Name for the package {jfrogpackageName} is {repoName}");
+                var hashes = aqlResultList.FirstOrDefault(x => x.Path.Contains(jfrogpackageName, StringComparison.OrdinalIgnoreCase));            
                 Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName };
                 Component componentVal = component;
 

diff --git a/src/LCT.PackageIdentifier/DebianProcessor.cs b/src/LCT.PackageIdentifier/DebianProcessor.cs
@@ -105,8 +105,11 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
             foreach (var component in componentsForBOM)
             {
                 string repoName = GetArtifactoryRepoName(aqlResultList, component, bomhelper);
-                string jfrogpackageName = $"{component.Name}-{component.Version}{ApiConstant.DebianExtension}";
-                var hashes = aqlResultList.FirstOrDefault(x => x.Name == jfrogpackageName);
+                string jfrogpackageName = $"{component.Name}_{component.Version}";
+                Logger.Debug($"Repo Name for the package {jfrogpackageName} is {repoName}");
+                var hashes = aqlResultList.FirstOrDefault(x => x.Name.Contains(
+                    jfrogpackageName, StringComparison.OrdinalIgnoreCase));
+
                 Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName };
                 Component componentVal = component;
 
@@ -207,7 +210,7 @@ private static string GetArtifactoryRepoName(List<AqlResult> aqlResultList, Comp
                 jfrogcomponentName, StringComparison.OrdinalIgnoreCase));
 
             string repoName = CommonIdentiferHelper.GetRepodetailsFromPerticularOrder(aqlResults);
-
+            Logger.Debug($"Repo Name for the package {jfrogcomponentName} is {repoName}");
             string fullName = bomHelper.GetFullNameOfComponent(component);
             string fullNameVersion = $"{fullName}";