Updated changes for distro and clone repository

Author: ragavareddychalapala

src/LCT.PackageIdentifier/AlpineProcesser.cs

@@ -168,19 +168,27 @@ private static string GetReleaseExternalId(string name, string version)
             return $"{Dataconstant.PurlCheck()["ALPINE"]}{Dataconstant.ForwardSlash}{name}@{version}?arch=source";
         }
 
+        private static string GetDistro(AlpinePackage alpinePackage)
+        {
+            var distro = alpinePackage.PurlID;
+            distro = distro.Substring(distro.LastIndexOf("distro"));
+            return distro;
+        }
+
         private static List<Component> FormComponentReleaseExternalID(List<AlpinePackage> listOfComponents)
         {
             List<Component> listComponentForBOM = new List<Component>();
 
             foreach (var prop in listOfComponents)
             {
+                var distro = GetDistro(prop);
                 Component component = new Component
                 {
                     Name = prop.Name,
                     Version = prop.Version,
                     Purl = GetReleaseExternalId(prop.Name, prop.Version)
                 };
-                component.BomRef = component.Purl;
+                component.BomRef = $"{Dataconstant.PurlCheck()["ALPINE"]}{Dataconstant.ForwardSlash}{prop.Name}@{prop.Version}?{distro}";
                 Property identifierType = new() { Name = Dataconstant.Cdx_IdentifierType, Value = Dataconstant.Discovered };
                 component.Properties = new List<Property> { identifierType };
                 listComponentForBOM.Add(component);

src/LCT.PackageIdentifier/Program.cs

@@ -24,6 +24,7 @@
 using LCT.APICommunications.Interfaces;
 using LCT.APICommunications;
 using LCT.APICommunications.Model;
+using System.Drawing;
 
 namespace LCT.PackageIdentifier
 {
@@ -53,6 +54,10 @@ static async Task Main(string[] args)
             Logger.Logger.Log(null, Level.Notice, $"\n====================<<<<< Package Identifier >>>>>====================", null);
             Logger.Logger.Log(null, Level.Notice, $"\nStart of Package Identifier execution: {DateTime.Now}", null);
 
+            if (appSettings.ProjectType.ToUpperInvariant() == "ALPINE")
+            {
+                Logger.Warn($"\nPlease note that the Alpine feature is currently in preview state. This means it's available for testing and evaluation purposes. While functional, it may not yet include all planned features and could encounter occasional issues. Your feedback during this preview phase is appreciated as we work towards its official release. Thank you for exploring Alpine with us.");
+            }
 
             if (appSettings.IsTestMode)
                 Logger.Logger.Log(null, Level.Alert, $"Package Identifier is running in TEST mode \n", null);

src/LCT.SW360PackageCreator.UTest/AlpinePackageDownloaderTest.cs

@@ -20,11 +20,11 @@ public async Task DownloadSourceForAlpine_ProvidedSourceURL_ReturnsDownloadPath(
             {
                 Name = "apk-tools",
                 Version = "2.14.0-r2",
-                SourceUrl = "https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v2.14.0/apk-tools-v2.14.0.tar.gz",
+                SourceUrl = "https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v2.12.9/apk-tools-v2.12.9.tar.gz",
                 AlpineSource= "https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$pkgver/apk-tools-v$pkgver.tar.gz\\n\\tfix-recursive-solve-1.patch\\n\\tfix-recursive-solve-2.patch\\n\\t_apk\\n\\t"
 
             };
-            var localPathforDownload = $"{Directory.GetParent(Directory.GetCurrentDirectory())}/ClearingTool/DownloadedFiles/";
+            var localPathforDownload = $"{Directory.GetParent(Directory.GetCurrentDirectory())}\\ClearingTool\\DownloadedFiles\\";
             var alpinePackageDownloader = new AlpinePackageDownloader();
 
             //Act
@@ -40,13 +40,13 @@ public async Task DownloadSourceForAlpine_ProvidedInValidSourceURL_ReturnsNull()
             //Sending Incorrect SourceURL
             var lstComparisonBomData = new ComparisonBomData()
             {
-                Name = "abi-compliance-checker",
-                Version = "2.14.0-r2",
-                SourceUrl = "https://github.com/lvc/abi-compliance-checker/archive/$pkgver.tar.gz",
-                AlpineSource=""
+                Name = "ca-certificates",
+                Version = "20220614-r0",
+                SourceUrl = "https://gitlab.alpinelinux.org/alpine/ca-certificates/-/archive/ca-certificates-20230506.tar.bz2",
+                AlpineSource =""
 
             };
-            var localPathforDownload = $"{Directory.GetParent(Directory.GetCurrentDirectory())}/ClearingTool/DownloadedFiles/";
+            var localPathforDownload = $"{Directory.GetParent(Directory.GetCurrentDirectory())}\\ClearingTool\\DownloadedFiles\\";
             var alpinePackageDownloader = new AlpinePackageDownloader();
 
             //Act

src/LCT.SW360PackageCreator.UTest/UrlHelperTest.cs

@@ -131,14 +131,14 @@ public async Task GetSourceUrlForPythonPackage_ProvidedInvalidPackageDetails_Ret
             Assert.That(string.IsNullOrEmpty(sourceUrl));
         }
 
-        [TestCase("apk-tools", "2.14.0-r2")]
-        public async Task GetSourceUrlForAlpinePackage_ProvidedPackageDetails_ReturnsValidSourceURL(string componentName, string version)
+        [TestCase("apk-tools", "2.12.9-r3", "pkg:apk/alpine/[email protected]?distro=alpine-3.16.2")]
+        public async Task GetSourceUrlForAlpinePackage_ProvidedPackageDetails_ReturnsValidSourceURL(string componentName, string version,string bomref)
         {
             // Arrange
             IUrlHelper urlHelper = new UrlHelper();
 
             // Act
-            var sourceUrlDetails = await urlHelper.GetSourceUrlForAlpinePackage(componentName, version);
+            var sourceUrlDetails = await urlHelper.GetSourceUrlForAlpinePackage(componentName, version,bomref);
 
             // Assert
             Assert.That(sourceUrlDetails.SourceUrl.Contains("apk-tools"));

src/LCT.SW360PackageCreator/AlpinePackageDownloader.cs

@@ -124,6 +124,7 @@ private static string ApplyPatchFilesToSourceCode(string downloadPath, string so
                             }
                         };
                         process.Start();
+                        process.WaitForExit();
                     }
 
                     foreach (var fileNames in buildFilesList)
@@ -220,8 +221,8 @@ public static string PackageFolderGzip(string localPathforDownload, ComparisonBo
             if (Directory.GetDirectories(localPathforDownload).Length != 0)
             {
 
-                var tempFolder = Directory.CreateDirectory($"{Directory.GetParent(Directory.GetCurrentDirectory())}/ClearingTool/DownloadedFiles/SourceCodeZipped/{component.Name}/--{DateTime.Now.ToString("yyyyMMddHHmmss")}{Dataconstant.ForwardSlash}");
-                tarArchivePath = tempFolder + component.Name + ".tar.gz";
+                var tempFolder = Directory.CreateDirectory($"{Directory.GetParent(Directory.GetCurrentDirectory())}\\ClearingTool\\DownloadedFiles\\SourceCodeZipped\\{component.Name}\\--{DateTime.Now.ToString("yyyyMMddHHmmss")}\\");
+                tarArchivePath = tempFolder + (component.Name + "_" + component.Version) +".tar.gz";
                 var InputDirectory = localPathforDownload;
                 var OutputFilename = tarArchivePath;
                 using Stream zipStream = new FileStream(System.IO.Path.GetFullPath(OutputFilename), FileMode.Create, FileAccess.Write);

src/LCT.SW360PackageCreator/ComponentCreator.cs

@@ -84,7 +84,7 @@ private async Task<List<Components>> GetListOfBomData(List<Component> components
                     componentsData.ComponentExternalId = item.Purl.Substring(0, item.Purl.IndexOf('@'));
                     componentsData.ReleaseExternalId = item.Purl;
 
-                    Components component = await GetSourceUrl(componentsData.Name, componentsData.Version, componentsData.ProjectType);
+                    Components component = await GetSourceUrl(componentsData.Name, componentsData.Version, componentsData.ProjectType, item.BomRef);
                     componentsData.SourceUrl = component.SourceUrl;
 
                     if (componentsData.ProjectType.ToUpperInvariant() == "ALPINE")
@@ -179,7 +179,7 @@ private static string GetPackageName(Component item)
             }
         }
 
-        private static async Task<Components> GetSourceUrl(string name, string version, string projectType)
+        private static async Task<Components> GetSourceUrl(string name, string version, string projectType, string bomRef)
         {
             Components componentsData = new Components();
             switch (projectType.ToUpperInvariant())
@@ -202,7 +202,7 @@ private static async Task<Components> GetSourceUrl(string name, string version,
                     componentsData.SourceUrl = await UrlHelper.Instance.GetSourceUrlForConanPackage(name, version);
                     break;
                 case "ALPINE":
-                    Components alpComponentData = await UrlHelper.Instance.GetSourceUrlForAlpinePackage(name, version);
+                    Components alpComponentData = await UrlHelper.Instance.GetSourceUrlForAlpinePackage(name, version,bomRef);
                     componentsData = alpComponentData;
                     componentsData.ProjectType = projectType;
                     break;

src/LCT.SW360PackageCreator/Interfaces/IURLHelper.cs

@@ -62,8 +62,8 @@ public interface IUrlHelper
         /// </summary>
         /// <param name="componentName"></param>
         /// <param name="componenVersion"></param>
-        /// <param name="componentsData"></param>
+        /// <param name="bomRef"></param>
         /// <returns>string</returns>
-        Task<Components> GetSourceUrlForAlpinePackage(string componentName, string componenVersion);
+        Task<Components> GetSourceUrlForAlpinePackage(string componentName, string componenVersion, string bomRef);
     }
 }

src/LCT.SW360PackageCreator/Program.cs

@@ -15,6 +15,7 @@
 using LCT.SW360PackageCreator.Interfaces;
 using log4net;
 using log4net.Core;
+using NuGet.Protocol.Plugins;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -54,6 +55,10 @@ static async Task Main(string[] args)
 
             Logger.Logger.Log(null, Level.Notice, $"\n====================<<<<< Package creator >>>>>====================", null);
             Logger.Logger.Log(null, Level.Notice, $"\nStart of Package creator execution : {DateTime.Now}", null);
+            if (appSettings.ProjectType.ToUpperInvariant() == "ALPINE")
+            { 
+                Logger.Warn($"\nPlease note that the Alpine feature is currently in preview state. This means it's available for testing and evaluation purposes. While functional, it may not yet include all planned features and could encounter occasional issues. Your feedback during this preview phase is appreciated as we work towards its official release. Thank you for exploring Alpine with us.");
+            }
 
             if (appSettings.IsTestMode)
                 Logger.Logger.Log(null, Level.Alert, $"Package creator is running in TEST mode \n", null);

src/LCT.SW360PackageCreator/URLHelper.cs

@@ -59,18 +59,25 @@ public class UrlHelper : IUrlHelper, IDisposable
         /// </summary>
         /// <param name="componentName"></param>
         /// <param name="componenVersion"></param>
+        /// <param name="bomRef"></param>
         /// <returns>Components</returns>
-        public async Task<Components> GetSourceUrlForAlpinePackage(string componentName, string componenVersion)
+        public async Task<Components> GetSourceUrlForAlpinePackage(string componentName, string componenVersion, string bomRef)
         {
             Components componentsData = new Components();
             try
             {
                 string localPathforSourceRepo = GetDownloadPathForAlpineRepo();
                 string fullPath = Path.Combine(localPathforSourceRepo, "aports");
+                var alpineDistro = GetAlpineDistro(bomRef);
                 if (!Directory.Exists(fullPath))
                 {
                     //Clone AlpineRepository
-                    CloneSource(localPathforSourceRepo);
+                    CloneSource(localPathforSourceRepo, alpineDistro, fullPath);
+                }
+                else
+                {
+                    //Checkout stable branch
+                    CheckoutDistro(alpineDistro, fullPath);
                 }
 
                 AlpinePackage alpinePackSourceDetails = await GetAlpineSourceUrl(componentName, componenVersion, localPathforSourceRepo);
@@ -88,6 +95,15 @@ public async Task<Components> GetSourceUrlForAlpinePackage(string componentName,
             }
             return componentsData;
         }
+        public static string GetAlpineDistro(string bomRef)
+        {
+
+            string[] getDistro = bomRef.Split("distro");
+            string[] getDestroVersion = getDistro[1].Split("-");
+            var output = getDestroVersion[1].Substring(0, getDestroVersion[1].Length - 2);
+            var distro = output + "-stable";
+            return distro;
+        }
 
         private static Task<AlpinePackage> GetAlpineSourceUrl(string name, string version, string localPathforSourceRepo)
         {
@@ -154,9 +170,11 @@ public static string GetSourceUrlForAlpine(string pkgFilePath, string sourceData
             try
             {
                 var pkgVersionLine = File.ReadLines(pkgFilePath).FirstOrDefault(x => x.StartsWith("pkgver"));
+                var pkgNameLine = File.ReadLines(pkgFilePath).FirstOrDefault(x => x.StartsWith("pkgname"));
                 var _commitLine = File.ReadLines(pkgFilePath).FirstOrDefault(x => x.StartsWith("_commit"));
                 var _tzcodeverLine = File.ReadLines(pkgFilePath).FirstOrDefault(x => x.StartsWith("_tzcodever"));
                 string pkgVersion = string.Empty;
+                string pkgName = string.Empty;
                 string _commitValue = string.Empty;
                 string _tzcodever = string.Empty;
 
@@ -165,10 +183,19 @@ public static string GetSourceUrlForAlpine(string pkgFilePath, string sourceData
                     string[] pkgVersionValue = Regex.Split(pkgVersionLine, @"\=");
                     pkgVersion = pkgVersionValue[1];
                 }
+                if (pkgNameLine != null)
+                {
+                    string[] pkgNameData = Regex.Split(pkgNameLine, @"\=");
+                    pkgName = pkgNameData[1];
+                }
                 if (_tzcodeverLine != null)
                 {
                     string[] _tzcodeverValue = Regex.Split(_tzcodeverLine, @"\=");
                     _tzcodever = _tzcodeverValue[1];
+                    if (_tzcodeverLine.Contains("pkgver"))
+                    {
+                        _tzcodever = pkgVersion;
+                    }
                 }
                 if (_commitLine != null)
                 {
@@ -179,7 +206,7 @@ public static string GetSourceUrlForAlpine(string pkgFilePath, string sourceData
                 {
                     Match url = Regex.Match(sourceData, @"http(s)?://([\w-]+\.)+[\w-]+(/[\w- ./?%&=$]*)?");
                     string finalUrl = url.ToString();
-                    sourceUrl = finalUrl.Replace("$pkgver", pkgVersion).Replace("$_commit", _commitValue).Replace("$_tzcodever", _tzcodever);
+                    sourceUrl = finalUrl.Replace("$pkgver", pkgVersion).Replace("$pkgname", pkgName).Replace("$_commit", _commitValue).Replace("$_tzcodever", _tzcodever);
                     if (pkgVersion == null && _commitValue == null && _tzcodever == null)
                     {
                         sourceUrl = string.Empty;
@@ -203,7 +230,7 @@ public static string GetDownloadPathForAlpineRepo()
             string localPathforSourceRepo = string.Empty;
             try
             {
-                localPathforSourceRepo = $"{Directory.GetParent(Directory.GetCurrentDirectory())}/ClearingTool/DownloadedFiles/";
+                localPathforSourceRepo = $"{Directory.GetParent(Directory.GetCurrentDirectory())}\\ClearingTool\\DownloadedFiles\\";
             }
             catch (IOException ex)
             {
@@ -227,7 +254,7 @@ private static string GetComponentExternalIdForAlpine(string name)
             return $"{Dataconstant.PurlCheck()["ALPINE"]}{Dataconstant.ForwardSlash}{name}?arch=source";
         }
 
-        private static void CloneSource(string localPathforSourceRepo)
+        private static void CloneSource(string localPathforSourceRepo, string alpineDistro, string fullPath)
         {
             List<string> gitCommands = GetGitCloneCommands();
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -263,7 +290,27 @@ private static void CloneSource(string localPathforSourceRepo)
                 process.Start();
                 process.WaitForExit();
             }
+            if (Directory.Exists(fullPath))
+            {
+                CheckoutDistro(alpineDistro, fullPath);
+            }
+
+        }
 
+        private static void CheckoutDistro(string alpineDistro, string fullPath)
+        {
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo()
+                {
+                    CreateNoWindow = true,
+                    FileName = "git",
+                    Arguments = $"checkout" + " " + alpineDistro,
+                    WorkingDirectory = fullPath,
+                }
+            };
+            process.Start();
+            process.WaitForExit();
         }
 
         private static List<string> GetGitCloneCommands()

src/SW360IntegrationTest/Alpine/ComponentCreatorInitialAlpine.cs

@@ -140,7 +140,7 @@ public async Task ReleaseCreation__AfterSuccessfulExeRun_ReturnsClearingStateAsN
                 new AuthenticationHeaderValue(testParameters.SW360AuthTokenType, testParameters.SW360AuthTokenValue);
             string expectedname = "apk-tools";
             string expectedversion = "2.12.9-r3";
-            string expecteddownloadurl = "https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v2.14.0/apk-tools-v2.14.0.tar.gz";
+            string expecteddownloadurl = "https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v2.12.9/apk-tools-v2.12.9.tar.gz";
             string expectedexternalid = "pkg:apk/alpine/[email protected]?arch=source";
             //url formation for retrieving component details
             string url = TestConstant.Sw360ReleaseApi + TestConstant.componentNameUrl + "apk-tools";