Fix license file matches #1434
Fix license file matches #1434
Conversation
| @@ -947,7 +947,7 @@ archiveBuildUpload' apiOpts rebuild archive = context ("archive: '" <> toText ar | |||
| (baseUrl, baseOpts) <- useApiOpts apiOpts | |||
|
|
|||
| let opts = "dependency" =: True <> "rawLicenseScan" =: True | |||
| let archiveProjects = ArchiveComponents [archive] rebuild FileUploadFullContent | |||
There was a problem hiding this comment.
Based on the previous code: https://github.com/fossas/fossa-cli/pull/1423/files#diff-a812ed3f7085f40e35cb15511136c5dea108406ba8c21818dde5a4029b9302d5L942
I've changed this to FileUpload to FileUploadMatchData
There was a problem hiding this comment.
Since this is an archive upload, why isn't FullContent appropriate here?
There was a problem hiding this comment.
Ah, I changed this to be FileUploadMatchData due to the fact that archiveProjects was set to FullFileUploads False previously. But after looking at Scott's comments on your initial pr, it seems that this was intended bc we shouldn't ever do an archive upload without full files.
That's my fault, changing this back to FileUploadFullContent
| @@ -151,7 +151,9 @@ instance ToJSON ArchiveComponents where | |||
| toJSON ArchiveComponents{..} = | |||
| object | |||
| [ "archives" .= archiveComponentsArchives | |||
| , "fullFiles" .= archiveComponentsUpload | |||
There was a problem hiding this comment.
Based on the previous code: https://github.com/fossas/fossa-cli/pull/1423/files#diff-78dfaf45d3d47ee1eb7bc8a678e57e40022f78c8c394da5c9adb61582e3c63c4L154
I've changed the json value for archiveComponentsUpload to be set to a boolean.
Changelog.md
Outdated
| @@ -1,7 +1,8 @@ | |||
| # FOSSA CLI Changelog | |||
|
|
|||
| ## Unreleased | |||
| ## 3.9.19 | |||
There was a problem hiding this comment.
lgtm, let's yank 3.9.18 after releasing
Overview
The changes from pr: Support true forced rebuilds for vendored dependencies, refactor types introduced a bug that caused the contents of the license file matches to be empty.
Before the changes, the license file match contents appeared as:
After some investigation, it was discovered that the revision's license scan type was being set to
full_files. This shouldn't have been the case because the given repro case should've had the scan type set tomatch_dataNote: Refer to the linked ANE ticket for repro case
Acceptance criteria
Testing plan
fossa analyzeon the project linked in the ANE ticketmatch_dataRisks
Metrics
References
Checklist
docs/.docs/README.msand gave consideration to how discoverable or not my documentation is.Changelog.md. If this PR did not mark a release, I added my changes into an# Unreleasedsection at the top..fossa.ymlorfossa-deps.{json.yml}, I updateddocs/references/files/*.schema.jsonAND I have updated example files used byfossa initcommand. You may also need to update these if you have added/removed new dependency type (e.g.pip) or analysis target type (e.g.poetry).docs/references/subcommands/<subcommand>.md.