Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding SEPP features to the antifactory uploader #108

Merged
merged 27 commits into from
Jan 2, 2024
Merged

Adding SEPP features to the antifactory uploader #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a3e1002
Adding SEPP features to the Antifactory uploader (#106)
adityanarayanp Dec 5, 2023
a7062fd
Updating the IT and UT test cases
adityanarayanp Dec 6, 2023
5b5ed96
fixing the unit tests from NPM to Conan
adityanarayanp Dec 6, 2023
793273b
enabling tests in the git actions workflow
adityanarayanp Dec 6, 2023
df6f9f6
getting the specific version of the release URL for nuget IT
adityanarayanp Dec 6, 2023
e28a290
downgrading Microsoft.Build to fix Could not load file or assembly 'S…
adityanarayanp Dec 6, 2023
21cab99
making the method private
adityanarayanp Dec 6, 2023
a3b0af4
sonar qube fixes
adityanarayanp Dec 6, 2023
0eb259e
sonar qube fixes
adityanarayanp Dec 7, 2023
1dc3261
sonar qube fixes
adityanarayanp Dec 7, 2023
3438847
sonar qube fix
adityanarayanp Dec 7, 2023
958befc
syntax error
adityanarayanp Dec 7, 2023
1a00676
Adding ExcludeFromCodeCoverage to model
adityanarayanp Dec 8, 2023
c304a11
Adding a setting for DevDep repo name
adityanarayanp Dec 8, 2023
7fe0da3
copying development packages instead of moving them
adityanarayanp Dec 8, 2023
1ed06ed
not actioning the package if the source repo is already siparty-relea…
adityanarayanp Dec 8, 2023
721500b
Updating the app settings
adityanarayanp Dec 11, 2023
c84921a
updating the readMe
adityanarayanp Dec 11, 2023
8a84290
updating the readMe
adityanarayanp Dec 11, 2023
e3dd959
Update ReadMe
adityanarayanp Dec 12, 2023
dbccae1
updated readMe
adityanarayanp Dec 12, 2023
8604aa4
removing the test mode run for the Conan component creator.
adityanarayanp Dec 13, 2023
75f0644
removing the test mode for the conan IT test
adityanarayanp Dec 13, 2023
acd79a8
removing the log parameter from the artifactory IT test cases
adityanarayanp Dec 13, 2023
5e8c7fe
Updating the test case
adityanarayanp Dec 13, 2023
355b667
updating the conan lock to just have a one component
adityanarayanp Dec 13, 2023
6c67c28
updating the version in the appSettings file
adityanarayanp Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
DOCKERDEVARTIFACTORY: ${{ secrets.DOCKERDEVARTIFACTORY }}

- name: Test
if: ${{ false }} # disable for now
#if: ${{ false }} # disable for now
run: |
$TestProjects = Get-ChildItem -Path *test*.csproj -Recurse -exclude TestUtilities.csproj,UnitTestUtilities.csproj
Write-Host "**************************The test projects considered for execution: $TestProjects ******************************"
Expand Down
10 changes: 3 additions & 7 deletions TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/ConanComparisonBOM.json
View file
Open in desktop
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
Open in desktop
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
Loading