Monorepo fossa test and fossa report fix (#290)

* Support monorepo scans in `fossa test` and `fossa report`
* Make attribution report dependencies optional

Changelog.md

@@ -1,5 +1,9 @@
 # Spectrometer Changelog
 
+## Unreleased
+
+- Support `fossa test` and `fossa report` for monorepo projects ([#290](https://github.com/fossas/spectrometer/pull/290))
+
 ## v2.10.3
 
 - Support ReleaseGroup configuration ([#283](https://github.com/fossas/spectrometer/pull/283))

src/App/Fossa/API/BuildWait.hs

@@ -1,5 +1,6 @@
 module App.Fossa.API.BuildWait (
   waitForBuild,
+  waitForMonorepoScan,
   waitForIssues,
   waitForSherlockScan,
   timeout,
@@ -47,6 +48,23 @@ waitForBuild apiOpts revision = do
       sendIO $ threadDelay (pollDelaySeconds * 1_000_000)
       waitForBuild apiOpts revision
 
+-- | Wait for monorepo scan completion
+waitForMonorepoScan ::
+  (Has Diagnostics sig m, Has (Lift IO) sig m, Has Logger sig m, Has StickyLogger sig m) =>
+  ApiOpts ->
+  ProjectRevision ->
+  m ()
+waitForMonorepoScan apiOpts revision = do
+  Fossa.Organization orgId _ <- Fossa.getOrganization apiOpts
+  let locator = VPSCore.createLocator (projectName revision) orgId
+
+  logSticky' "[ Getting latest scan ID ]"
+  scan <- ScotlandYard.getLatestScan apiOpts locator (projectRevision revision)
+
+  logSticky' "[ Waiting for monorepo scan... ]"
+  waitForSherlockScan apiOpts locator (ScotlandYard.responseScanId scan)
+  pure ()
+
 waitForIssues ::
   (Has Diagnostics sig m, Has (Lift IO) sig m, Has Logger sig m) =>
   ApiOpts ->

src/App/Fossa/Report.hs

@@ -59,7 +59,7 @@ reportMain (BaseDir basedir) apiOpts logSeverity timeoutSeconds reportType overr
 
       logSticky "[ Waiting for build completion... ]"
 
-      waitForBuild apiOpts revision
+      waitForBuild apiOpts revision <||> waitForMonorepoScan apiOpts revision
 
       logSticky "[ Waiting for issue scan completion... ]"
 

src/App/Fossa/Report/Attribution.hs

@@ -63,8 +63,8 @@ instance FromJSON Attribution where
   parseJSON = withObject "Attribution" $ \obj ->
     Attribution
       <$> obj .: "project"
-      <*> obj .: "directDependencies"
-      <*> obj .: "deepDependencies"
+      <*> obj .:? "directDependencies" .!= []
+      <*> obj .:? "deepDependencies" .!= []
       <*> obj .: "licenses"
 
 instance ToJSON Attribution where

src/App/Fossa/Test.hs

@@ -45,7 +45,7 @@ testMain (BaseDir basedir) apiOpts logSeverity timeoutSeconds outputType overrid
 
       logSticky "[ Waiting for build completion... ]"
 
-      waitForBuild apiOpts revision
+      waitForBuild apiOpts revision <||> waitForMonorepoScan apiOpts revision
 
       logSticky "[ Waiting for issue scan completion... ]"
       issues <- waitForIssues apiOpts revision