Hotfix v3.1.2 - Bug fix for getting correct artifactory repo name from Jfrog for NuGet

.github/workflows/compile.yml

@@ -18,7 +18,8 @@ jobs:
       semver: ${{ steps.gitversion.outputs.semver }}
       LicenseClearingTool: ${{ steps.packageBuildResults.outputs.LicenseClearingTool }}  
       nupkg-LicenseClearingTool: ${{ steps.createNupkg.outputs.nupkg-LicenseClearingTool }}
-
+      docker-LicenseClearingTool: ${{ steps.builddocker.outputs.docker-LicenseClearingTool }}
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -149,11 +150,12 @@ jobs:
           *.nupkg
 
     - name: Build the Docker image
+      id: builddocker
       #if: ${{ false }}  # disable for now
       run: |
         docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v3.1.1
         docker save ${{ github.repository }}:continuous-clearing-v3.1.1 -o continuous-clearing-v3.1.1.tar
-
+        Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v3.1.1.tar"
 
     - name: Archive docker image      
       #if: ${{ false }}  # disable for now
@@ -179,6 +181,11 @@ jobs:
         with:
           name: nuget-continuous-clearing
 
+      - name: Download Docker image
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-continuous-clearing
+
       - name: Debug
         run: |
           tree
@@ -216,7 +223,17 @@ jobs:
           asset_path: ./${{ needs.build.outputs.nupkg-LicenseClearingTool }}
           asset_name: ${{ needs.build.outputs.nupkg-LicenseClearingTool }}
           asset_content_type: application/zip
-
+
+      - name: Upload Nupkg
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          asset_path: ./${{ needs.build.outputs.docker-LicenseClearingTool }}
+          asset_name: ${{ needs.build.outputs.docker-LicenseClearingTool }}
+          asset_content_type: application/zip
+
       - name: Upload ReadmeOSS_nupkg file
         uses: actions/upload-release-asset@v1
         env:

CA.nuspec

@@ -4,7 +4,7 @@
 <package >
   <metadata>
     <id>continuous-clearing</id>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <authors>Siemens AG</authors>
     <owners>continuous-clearing contributors</owners>
     <projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>

doc/UsageDoc/CA_UsageDocument.md

@@ -178,8 +178,7 @@ Continuous Clearing Tool reduces the effort in creating components in SW360 and
 
  #### **Method 1 (Recommended)**
    Copy the below content and create new `appSettings.json` file in `Continuous Clearing tool Config` directory.
-
-
+
    Below is the list of settings can be made in `appSettings.json` file.
 
    _`Sample appSettings.json file`_
@@ -273,12 +272,13 @@ Description for the settings in `appSettings.json` file
 | 19    | --jfrogmavendestreponame         | The destination folder name for the Maven package to be copied to                  | Yes                                                    |                                            |
 | 20   | --timeout          | SW360 response timeout value                  | No                                                       |                                                |
 
+
  #### **Method 2**
 
 You can also pass the above mentioned arguments in the command line.
 
 `Note: If the second approach is followed then make sure you provide all the settings mentioned in the appsettings.json in the command line`
-
+  
   #### Exclude  Component or Folders :
   In order to exclude any components ,it can be configured in the  "appSettings.json" by providing the package name and version as specified above in the *_ExcludedComponents_* field.
 

src/ArtifactoryUploader/PackageUploadHelper.cs

@@ -246,7 +246,7 @@ private static async Task PackageUploadToArtifactory(UploaderKpiData uploaderKpi
             else
             {
                 uploaderKpiData.PackagesUploadedToJfrog++;
-                Logger.Warn($"Package {item.Name}-{item.Version} is already uploaded to {item.DestRepoName}");
+                Logger.Info($"Package {item.Name}-{item.Version} is already uploaded to {item.DestRepoName}");
             }
         }
 

src/LCT.Common/appSettings.json

@@ -4,7 +4,7 @@
 //  SPDX-License-Identifier: MIT
 // --------------------------------------------------------------------------------------------------------------------
 {
-  "CaVersion": "3.1.1",
+  "CaVersion": "3.1.2",
   "TimeOut": 200,
   "ProjectType": "<Insert ProjectType>",
   "SW360ProjectName": "<Insert SW360 Project Name>",

src/LCT.PackageIdentifier.UTest/NugetParserTests.cs

@@ -18,6 +18,7 @@
 using LCT.APICommunications.Model.AQL;
 using CycloneDX.Models;
 using System.Threading.Tasks;
+using System.Linq;
 
 namespace PackageIdentifier.UTest
 {
@@ -234,7 +235,7 @@ public async Task IdentificationOfInternalComponents_Nuget_ReturnsComponentData_
 
             AqlResult aqlResult = new()
             {
-                Name = "animations-1.0.0.tgz",
+                Name = "animations-1.0.0.nupkg",
                 Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
                 Repo = "energy-dev-npm-egll"
             };
@@ -271,7 +272,7 @@ public async Task IdentificationOfInternalComponents_Nuget_ReturnsComponentData2
 
             AqlResult aqlResult = new()
             {
-                Name = "animations-common_license-1.0.0.tgz",
+                Name = "animations-common_license-1.0.0.nupkg",
                 Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
                 Repo = "energy-dev-npm-egll"
             };
@@ -309,7 +310,7 @@ public async Task IdentificationOfInternalComponents_ReturnsComponentData3_Succe
 
             AqlResult aqlResult = new()
             {
-                Name = "animations-common-1.0.0.tgz",
+                Name = "animations-common-1.0.0.nupkg",
                 Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
                 Repo = "energy-dev-npm-egll"
             };
@@ -347,7 +348,7 @@ public async Task GetJfrogRepoDetailsOfAComponent_ReturnsWithData_SuccessFully()
             appSettings.Nuget = new LCT.Common.Model.Config() { JfrogNugetRepoList = reooListArr };
             AqlResult aqlResult = new()
             {
-                Name = "animations-common-1.0.0.tgz",
+                Name = "animations-common-1.0.0.nupkg",
                 Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
                 Repo = "siparty-release-npm-egll"
             };
@@ -383,10 +384,10 @@ public async Task GetJfrogRepoDetailsOfAComponent_Nuget_ReturnsWithData2_Success
             var components = new List<Component>() { component1 };
             string[] reooListArr = { "siparty-release-npm-egll", "org1-npmjs-npm-remote-cache" };
             CommonAppSettings appSettings = new();
-            appSettings.Nuget = new LCT.Common.Model.Config() { JfrogNugetRepoList = reooListArr };
+            appSettings.Nuget = new Config() { JfrogNugetRepoList = reooListArr };
             AqlResult aqlResult = new()
             {
-                Name = "animations-common-1.0.0.tgz",
+                Name = "animations-common-1.0.0.nupkg",
                 Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
                 Repo = "siparty-release-npm-egll"
             };
@@ -407,5 +408,162 @@ public async Task GetJfrogRepoDetailsOfAComponent_Nuget_ReturnsWithData2_Success
             // Assert
             Assert.That(actual, Is.Not.Null);
         }
+
+        [Test]
+        public async Task GetArtifactoryRepoName_Nuget_ReturnsRepoName_SuccessFully()
+        {
+            // Arrange
+            Component component1 = new()
+            {
+                Name = "animations-common",
+                Group = "",
+                Description = string.Empty,
+                Version = "1.0.0"
+            };
+            var components = new List<Component>() { component1 };
+            string[] reooListArr = { "siparty-release-npm-egll", "org1-npmjs-npm-remote-cache" };
+            CommonAppSettings appSettings = new();
+            appSettings.Nuget = new Config() { JfrogNugetRepoList = reooListArr };
+            AqlResult aqlResult = new()
+            {
+                Name = "animations-common-1.0.0.nupkg",
+                Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
+                Repo = "siparty-release-npm-egll"
+            };
+
+            List<AqlResult> results = new List<AqlResult>() { aqlResult };
+
+            Mock<IJFrogService> mockJfrogService = new Mock<IJFrogService>();
+            Mock<IBomHelper> mockBomHelper = new Mock<IBomHelper>();
+            mockBomHelper.Setup(m => m.GetListOfComponentsFromRepo(It.IsAny<string[]>(), It.IsAny<IJFrogService>()))
+                .ReturnsAsync(results);
+            mockBomHelper.Setup(m => m.GetFullNameOfComponent(It.IsAny<Component>())).Returns("animations");
+
+            // Act
+            NugetProcessor nugetProcessor = new NugetProcessor();
+            var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent(
+                components, appSettings, mockJfrogService.Object, mockBomHelper.Object);
+
+            var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-url").Properties[0].Value;
+
+            Assert.That(reponameActual, Is.EqualTo(aqlResult.Repo));
+        }
+        [Test]
+        public async Task GetArtifactoryRepoName_Nuget_ReturnsRepoName_ReturnsFailure()
+        {
+            // Arrange
+            Component component1 = new()
+            {
+                Name = "animations-common",
+                Group = "",
+                Description = string.Empty,
+                Version = "1.0.0"
+            };
+            var components = new List<Component>() { component1 };
+            string[] reooListArr = { "siparty-release-npm-egll", "org1-npmjs-npm-remote-cache" };
+            CommonAppSettings appSettings = new();
+            appSettings.Nuget = new Config() { JfrogNugetRepoList = reooListArr };
+            AqlResult aqlResult = new()
+            {
+                Name = "animation-test-1.0.0.nupkg",
+                Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
+                Repo = "siparty-release-npm-egll"
+            };
+
+            List<AqlResult> results = new () { aqlResult };
+
+            Mock<IJFrogService> mockJfrogService = new Mock<IJFrogService>();
+            Mock<IBomHelper> mockBomHelper = new Mock<IBomHelper>();
+            mockBomHelper.Setup(m => m.GetListOfComponentsFromRepo(It.IsAny<string[]>(), It.IsAny<IJFrogService>()))
+                .ReturnsAsync(results);
+            mockBomHelper.Setup(m => m.GetFullNameOfComponent(It.IsAny<Component>())).Returns("animations");
+
+            // Act
+            NugetProcessor nugetProcessor = new NugetProcessor();
+            var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent(
+                components, appSettings, mockJfrogService.Object, mockBomHelper.Object);
+
+            var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-url").Properties[0].Value;
+
+            Assert.That("Not Found in JFrogRepo", Is.EqualTo(reponameActual));
+        }
+        [Test]
+        public async Task GetArtifactoryRepoName_Nuget_ReturnsRepoName_ReturnsSuccess()
+        {
+            // Arrange
+            Component component1 = new()
+            {
+                Name = "animations-common",
+                Group = "",
+                Description = string.Empty,
+                Version = "1.0.0"
+            };
+            var components = new List<Component>() { component1 };
+            string[] reooListArr = { "siparty-release-npm-egll", "org1-npmjs-npm-remote-cache" };
+            CommonAppSettings appSettings = new();
+            appSettings.Nuget = new Config() { JfrogNugetRepoList = reooListArr };
+            AqlResult aqlResult = new()
+            {
+                Name = "animations-common.1.0.0.nupkg",
+                Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
+                Repo = "siparty-release-npm-egll"
+            };
+
+            List<AqlResult> results = new() { aqlResult };
+
+            Mock<IJFrogService> mockJfrogService = new Mock<IJFrogService>();
+            Mock<IBomHelper> mockBomHelper = new Mock<IBomHelper>();
+            mockBomHelper.Setup(m => m.GetListOfComponentsFromRepo(It.IsAny<string[]>(), It.IsAny<IJFrogService>()))
+                .ReturnsAsync(results);
+            mockBomHelper.Setup(m => m.GetFullNameOfComponent(It.IsAny<Component>())).Returns("animations");
+
+            // Act
+            NugetProcessor nugetProcessor = new NugetProcessor();
+            var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent(
+                components, appSettings, mockJfrogService.Object, mockBomHelper.Object);
+
+            var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-url").Properties[0].Value;
+
+            Assert.That("siparty-release-npm-egll", Is.EqualTo(reponameActual));
+        }
+        [Test]
+        public async Task GetArtifactoryRepoName_Nuget_ReturnsNotFound_ReturnsFailure()
+        {
+            // Arrange
+            Component component1 = new()
+            {
+                Name = "animations-common",
+                Group = "",
+                Description = string.Empty,
+                Version = "1.0.0"
+            };
+            var components = new List<Component>() { component1 };
+            string[] reooListArr = { "siparty-release-npm-egll", "org1-npmjs-npm-remote-cache" };
+            CommonAppSettings appSettings = new();
+            appSettings.Nuget = new Config() { JfrogNugetRepoList = reooListArr };
+            AqlResult aqlResult = new()
+            {
+                Name = "animation-common.1.0.0.nupkg",
+                Path = "@siemens-gds/saap-api-node/-/@siemens-gds",
+                Repo = "siparty-release-npm-egll"
+            };
+
+            List<AqlResult> results = new() { aqlResult };
+
+            Mock<IJFrogService> mockJfrogService = new Mock<IJFrogService>();
+            Mock<IBomHelper> mockBomHelper = new Mock<IBomHelper>();
+            mockBomHelper.Setup(m => m.GetListOfComponentsFromRepo(It.IsAny<string[]>(), It.IsAny<IJFrogService>()))
+                .ReturnsAsync(results);
+            mockBomHelper.Setup(m => m.GetFullNameOfComponent(It.IsAny<Component>())).Returns("animations");
+
+            // Act
+            NugetProcessor nugetProcessor = new NugetProcessor();
+            var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent(
+                components, appSettings, mockJfrogService.Object, mockBomHelper.Object);
+
+            var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-url").Properties[0].Value;
+
+            Assert.That("Not Found in JFrogRepo", Is.EqualTo(reponameActual));
+        }
     }
 }

src/LCT.PackageIdentifier/NugetProcessor.cs

@@ -296,20 +296,27 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
 
         private static string GetArtifactoryRepoName(List<AqlResult> aqlResultList, Component component, IBomHelper bomHelper)
         {
-            string jfrogcomponentName = $"{component.Name}-{component.Version}.tgz";
+            string jfrogcomponentName = $"{component.Name}-{component.Version}.nupkg";
 
             string repoName = aqlResultList.Find(x => x.Name.Equals(
                 jfrogcomponentName, StringComparison.OrdinalIgnoreCase))?.Repo ?? NotFoundInRepo;
 
             string fullName = bomHelper.GetFullNameOfComponent(component);
-            string fullNameVersion = $"{fullName}-{component.Version}.tgz";
+            string fullNameVersion = $"{fullName}-{component.Version}.nupkg";
 
             if (!fullNameVersion.Equals(jfrogcomponentName, StringComparison.OrdinalIgnoreCase) &&
                 repoName.Equals(NotFoundInRepo, StringComparison.OrdinalIgnoreCase))
             {
                 repoName = aqlResultList.Find(x => x.Name.Equals(
                     fullNameVersion, StringComparison.OrdinalIgnoreCase))?.Repo ?? NotFoundInRepo;
             }
+            if (repoName == NotFoundInRepo)
+            {
+                jfrogcomponentName = $"{component.Name}.{component.Version}.nupkg";
+                repoName = aqlResultList.Find(x => x.Name.Equals(
+                  jfrogcomponentName, StringComparison.OrdinalIgnoreCase))?.Repo ?? NotFoundInRepo;
+
+            }
 
             return repoName;
         }
@@ -363,7 +370,7 @@ private static bool IsInternalNugetComponent(List<AqlResult> aqlResultList, Comp
 
             string fullName = bomHelper.GetFullNameOfComponent(component);
             string fullNameVersion = $"{fullName}.{component.Version}.nupkg";
-            if (!fullNameVersion.Equals(jfrogcomponentName, StringComparison.OrdinalIgnoreCase) 
+            if (!fullNameVersion.Equals(jfrogcomponentName, StringComparison.OrdinalIgnoreCase)
                 && aqlResultList.Exists(
                 x => x.Name.Equals(fullNameVersion, StringComparison.OrdinalIgnoreCase)))
             {