Merge pull request #155 from siemens/Develop_3_18_24

Release v6.2.0
siemens · Apr 25, 2024 · ec8fafc · ec8fafc
2 parents 8caa02c + 5df5f67
commit ec8fafc
Show file tree

Hide file tree

Showing 8 changed files with 255,520 additions and 63,448 deletions.
diff --git a/ReadmeOSS_continuous-clearing_DockerImage.html b/ReadmeOSS_continuous-clearing_DockerImage.html
diff --git a/ReadmeOSS_continuous-clearing_nupkg.html b/ReadmeOSS_continuous-clearing_nupkg.html
diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs
@@ -173,7 +173,7 @@ private static void DisplayErrorForJfrogFoundPackages(List<ComponentsToArtifacto
 
                 foreach (var jfrogFoundPackage in JfrogFoundPackages)
                 {
-                    Logger.Info($"Successful{jfrogFoundPackage.DryRunSuffix} {jfrogFoundPackage.OperationType} package {jfrogFoundPackage.PackageName}-{jfrogFoundPackage.Version}" +
+                    Logger.Info($"Successful{jfrogFoundPackage.DryRunSuffix} {jfrogFoundPackage.OperationType} package {jfrogFoundPackage.Name}-{jfrogFoundPackage.Version}" +
                    $" from {jfrogFoundPackage.SrcRepoName} to {jfrogFoundPackage.DestRepoName}");
 
                     if (jfrogFoundPackage.ResponseMessage.ReasonPhrase == ApiConstant.ErrorInUpload)

diff --git a/src/ArtifactoryUploader/PackageUploader.cs b/src/ArtifactoryUploader/PackageUploader.cs
@@ -61,10 +61,11 @@ public static async Task UploadPackageToArtifactory(CommonAppSettings appSetting
             fileOperations.WriteContentToFile(m_ComponentsInBOM, bomGenerationPath, FileConstant.BomFileName, appSettings.SW360ProjectName);
 
             // write kpi info to console table 
-            PackageUploadHelper.WriteCreatorKpiDataToConsole(uploaderKpiData);
             if (Program.UploaderStopWatch != null)
                 uploaderKpiData.TimeTakenByComponentCreator =
                 TimeSpan.FromMilliseconds(Program.UploaderStopWatch.ElapsedMilliseconds).TotalSeconds;
+            PackageUploadHelper.WriteCreatorKpiDataToConsole(uploaderKpiData);
+
             Logger.Debug($"UploadPackageToArtifactory():End");
 
             // set the error code

diff --git a/src/ArtifactoryUploader/Program.cs b/src/ArtifactoryUploader/Program.cs
@@ -53,13 +53,10 @@ static async Task Main(string[] args)
             else
                 Logger.Logger.Log(null, Level.Alert, $"Artifactory Uploader is running in dry-run mode, no packages will be moved \n", null);
 
-
-
             Logger.Logger.Log(null, Level.Info, $"Input Parameters used in Artifactory Uploader:\n\t", null);
-            Logger.Logger.Log(null, Level.Notice, $"\tBomFilePath:\t\t  {appSettings.BomFilePath}\n\t" +
+            Logger.Logger.Log(null, Level.Notice, $"\tBomFilePath:\t\t {appSettings.BomFilePath}\n\t" +
                 $"JFrogUrl:\t\t {appSettings.JFrogApi}\n\t" +
                 $"Artifactory User:\t {appSettings.ArtifactoryUploadUser}\n\t" +
-                $"Artifactory Token:\t {appSettings.ArtifactoryUploadApiKey}\n\t" +
                 $"Release:\t\t {appSettings.Release}\n\t" +
                 $"LogFolderPath:\t\t {Path.GetFullPath(FolderPath)}\n", null);
 
@@ -69,14 +66,14 @@ static async Task Main(string[] args)
                 ApiKey = appSettings.ArtifactoryUploadApiKey,
                 Email = appSettings.ArtifactoryUploadUser
             };
-            NpmJfrogApiCommunication jfrogCommunication = new NpmJfrogApiCommunication(appSettings.JFrogApi, appSettings.JfrogNpmSrcRepo, artifactoryCredentials,appSettings.TimeOut);
+            NpmJfrogApiCommunication jfrogCommunication = new NpmJfrogApiCommunication(appSettings.JFrogApi, appSettings.JfrogNpmSrcRepo, artifactoryCredentials, appSettings.TimeOut);
             ArtifactoryValidator artifactoryValidator = new(jfrogCommunication);
             await artifactoryValidator.ValidateArtifactoryCredentials(appSettings);
 
             //Uploading Package to artifactory
             PackageUploadHelper.jFrogService = GetJfrogService(appSettings);
             await PackageUploader.UploadPackageToArtifactory(appSettings);
-            
+
 
             Logger.Logger.Log(null, Level.Notice, $"End of Artifactory Uploader execution : {DateTime.Now}\n", null);
         }

diff --git a/src/LCT.PackageIdentifier/Scanner.cs b/src/LCT.PackageIdentifier/Scanner.cs
@@ -62,6 +62,13 @@ public static List<string> FileScanner(string rootPath, Config config)
                     }                  
                 }             
             }
+
+            if (allFoundConfigFiles.Count == 0)
+            {
+                Logger.Error("Provided package file path do not contain valid input files.");
+                Environment.Exit(-1);
+            }
+
             Logger.Logger.Log(null, Level.Notice, $"\n----------------------------------------------------", null);
             return allFoundConfigFiles;
 

diff --git a/src/LCT.SW360PackageCreator/Program.cs b/src/LCT.SW360PackageCreator/Program.cs
@@ -55,10 +55,6 @@ 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.Error($"\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);

diff --git a/src/LCT.Services/Sw360Service.cs b/src/LCT.Services/Sw360Service.cs
@@ -59,12 +59,9 @@ public async Task<List<Components>> GetAvailableReleasesInSw360(List<Components>
             {
                 Sw360ServiceStopWatch.Start();
                 string responseBody = await m_SW360ApiCommunicationFacade.GetReleases();
-
-                if(string.IsNullOrWhiteSpace(responseBody))
+                if (string.IsNullOrWhiteSpace(responseBody))
                 {
-                    Logger.Debug($"GetAvailableReleasesInSw360():");
-                    Logger.Error("SW360 server is not accessible,Please wait for sometime and re run the pipeline again");
-                    Environment.ExitCode = -1;
+                    Logger.Warn("Available release list found empty from the SW360 Server!");
                 }
 
                 Sw360ServiceStopWatch.Stop();
@@ -82,13 +79,13 @@ public async Task<List<Components>> GetAvailableReleasesInSw360(List<Components>
             {
                 Logger.Debug($"GetAvailableReleasesInSw360():", ex);
                 Logger.Error("SW360 server is not accessible,Please wait for sometime and re run the pipeline again");
-                Environment.ExitCode = -1;
+                Environment.Exit(-1);
             }
             catch (InvalidOperationException ex)
             {
                 Logger.Debug($"GetAvailableReleasesInSw360():", ex);
                 Logger.Error("SW360 server is not accessible,Please wait for sometime and re run the pipeline again");
-                Environment.ExitCode = -1;
+                Environment.Exit(-1);
             }
 
             return availableComponentsList;