Merge pull request #92 from siemens/Python_forSw360CompCreator

Python for sw360 comp creator
siemens · Sep 28, 2023 · a9e7029 · a9e7029
2 parents b9c1316 + f6b22c8
commit a9e7029
Show file tree

Hide file tree

Showing 39 changed files with 1,843 additions and 212 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -3,8 +3,7 @@ name: Build & Test
 on: 
  push:
  pull_request:
- schedule:
-   - cron: "30 0 * * 5"
+
 
 jobs:
 
@@ -49,9 +48,9 @@ jobs:
         echo "SemVerMMP: v$($env:GitVersion_MajorMinorPatch)"
         Write-Host "Filename: '$fileName'" 
         
-        
     - name: Add msbuild to PATH
-      uses: microsoft/[email protected]
+      uses: microsoft/[email protected]
+
 
     - name: update appSettingsSW360IntegrationTest.json
       run: ./Scripts/json_update.ps1 -JsonFile 'src\TestUtilities\appSettingsSW360IntegrationTest.json' 

diff --git a/CA.nuspec b/CA.nuspec
@@ -82,6 +82,7 @@
     <file src="out\net6.0\Microsoft.Win32.Registry.AccessControl.dll" target="tools"/>
     <file src="out\net6.0\Microsoft.Win32.SystemEvents.dll" target="tools"/>
     <file src="out\net6.0\Namotion.Reflection.dll" target="tools"/>
+    <file src="out\net6.0\PackageUrl.dll" target="tools"/>
     <file src="out\net6.0\Newtonsoft.Json.Bson.dll" target="tools"/>
     <file src="out\net6.0\Newtonsoft.Json.dll" target="tools"/>
     <file src="out\net6.0\NJsonSchema.dll" target="tools"/>

diff --git a/TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/PythonComparisonBOM.json b/TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/PythonComparisonBOM.json
@@ -0,0 +1,252 @@
+{
+  "BomFormat": "CycloneDX",
+  "SpecVersion": 4,
+  "SpecVersionString": "1.4",
+  "SerialNumber": null,
+  "Version": null,
+  "Metadata": {
+    "Tools": [
+      {
+        "Vendor": "Siemens AG",
+        "Name": "Clearing Automation Tool",
+        "Version": "3.1.0",
+        "Hashes": null
+      }
+    ],
+    "Authors": null,
+    "Component": null,
+    "Manufacture": null,
+    "Supplier": null
+  },
+  "Components": [
+    {
+      "Type": 0,
+      "MimeType": null,
+      "BomRef": "pkg:pypi/[email protected]",
+      "Supplier": null,
+      "Author": null,
+      "Publisher": null,
+      "Group": null,
+      "Name": "html5lib",
+      "Version": "1.1",
+      "Description": "",
+      "Scope": null,
+      "Hashes": null,
+      "Licenses": null,
+      "Copyright": null,
+      "Cpe": null,
+      "Purl": "pkg:pypi/[email protected]",
+      "Swid": null,
+      "Modified": null,
+      "Pedigree": null,
+      "Components": null,
+      "Properties": [
+        {
+          "Name": "internal:siemens:clearing:development",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:identifier-type",
+          "Value": "ManuallyAdded"
+        },
+        {
+          "Name": "internal:siemens:clearing:is-internal",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:repo-url",
+          "Value": "org1-pythonhosted-pypi-remote-cache"
+        },
+        {
+          "Name": "internal:siemens:clearing:project-type",
+          "Value": "PYTHON"
+        },
+        {
+          "Name": "internal:siemens:clearing:clearing-state",
+          "Value": "Approved"
+        },
+        {
+          "Name": "internal:siemens:clearing:sw360:release-url",
+          "Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/f697515c180646c3b8b9b70ce6f2a2d8"
+        },
+        {
+          "Name": "internal:siemens:clearing:fossology:url",
+          "Value": null
+        }
+      ],
+      "Evidence": null
+    },
+    {
+      "Type": 0,
+      "MimeType": null,
+      "BomRef": "pkg:pypi/[email protected]",
+      "Supplier": null,
+      "Author": null,
+      "Publisher": null,
+      "Group": null,
+      "Name": "attrs",
+      "Version": "22.1.0",
+      "Description": "",
+      "Scope": null,
+      "Hashes": null,
+      "Licenses": null,
+      "Copyright": null,
+      "Cpe": null,
+      "Purl": "pkg:pypi/[email protected]",
+      "Swid": null,
+      "Modified": null,
+      "Pedigree": null,
+      "Components": null,
+      "Properties": [
+        {
+          "Name": "internal:siemens:clearing:development",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:identifier-type",
+          "Value": "ManuallyAdded"
+        },
+        {
+          "Name": "internal:siemens:clearing:is-internal",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:repo-url",
+          "Value": "Not Found in JFrogRepo"
+        },
+        {
+          "Name": "internal:siemens:clearing:project-type",
+          "Value": "PYTHON"
+        },
+        {
+          "Name": "internal:siemens:clearing:clearing-state",
+          "Value": "Approved"
+        },
+        {
+          "Name": "internal:siemens:clearing:sw360:release-url",
+          "Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/37fcf2d0725a46b8b777c849111e9be4"
+        },
+        {
+          "Name": "internal:siemens:clearing:fossology:url",
+          "Value": null
+        }
+      ],
+      "Evidence": null
+    },
+    {
+      "Type": 0,
+      "MimeType": null,
+      "BomRef": "pkg:pypi/[email protected]",
+      "Supplier": null,
+      "Author": null,
+      "Publisher": null,
+      "Group": null,
+      "Name": "beautifulsoup4",
+      "Version": "4.11.1",
+      "Description": "",
+      "Scope": null,
+      "Hashes": null,
+      "Licenses": null,
+      "Copyright": null,
+      "Cpe": null,
+      "Purl": "pkg:pypi/[email protected]",
+      "Swid": null,
+      "Modified": null,
+      "Pedigree": null,
+      "Components": null,
+      "Properties": [
+        {
+          "Name": "internal:siemens:clearing:development",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:identifier-type",
+          "Value": "ManuallyAdded"
+        },
+        {
+          "Name": "internal:siemens:clearing:is-internal",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:repo-url",
+          "Value": "org1-pythonhosted-pypi-remote-cache"
+        },
+        {
+          "Name": "internal:siemens:clearing:project-type",
+          "Value": "PYTHON"
+        },
+        {
+          "Name": "internal:siemens:clearing:clearing-state",
+          "Value": "Approved"
+        },
+        {
+          "Name": "internal:siemens:clearing:sw360:release-url",
+          "Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/4b92d5ac32f84d43a82f2c2c57771e6d"
+        },
+        {
+          "Name": "internal:siemens:clearing:fossology:url",
+          "Value": null
+        }
+      ],
+      "Evidence": null
+    },
+    {
+      "Type": 0,
+      "MimeType": null,
+      "BomRef": "pkg:pypi/[email protected]",
+      "Supplier": null,
+      "Author": null,
+      "Publisher": null,
+      "Group": null,
+      "Name": "cachy",
+      "Version": "0.3.0",
+      "Description": "",
+      "Scope": null,
+      "Hashes": null,
+      "Licenses": null,
+      "Copyright": null,
+      "Cpe": null,
+      "Purl": "pkg:pypi/[email protected]",
+      "Swid": null,
+      "Modified": null,
+      "Pedigree": null,
+      "Components": null,
+      "Properties": [
+        {
+          "Name": "internal:siemens:clearing:development",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:identifier-type",
+          "Value": "ManuallyAdded"
+        },
+        {
+          "Name": "internal:siemens:clearing:is-internal",
+          "Value": "false"
+        },
+        {
+          "Name": "internal:siemens:clearing:repo-url",
+          "Value": "org1-pythonhosted-pypi-remote-cache"
+        },
+        {
+          "Name": "internal:siemens:clearing:project-type",
+          "Value": "PYTHON"
+        },
+        {
+          "Name": "internal:siemens:clearing:clearing-state",
+          "Value": "Approved"
+        },
+        {
+          "Name": "internal:siemens:clearing:sw360:release-url",
+          "Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/cece81ace4b14374af2432067bca5fb2"
+        },
+        {
+          "Name": "internal:siemens:clearing:fossology:url",
+          "Value": null
+        }
+      ],
+      "Evidence": null
+    }
+  ],
+  "Compositions": null
+}