Skip to content

Commit

Permalink
Merge pull request #108 from siemens/release/sepp-intergration
Browse files Browse the repository at this point in the history 
Adding SEPP features to the antifactory uploader
  • Loading branch information
@karthika-g
karthika-g authored Jan 2, 2024
2 parents 73e0d77 + 6c67c28 commit 498a20c
Show file tree
Hide file tree
Showing 79 changed files with 1,518 additions and 954 deletions.
10 changes: 3 additions & 7 deletions TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/ConanComparisonBOM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,16 @@
},
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "false"
"Value": "true"
},
{
"Name": "internal:siemens:clearing:repo-url",
"Name": "internal:siemens:clearing:repo-name",
"Value": "energy-dev-conan-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "CONAN"
},
{
"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/e13e0e564b004ef4adabbd01bf0b93ce"
Expand Down Expand Up @@ -111,7 +107,7 @@
"Value": "false"
},
{
"Name": "internal:siemens:clearing:repo-url",
"Name": "internal:siemens:clearing:repo-name",
"Value": "Not Found in JFrogRepo"
},
{
Expand Down
275 changes: 160 additions & 115 deletions TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/NPMComparisonBOM.json
View file
Original file line number Diff line number Diff line change
@@ -1,122 +1,167 @@
{
"BomFormat": "CycloneDX",
"SpecVersion": 4,
"SpecVersionString": "1.4",
"SerialNumber": null,
"Version": null,
"Metadata": {
"Tools": [
{
"Vendor": "Siemens AG",
"Name": "Clearing Automation Tool",
"Version": "1.0.20",
"Hashes": null
}
],
"Authors": null,
"Component": null,
"Manufacture": null,
"Supplier": null
},
"Components": [
{
"Type": 0,
"MimeType": null,
"BomRef": "pkg:npm/requirejs@2.3.5",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "requirejs",
"Version": "2.3.5",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:npm/requirejs@2.3.5",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal",
"Value": "false"
},
{
"Name": "ArtifactoryRepoName",
"Value": "siparty-release-npm-egll"
},
{
"Name": "ProjectType",
"Value": "NPM"
},
{
"Name": "ApprovedStatus",
"Value": "APPROVED"
},
{
"Name": "ReleaseLink",
"Value": "http://localhost:8090/resource/api/releases/887ae944b0864857807e1c8fe58ad767"
},
{
"Name": "FossologyURL",
"Value": "http://localhost:8081/repo/?mod=view-license&upload="
}
],
"Evidence": null
"BomFormat": "CycloneDX",
"SpecVersion": 4,
"SpecVersionString": "1.4",
"SerialNumber": null,
"Version": null,
"Metadata": {
"Tools": [
{
"Vendor": "Siemens AG",
"Name": "Clearing Automation Tool",
"Version": "1.0.20",
"Hashes": null
}
],
"Authors": null,
"Component": null,
"Manufacture": null,
"Supplier": null
},
{
"Type": 0,
"MimeType": null,
"BomRef": "pkg:npm/requirejs@2.3.6",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "requirejs",
"Version": "2.3.6",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:npm/requirejs@2.3.6",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal",
"Value": "false"
},
{
"Name": "ArtifactoryRepoName",
"Value": "siparty-release-npm-egll"
},
{
"Name": "ProjectType",
"Value": "NPM"
},
"Components": [
{
"Name": "ApprovedStatus",
"Value": "APPROVED"
"Type": 0,
"MimeType": null,
"BomRef": "pkg:npm/requirejs@2.3.5",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "requirejs",
"Version": "2.3.5",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:npm/requirejs@2.3.5",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:development",
"Value": "true"
},
{
"Name": "internal:siemens:clearing:repo-name",
"Value": "siparty-release-npm-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "NPM"
},
{
"Name": "internal:siemens:clearing:sw360:release-url",
"Value": "http://localhost:8090/resource/api/releases/887ae944b0864857807e1c8fe58ad767"
},
{
"Name": "internal:siemens:clearing:fossology:url",
"Value": "http://localhost:8081/repo/?mod=view-license&upload="
}
],
"Evidence": null
},
{
"Name": "ReleaseLink",
"Value": "http://localhost:8090/resource/api/releases/ce7d8171244047de94df1fd4dd2083b7"
"Type": 0,
"MimeType": null,
"BomRef": "pkg:npm/requirejs@2.3.6",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "requirejs",
"Version": "2.3.6",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:npm/requirejs@2.3.6",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:development",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:repo-name",
"Value": "siparty-release-npm-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "NPM"
},
{
"Name": "internal:siemens:clearing:sw360:release-url",
"Value": "http://localhost:8090/resource/api/releases/887ae944b0864857807e1c8fe58ad767"
},
{
"Name": "internal:siemens:clearing:fossology:url",
"Value": "http://localhost:8081/repo/?mod=view-license&upload="
}
],
"Evidence": null
},
{
"Name": "FossologyURL",
"Value": "http://localhost:8081/repo/?mod=view-license&upload="
}
],
"Evidence": null
}
],
"Compositions": null
{
"Type": 0,
"MimeType": null,
"BomRef": "pkg:npm/eGraphicsSuite@1.0.0",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "eGraphicsSuite",
"Version": "1.0.0",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:npm/eGraphicsSuite@1.0.0",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal:siemens:clearing:development",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:identifier-type",
"Value": "Discovered"
},
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "true"
},
{
"Name": "internal:siemens:clearing:repo-name",
"Value": "energy-dev-npm-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "NPM"
}
],
"Evidence": null
}
],
"Compositions": null
}
Loading

0 comments on commit 498a20c

Please sign in to comment.