Nvme json parsing (#122)

* Update nvme script to handle bug in nvme-cli json
* ComponentIdentifierV2Factory don't trim serial or revision

Author: iadgovuser29

.github/workflows/dotnet-build-paccor_scripts.yml

@@ -20,7 +20,7 @@ jobs:
       run: dotnet restore
     - name: Build
       working-directory: dotnet/paccor_scripts
-      run: dotnet build
+      run: dotnet build -c Release
     - name: Test
       working-directory: dotnet/paccor_scripts
       run: dotnet test
@@ -44,4 +44,4 @@ jobs:
         retention-days: 1
         if-no-files-found: error
         path: |
-          dotnet/paccor_scripts/paccor_scripts/bin/Release/*nupkg
+          dotnet/paccor_scripts/paccor_scripts/bin/Release/*nupkg

.gitignore

@@ -67,3 +67,5 @@ bin/
 generated/
 obj/
 
+# generated on build
+dotnet/paccor_scripts/paccor_scripts/scripts

build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 // version number
 def base_version = '1.5.0'
-def base_release = 'beta1'
+def base_release = 'beta2'
 def archive_version = "${base_version}-${base_release}"
 
 version = "${base_version}${base_release}"
@@ -205,6 +205,8 @@ def checkFilesExist(ArrayList<File> fileList, String destinationIfExists) {
     fileList.each { file ->
         if (file.exists()) {
             println "Copied ${file.name} into ${destinationIfExists}."
+        } else {
+            println "${file.name} not found. If it was expected, build dotnet before gradle."
         }
     }
 }

dotnet/paccor_scripts/paccor_scripts/paccor_scripts.csproj

@@ -7,7 +7,7 @@
     <RuntimeIdentifiers>linux-x64;win-x64</RuntimeIdentifiers>
     <Authors>NSA Cybersecurity Directorate</Authors>
     <PackageId>paccor.paccor_scripts</PackageId>
-    <PackageVersion>2.1.0</PackageVersion>
+    <PackageVersion>2.2.0</PackageVersion>
     <PackageTags>paccor;platform;certificate;hardware;manifest;scripts;component;class;registry;evidence;collection</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -17,11 +17,12 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <Target Name="CopyFiles" BeforeTargets="PreBuildEvent">
     <ItemGroup>
-      <PaccorScriptsLinux Include="..\..\..\scripts\allcomponents.sh;..\..\..\scripts\enterprise-numbers;..\..\..\scripts\hw.sh;..\..\..\scripts\json.sh;..\..\..\scripts\nvme.sh;..\..\..\scripts\smbios.sh..\..\..\scripts\tcg_ccr.sh" />
+      <PaccorScriptsLinux Include="..\..\..\scripts\allcomponents.sh;..\..\..\scripts\enterprise-numbers;..\..\..\scripts\hw.sh;..\..\..\scripts\json.sh;..\..\..\scripts\nvme.sh;..\..\..\scripts\smbios.sh;..\..\..\scripts\tcg_ccr.sh" />
 	  <PaccorScriptsWindows Include="..\..\..\scripts\windows\allcomponents.ps1;..\..\..\scripts\windows\hw.ps1;..\..\..\scripts\windows\json.ps1;..\..\..\scripts\windows\nvme.ps1;..\..\..\scripts\windows\SMBios.ps1;..\..\..\scripts\windows\tcg_ccr.ps1" />
     </ItemGroup>
     <Copy SourceFiles="@(PaccorScriptsLinux)" DestinationFolder="$(ProjectDir)scripts" />