handling dry run and the bom file path

Author: Aditya Narayan

src/ArtifactoryUploader/ArtifactoryUploader.cs

@@ -12,6 +12,7 @@
 using LCT.Services.Interface;
 using log4net;
 using System;
+using System.Configuration;
 using System.Net;
 using System.Net.Http;
 using System.Reflection;

src/ArtifactoryUploader/PackageUploadHelper.cs

@@ -86,7 +86,7 @@ public async static Task<List<ComponentsToArtifactory>> GetComponentsToBeUploade
                         Purl = item.Purl,
                         ComponentType = GetComponentType(item),
                         PackageType = packageType,
-                        DryRun = !appSettings.Jfrog.DryRun,
+                        DryRun = appSettings.Jfrog.DryRun,
                         SrcRepoName = item.Properties.Find(s => s.Name == Dataconstant.Cdx_ArtifactoryRepoName)?.Value,
                         DestRepoName = GetDestinationRepo(item, appSettings),
                         Token = appSettings.Jfrog.Token,

src/ArtifactoryUploader/PackageUploader.cs

@@ -33,7 +33,7 @@ public static class PackageUploader
         public static async Task UploadPackageToArtifactory(CommonAppSettings appSettings)
         {
             //Reading the CycloneBOM data
-            var bomFilePath = Path.Combine(appSettings.Directory.OutputFolder, appSettings.SW360.ProjectName + FileConstant.BomFileName);
+            var bomFilePath = Path.Combine(appSettings.Directory.OutputFolder, appSettings.SW360.ProjectName + "_" + FileConstant.BomFileName);
             Bom m_ComponentsInBOM = PackageUploadHelper.GetComponentListFromComparisonBOM(bomFilePath);
 
             DisplayAllSettings(m_ComponentsInBOM.Components, appSettings);
@@ -153,8 +153,8 @@ private static void DisplayPackageSettings(Config project)
                 $"\tTHIRD_PARTY_REPO_NAME:\t{thirdPartyRepoName}\n" +
                 $"\tRELEASE_REPO_NAME:\t{project.ReleaseRepo}\n" +
                 $"\tConfig:\n" +
-                $"\tExclude:\t\t{excludeList}\n" +
-                $"\tInclude:\t\t{includeList}\n", null);
+                $"\t\tExclude:\t\t{excludeList}\n" +
+                $"\t\tInclude:\t\t{includeList}\n", null);
         }
     }
 }

src/ArtifactoryUploader/Program.cs

@@ -56,12 +56,12 @@ static async Task Main(string[] args)
             Logger.Logger.Log(null, Level.Notice, $"\n====================<<<<< Artifactory Uploader >>>>>====================", null);
             Logger.Logger.Log(null, Level.Notice, $"\nStart of Artifactory Uploader execution: {DateTime.Now}", null);
 
-            if (appSettings.Jfrog.DryRun)
+            if (!appSettings.Jfrog.DryRun)
                 Logger.Logger.Log(null, Level.Alert, $"Artifactory Uploader is running in release mode !!! \n", null);
             else
                 Logger.Logger.Log(null, Level.Alert, $"Artifactory Uploader is running in dry-run mode, no packages will be moved \n", null);
 
-            var bomFilePath = Path.Combine(appSettings.Directory.OutputFolder, appSettings.SW360.ProjectName + FileConstant.BomFileName);
+            var bomFilePath = Path.Combine(appSettings.Directory.OutputFolder, appSettings.SW360.ProjectName + "_" + FileConstant.BomFileName);
 
             Logger.Logger.Log(null, Level.Info, $"Input Parameters used in Artifactory Uploader:\n\t", null);
             Logger.Logger.Log(null, Level.Notice, $"\tBomFilePath:\t\t {bomFilePath}\n\t" +