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.

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

Gordf #46

Merged
merged 15 commits into from Nov 14, 2020
Merged

Gordf #46

merged 15 commits into from Nov 14, 2020

Conversation

RishabhBhatnagar
Copy link
Collaborator

The tool will be able to read and validate SPDX RDF/XML 2.2 documents using a multi-phase concurrent parser for rdf files (gordf) .

RishabhBhatnagar and others added 15 commits August 19, 2020 20:41
 - The Licensing Info is Incomplete
 - Some other attributes are not set in the tools-golang data model.

Signed-off-by: RishabhBhatnagar <bhatnagarrishabh4@gmail.com>
 - The update allows the model to handle all types of licenses.
 - Removed all methods identified as unused.

Signed-off-by: RishabhBhatnagar <bhatnagarrishabh4@gmail.com>
Add Support For RDFLoader Including Licenses
 - noticeText can now assume two states: SPDX_NOASSERTION and string
 - add tests for parse_file.go file
 - relationship now returns the MUX error
 - getRelationshipTypeFromURI fixed
 - add constant for NS_SPDX+"Checksum" (SPDX_CHECKSUM_CAPITALIZED)
 - file Dependency set to the file being populated
 - add extended support for licenseInfoInFile

Signed-off-by: RishabhBhatnagar <bhatnagarrishabh4@gmail.com>
Signed-off-by: RishabhBhatnagar <bhatnagarrishabh4@gmail.com>
Signed-off-by: RishabhBhatnagar <bhatnagarrishabh4@gmail.com>
 - licenseTypes: renamed license of WithExceptionOperator to member
 - ignore rdf:type triple in Licenses
 - add comment to LicenseException

Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>
 - setting file referenced in the range to parser files instead of the Unpackaged Files.
 - externalReference now requires just a node rather than a triple.
 - tidied and DRYed parsing of Snippet range.
 - allow licenseInfoInFile of File to be AnyLicenseInfo instead of SimpleLicensingInfo.
 - change signature of getSnippetInformation from Triple To Node.
 - add simpleLicensingInfo switch in the anyLicensingInfo switch.
 - change input of getExternaelDocumentRef from triples to Node for easier prototyping.
 - remove unused methods in utils
 - remove parser association from utils functions

Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>
Add tests and bug fixes ror RdfLoader files
 - changed gordf library path from github.com/RishabhBhatnagar/gordf to
   github.com/spdx/gordf

Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>
Signed-off-by: Steve Winslow <steve@swinslow.net>
Signed-off-by: Steve Winslow <steve@swinslow.net>
Signed-off-by: Steve Winslow <steve@swinslow.net>
 - ExternalDocumentRef is now a struct instead of a coalesced string
 - Also, added dependency of github.com/spdx/gordf in go.mod file

Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>
Update RDFLoader wrt new ExternalDocumentReference and Change Module Path of GoRdf
@swinslow
Copy link
Member

This is fantastic, thanks @RishabhBhatnagar! I know you've put an unbelievable about of work into getting this working. Let me take a closer look at it and I'll circle back shortly if I have any questions or comments, otherwise I'll go ahead and merge it.

@swinslow
Copy link
Member

@RishabhBhatnagar, this is great. I've taken a brief look through the PR, and I've also checked it out and ran some tests myself.

There are some issues we will need to address. In particular, testing it against the standard "example" file at https://github.com/spdx/spdx-spec/blob/development/v2.2.1/examples/SPDXRdfExample-v2.2.spdx.rdf.xml, some data is not getting parsed: I am not seeing the Packages getting parsed that are defined in that RDF file. There are a handful of other things I'm seeing.

But those are all issues that we can address going forward. I think that it will be best to go ahead and merge this into the main branch now, and then we can file issues and make fixes there rather than maintaining a separate branch. I'll go ahead and merge now.

Just wanted to reiterate -- this is really great work, between everything in this PR and also writing gordf from scratch. Very well done!

@swinslow swinslow merged commit d6d5d11 into master Nov 14, 2020
@swinslow swinslow deleted the gordf branch March 20, 2021 19:33
@swinslow swinslow added this to the 0.1.0 milestone Jul 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants