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

Jump to bottom

Convert Endpoint #201

Merged
merged 50 commits into from
Aug 9, 2023
Merged

Convert Endpoint #201

merged 50 commits into from
Aug 9, 2023

Conversation

juanfpatino
Copy link
Contributor

@juanfpatino juanfpatino commented Aug 7, 2023 •
edited
Loading

Completed:

  • /sboms/convert logic
  • JPA generated IDs

Added

  • Relevant exceptions for conversion endpoint
    • DeserializerException
    • SerializerException
    • SBOMBuilderException
  • Convert endpoint in SBOMController.java

Changed

  • ConvertFromApiTest.java
  • Deleted old Converter.java

txdvse and others added 30 commits August 3, 2023 16:25
@txdvse
Base skeleton code for Conversion.
22478a3 
+ Added Conversion driver code
+ Added generic
+ Skeleton for ConvertCDX14.java
+ Skeleton for ConvertSPDX23.java
@juanfpatino
Initially moved code from the API's Converter.java
a801034
@juanfpatino
Conversion.java can convert to SVIP, ConvertTest stubbed out with two…
6d00d23 
… working tests
@juanfpatino
Merge branch 'dev' of https://github.com/SoftwareDesignLab/SVIP into …
43a37a0 
…dev-convertRefactor
@juanfpatino
ConvertTest.convertTest stubbed out
30a732c
@txdvse
Reformatted CDX converter (ConvertCDX14.java)
6eda9f1
@txdvse
ConvertSPDX23.java
fc696da 
+ Added top level SBOM conversion for SVIP to SPDX 2.3
@txdvse
ConvertSPDX23.java
ee7938e 
+ Added component converter
@txdvse
ConvertSPDX23.java
e5e0c64 
+ Added null checks
@txdvse
ConvertSPDX23.java and ConvertCDX14.java
e9ce98a 
+ Added small fixes to make sure components convert when necessary
@txdvse
ConvertTest.java
b7444ac 
+ Updated convert to SVIP tests
@txdvse
ConvertTest.java
d75bfe9 
+ Added a test to convert CycloneDX to SPDX

ConvertSPDX23.java
+ Added component conversion call
+ Added proper format and version setting

ConvertCDX14.java
+ Added proper format and version setting
@txdvse
ConvertTest.java
774f15c 
+ docstrings
+ formatting
@txdvse
Merge pull request #199 from SoftwareDesignLab/dev-convertRefactor-CDX14
6f5f4bf 
Full convert refactor for SPDX and CDX
@txdvse
ConvertTest.java
1ea9c55 
+ Formatting
+ Docstrings

Conversion.java
+ Fixed a bug with instancing causing data to be carried over
+ Docstrings
+ Formatting
@juanfpatino
changelog.md
38381b0
@juanfpatino
Changelog date and version correction
9a1dd6d
@juanfpatino
Added quotations
1670dbf
@txdvse
docstring and import fixes
7af0b0d
@txdvse
Merge remote-tracking branch 'origin/dev-convertRefactor' into dev-co…
a7413b5 
…nvertRefactor
@juanfpatino
Code cleanup
b153887
@juanfpatino
Merge remote-tracking branch 'origin/dev-convertRefactor' into dev-co…
32bf951 
…nvertRefactor
@juanfpatino
Merge branch 'dev-convertRefactor' of https://github.com/SoftwareDesi…
d549b1e 
…gnLab/SVIP into dev-dbRefactor-sboms-convert

# Conflicts:
#	doc/changelog.md
@juanfpatino
Merge branch 'dev-dbRefactor-sboms' of https://github.com/SoftwareDes…
b4b9074 
…ignLab/SVIP into dev-dbRefactor-sboms-convert
@juanfpatino
APITest.java impl SBOMController, ConvertFromAPITest fixed
d8738bb
@juanfpatino
SVIP builds
90fe519
@juanfpatino
Deserialization logic from old Converter moved to SBOMFileService, De…
3b24d88 
…serializerException.java
@juanfpatino
SBOMBuilderException, SerializerException in SBOMFileService.convert
f76893b
@juanfpatino
SBOMFileService.convert finished but untested
7cf9245
@juanfpatino
ConvertFromAPITest.CDXTagValueTest assertThrows SerializerException
f4ec13f
@juanfpatino juanfpatino marked this pull request as ready for review August 8, 2023 01:00
dlg1206
dlg1206 requested changes Aug 8, 2023
View reviewed changes
Copy link
Member

@dlg1206 dlg1206 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upload doesn't work with frontend / endpoint. See comment for details

@juanfpatino juanfpatino linked an issue Aug 8, 2023 that may be closed by this pull request
Convert Endpoint #210
Closed
7 tasks
@dlg1206 dlg1206 mentioned this pull request Aug 8, 2023
Closed
dlg1206
dlg1206 approved these changes Aug 8, 2023
View reviewed changes
Copy link
Member

@dlg1206 dlg1206 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Converted results don't show on frontend (requests are send successfully though) but basic testing shows API + Database works as intended.

ian1dunn
ian1dunn approved these changes Aug 9, 2023
View reviewed changes
Copy link
Contributor

@ian1dunn ian1dunn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested with front-end and works as intended, looks great

@juanfpatino juanfpatino merged commit f003387 into dev-dbRefactor-sboms Aug 9, 2023
3 checks passed
@juanfpatino juanfpatino deleted the dev-dbRefactor-sboms-convert branch August 9, 2023 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ian1dunn ian1dunn ian1dunn approved these changes

@dlg1206 dlg1206 dlg1206 approved these changes

@txdvse txdvse Awaiting requested review from txdvse

@tfr8811 tfr8811 Awaiting requested review from tfr8811

@liamthemailman liamthemailman Awaiting requested review from liamthemailman

@jwj7297 jwj7297 Awaiting requested review from jwj7297

@Marrufof Marrufof Awaiting requested review from Marrufof

@maxstein16 maxstein16 Awaiting requested review from maxstein16

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Convert Endpoint
4 participants
@juanfpatino @ian1dunn @dlg1206 @txdvse