Skip to content
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.

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

Sonar qube issue fixes #253

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/ArtifactoryUploader/ArtifactoryUploader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ async Task<AqlResult> TryGetPackageInfo(ComponentsToArtifactory component)


// Handle DEBIAN package name mismatch
if (component.ComponentType == "DEBIAN" && packageInfo?.Name != component.JfrogPackageName)
if (component.ComponentType == "DEBIAN" && packageInfo != null && packageInfo.Name != component.JfrogPackageName)
{
component.CopyPackageApiUrl = component.CopyPackageApiUrl.Replace(component.JfrogPackageName, packageInfo.Name);
}
Expand All @@ -112,7 +112,7 @@ async Task<AqlResult> TryGetPackageInfo(ComponentsToArtifactory component)

if (packageInfo != null)
{
component.CopyPackageApiUrl = component.CopyPackageApiUrl.ToLower();
component.CopyPackageApiUrl = component.CopyPackageApiUrl.Replace(component.JfrogPackageName, packageInfo.Name);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/ArtifactoryUploader/JfrogRepoUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace LCT.ArtifactoryUploader
{
public class JfrogRepoUpdater
public static class JfrogRepoUpdater
{
static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public static IJFrogService jFrogService { get; set; }
Expand All @@ -28,7 +28,7 @@ public static async Task<Bom> UpdateJfrogRepoPathForSucessfullyUploadedItems(Bom
List<ComponentsToArtifactory> uploadedPackages = PackageUploadInformation.GetUploadePackageDetails(displayPackagesInfo);

// Get the details of all the dest repo names from jfrog at once
List<string> destRepoNames = uploadedPackages.Select(x => x.DestRepoName)?.Distinct()?.ToList() ?? new List<string>();
List<string> destRepoNames = uploadedPackages.Select(x => x.DestRepoName).Distinct().ToList();
List<AqlResult> jfrogPackagesListAql = await GetJfrogRepoInfoForAllTypePackages(destRepoNames);

// Update the repo path
Expand Down
122 changes: 71 additions & 51 deletions src/LCT.PackageIdentifier/ConanProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -385,73 +385,93 @@ private static void GetDependecyDetails(List<Component> componentsForBOM, List<C
private static void GetPackagesForBom(ref List<Component> lstComponentForBOM, ref int noOfDevDependent, List<ConanPackage> nodePackages)
{
var rootNode = nodePackages.FirstOrDefault();
if (rootNode != null && (!rootNode.Dependencies.Any() || rootNode.Dependencies == null))
ValidateRootNode(rootNode, nodePackages);

var directDependencies = GetDirectDependencies(nodePackages);

foreach (var component in nodePackages.Skip(1))
{
ProcessComponent(component, directDependencies, ref lstComponentForBOM, ref noOfDevDependent, nodePackages);
}
}

private static void ValidateRootNode(ConanPackage rootNode, List<ConanPackage> nodePackages)
{
if (rootNode == null || !rootNode.Dependencies.Any())
{
throw new ArgumentNullException(nameof(nodePackages), "Dependency(requires) node name details not present in the root node.");
}
}

ConanPackage package = nodePackages.Where(x => x.Id == "0").FirstOrDefault();
List<string> directDependencies = new List<string>();
if (package.Dependencies != null) { directDependencies.AddRange(package.Dependencies); }
if (package.DevDependencies != null) { directDependencies.AddRange(package.DevDependencies); }
private static List<string> GetDirectDependencies(List<ConanPackage> nodePackages)
{
var package = nodePackages.FirstOrDefault(x => x.Id == "0");
var directDependencies = new List<string>();

// Ignoring the root node as it is the package information node and we are anyways considering all
// nodes in the lock file.
foreach (var component in nodePackages.Skip(1))
if (package != null)
{
BomCreator.bomKpiData.ComponentsinPackageLockJsonFile += 1;
Property isdev = new() { Name = Dataconstant.Cdx_IsDevelopment, Value = "false" };

if (string.IsNullOrEmpty(component.Reference))
if (package.Dependencies != null)
{
BomCreator.bomKpiData.ComponentsinPackageLockJsonFile--;
continue;
directDependencies.AddRange(package.Dependencies);
}

Component components = new Component();

// dev components are not ignored and added as a part of SBOM
var buildNodeIds = GetBuildNodeIds(nodePackages);
if (IsDevDependency(component, buildNodeIds, ref noOfDevDependent))
if (package.DevDependencies != null)
{
isdev.Value = "true";
directDependencies.AddRange(package.DevDependencies);
}
}

string packageName = Convert.ToString(component.Reference);
return directDependencies;
}

if (packageName.Contains('/'))
{
components.Name = packageName.Split(new char[] { '/', '@' })[0];
components.Version = packageName.Split(new char[] { '/', '@' })[1];
}
else
{
components.Name = packageName;
}
private static void ProcessComponent(ConanPackage component, List<string> directDependencies, ref List<Component> lstComponentForBOM, ref int noOfDevDependent, List<ConanPackage> nodePackages)
{
BomCreator.bomKpiData.ComponentsinPackageLockJsonFile += 1;
var isdev = new Property { Name = Dataconstant.Cdx_IsDevelopment, Value = "false" };

Property siemensFileName = new Property()
{
Name = Dataconstant.Cdx_Siemensfilename,
Value = component.Reference
};
var isDirect = directDependencies.Contains(component.Id) ? "true" : "false";
Property siemensDirect = new Property()
{
Name = Dataconstant.Cdx_SiemensDirect,
Value = isDirect
};

components.Type = Component.Classification.Library;
components.Purl = $"{ApiConstant.ConanExternalID}{components.Name}@{components.Version}";
components.BomRef = $"{ApiConstant.ConanExternalID}{components.Name}@{components.Version}";
components.Properties = new List<Property>();
components.Properties.Add(isdev);
components.Properties.Add(siemensDirect);
components.Properties.Add(siemensFileName);
lstComponentForBOM.Add(components);
if (string.IsNullOrEmpty(component.Reference))
{
BomCreator.bomKpiData.ComponentsinPackageLockJsonFile--;
return;
}

var components = CreateComponent(component, directDependencies, ref noOfDevDependent, nodePackages, isdev);
lstComponentForBOM.Add(components);
}

private static Component CreateComponent(ConanPackage component, List<string> directDependencies, ref int noOfDevDependent, List<ConanPackage> nodePackages, Property isdev)
{
var buildNodeIds = GetBuildNodeIds(nodePackages);
if (IsDevDependency(component, buildNodeIds, ref noOfDevDependent))
{
isdev.Value = "true";
}

var components = new Component();
string packageName = Convert.ToString(component.Reference);
if (packageName.Contains('/'))
{
var parts = packageName.Split(new char[] { '/', '@' });
components.Name = parts[0];
components.Version = parts[1];
}
else
{
components.Name = packageName;
}

components.Properties = new List<Property>
{
isdev,
new Property { Name = Dataconstant.Cdx_Siemensfilename, Value = component.Reference },
new Property { Name = Dataconstant.Cdx_SiemensDirect, Value = directDependencies.Contains(component.Id) ? "true" : "false" }
};

components.Type = Component.Classification.Library;
components.Purl = $"{ApiConstant.ConanExternalID}{components.Name}@{components.Version}";
components.BomRef = $"{ApiConstant.ConanExternalID}{components.Name}@{components.Version}";

return components;
}
private static List<string> GetBuildNodeIds(List<ConanPackage> nodePackages)
{
return nodePackages
Expand Down
8 changes: 6 additions & 2 deletions src/LCT.PackageIdentifier/MavenProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
AqlResult finalRepoData = GetJfrogArtifactoryRepoDetials(aqlResultList, component, bomhelper, out jfrogRepoPath);
Property siemensfileNameProp = new() { Name = Dataconstant.Cdx_Siemensfilename, Value = finalRepoData?.Name ?? Dataconstant.PackageNameNotFoundInJfrog };
Property jfrogRepoPathProp = new() { Name = Dataconstant.Cdx_JfrogRepoPath, Value = jfrogRepoPath };
Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoName, Value = finalRepoData.Repo };
Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoName, Value = finalRepoData?.Repo ?? Dataconstant.NotFoundInJFrog };

Component componentVal = component;
if (artifactoryrepo.Value == appSettings.Maven.DevDepRepo)
Expand Down Expand Up @@ -383,7 +383,11 @@ private static AqlResult GetJfrogArtifactoryRepoDetials(List<AqlResult> aqlResul
aqlResult = aqlResults.FirstOrDefault(x => x.Repo.Equals(repoName));
jfrogRepoPath = GetJfrogRepoPath(aqlResult);
}
aqlResult.Repo ??= repoName;
if (aqlResult != null)
{
aqlResult.Repo = aqlResult.Repo ?? repoName;
}

return aqlResult;
}

Expand Down
2 changes: 1 addition & 1 deletion src/LCT.PackageIdentifier/NpmProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ public AqlResult GetJfrogArtifactoryRepoDetials(List<AqlResult> aqlResultList,
// Forming Jfrog repo Path
if (!repoName.Equals(NotFoundInRepo, StringComparison.OrdinalIgnoreCase))
{
aqlResult = aqlResults.FirstOrDefault(x => x.Repo.Equals(repoName));
aqlResult = aqlResults.FirstOrDefault(x => x.Repo.Equals(repoName)) ?? new AqlResult();
jfrogRepoPath = GetJfrogRepoPath(aqlResult);
}

Expand Down
4 changes: 2 additions & 2 deletions src/LCT.PackageIdentifier/NugetDevDependencyParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ private static void GetDirectDependencies(string filePath)
var readValue = File.ReadAllText(filePath);
JObject serializedContent = JObject.Parse(readValue);
JToken projectFramworks = serializedContent["project"]["frameworks"];
if (projectFramworks == null && !projectFramworks.HasValues)
if (projectFramworks == null || !projectFramworks.HasValues)
{
return;
}
Expand All @@ -203,7 +203,7 @@ private static void GetDirectDependencies(string filePath)

if (projectDependencies.HasValues)
{
directDepCollection = projectDependencies.Children().OfType<JProperty>()?.ToList() ?? new List<JProperty>();
directDepCollection = projectDependencies.Children().OfType<JProperty>().ToList();
}
foreach (var child in directDepCollection)
{
Expand Down
2 changes: 1 addition & 1 deletion src/LCT.PackageIdentifier/NugetProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ public AqlResult GetJfrogArtifactoryRepoDetials(List<AqlResult> aqlResultList,
// Forming Jfrog repo Path
if (!repoName.Equals(NotFoundInRepo, StringComparison.OrdinalIgnoreCase))
{
aqlResult = aqlResults.FirstOrDefault(x => x.Repo.Equals(repoName));
aqlResult = aqlResults.FirstOrDefault(x => x.Repo.Equals(repoName)) ?? new AqlResult();
jfrogRepoPath = GetJfrogRepoPath(aqlResult);
}
aqlResult.Repo ??= repoName;
Expand Down
2 changes: 1 addition & 1 deletion src/LCT.SW360PackageCreator/CreatorValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static async Task TriggerFossologyValidation(CommonAppSettings appSetting
else
{
int currentPage = page;
int totalPages = (int)(releaseResponse?.Page?.TotalPages);
int totalPages = releaseResponse?.Page?.TotalPages ?? 0;
if (currentPage < totalPages - 1)
{
page = currentPage + 1;
Expand Down
Loading