Propogate full FicusAnalysisResults

Author: nficca

src/App/Fossa/Analyze.hs

@@ -51,7 +51,6 @@ import App.Fossa.Config.Analyze (
 import App.Fossa.Config.Analyze qualified as Config
 import App.Fossa.Config.Common (DestinationMeta (..), destinationApiOpts, destinationMetadata)
 import App.Fossa.Ficus.Analyze (analyzeWithFicus)
-import App.Fossa.Ficus.Types (FicusAnalysisResults (..))
 import App.Fossa.FirstPartyScan (runFirstPartyScan)
 import App.Fossa.Lernie.Analyze (analyzeWithLernie)
 import App.Fossa.Lernie.Types (LernieResults (..))
@@ -109,7 +108,7 @@ import Data.String.Conversion (decodeUtf8, toText)
 import Data.Text.Extra (showT)
 import Data.Traversable (for)
 import Diag.Diagnostic as DI
-import Diag.Result (Result (Success), resultToMaybe)
+import Diag.Result (resultToMaybe)
 import Discovery.Archive qualified as Archive
 import Discovery.Filters (AllFilters, MavenScopeFilters, applyFilters, filterIsVSIOnly, ignoredPaths, isDefaultNonProductionPath)
 import Discovery.Projects (withDiscoveredProjects)
@@ -362,7 +361,7 @@ analyze cfg = Diag.context "fossa-analyze" $ do
                   (Config.licenseScanPathFilters vendoredDepsOptions)
                   (orgSnippetScanSourceCodeRetentionDays =<< orgInfo)
                   (Config.debugDir cfg)
-  let ficusResults = (snippetScanResults =<<) . join $ resultToMaybe maybeFicusResults
+  let ficusResults = join $ resultToMaybe maybeFicusResults
 
   maybeLernieResults <-
     Diag.errorBoundaryIO . diagToDebug $
@@ -451,7 +450,7 @@ analyze cfg = Diag.context "fossa-analyze" $ do
           $ analyzeForReachability projectScans
   let reachabilityUnits = onlyFoundUnits reachabilityUnitsResult
 
-  let analysisResult = AnalysisScanResult projectScans vsiResults binarySearchResults (Success [] Nothing) manualSrcUnits dynamicLinkedResults maybeLernieResults reachabilityUnitsResult
+  let analysisResult = AnalysisScanResult projectScans vsiResults binarySearchResults maybeFicusResults manualSrcUnits dynamicLinkedResults maybeLernieResults reachabilityUnitsResult
       isDebugMode = isJust (Config.debugDir cfg)
   renderScanSummary isDebugMode maybeEndpointAppVersion analysisResult cfg
 

src/App/Fossa/Analyze/Types.hs

@@ -12,7 +12,7 @@ module App.Fossa.Analyze.Types (
 
 import App.Fossa.Analyze.Project (ProjectResult)
 import App.Fossa.Config.Analyze (ExperimentalAnalyzeConfig)
-import App.Fossa.Ficus.Types (FicusSnippetScanResults)
+import App.Fossa.Ficus.Types (FicusAnalysisResults)
 import App.Fossa.Lernie.Types (LernieResults)
 import App.Fossa.Reachability.Types (SourceUnitReachability (..))
 import App.Types (Mode)
@@ -81,7 +81,7 @@ data AnalysisScanResult = AnalysisScanResult
   { analyzersScanResult :: [DiscoveredProjectScan]
   , vsiScanResult :: Result (Maybe [SourceUnit])
   , binaryDepsScanResult :: Result (Maybe SourceUnit)
-  , ficusResult :: Result (Maybe FicusSnippetScanResults)
+  , ficusResult :: Result (Maybe FicusAnalysisResults)
   , fossaDepsScanResult :: Result (Maybe SourceUnit)
   , dynamicLinkingResult :: Result (Maybe SourceUnit)
   , lernieResult :: Result (Maybe LernieResults)

src/App/Fossa/Analyze/Upload.hs

@@ -9,7 +9,7 @@ module App.Fossa.Analyze.Upload (
 
 import App.Fossa.API.BuildLink (getFossaBuildUrl)
 import App.Fossa.Config.Analyze (JsonOutput (JsonOutput))
-import App.Fossa.Ficus.Types (FicusSnippetScanResults)
+import App.Fossa.Ficus.Types (FicusAnalysisResults (..))
 import App.Fossa.Reachability.Types (SourceUnitReachability)
 import App.Fossa.Reachability.Upload (upload)
 import App.Types (
@@ -107,7 +107,7 @@ uploadSuccessfulAnalysis ::
   ProjectRevision ->
   ScanUnits ->
   [SourceUnitReachability] ->
-  Maybe FicusSnippetScanResults ->
+  Maybe FicusAnalysisResults ->
   m Locator
 uploadSuccessfulAnalysis (BaseDir basedir) metadata jsonOutput revision scanUnits reachabilityUnits ficusResults =
   context "Uploading analysis" $ do
@@ -124,8 +124,10 @@ uploadSuccessfulAnalysis (BaseDir basedir) metadata jsonOutput revision scanUnit
     let branchText = fromMaybe "No branch (detached HEAD)" $ projectBranch revision
     logInfo ("Using branch: `" <> pretty branchText <> "`")
 
+    let snippetResults = snippetScanResults =<< ficusResults
+
     uploadResult <- case scanUnits of
-      SourceUnitOnly units -> uploadAnalysis revision metadata units ficusResults
+      SourceUnitOnly units -> uploadAnalysis revision metadata units snippetResults
       LicenseSourceUnitOnly licenseSourceUnit -> do
         let mergedUnits = mergeSourceAndLicenseUnits [] licenseSourceUnit
         runStickyLogger SevInfo . uploadAnalysisWithFirstPartyLicensesToS3AndCore revision metadata mergedUnits ficusResults $ orgFileUpload org
@@ -166,12 +168,12 @@ uploadAnalysisWithFirstPartyLicensesToS3AndCore ::
   ProjectRevision ->
   ProjectMetadata ->
   NE.NonEmpty FullSourceUnit ->
-  Maybe FicusSnippetScanResults ->
+  Maybe FicusAnalysisResults ->
   FileUpload ->
   m UploadResponse
 uploadAnalysisWithFirstPartyLicensesToS3AndCore revision metadata mergedUnits ficusResults uploadKind = do
   _ <- uploadAnalysisWithFirstPartyLicensesToS3 revision mergedUnits
-  uploadAnalysisWithFirstPartyLicenses revision metadata uploadKind ficusResults
+  uploadAnalysisWithFirstPartyLicenses revision metadata uploadKind (snippetScanResults =<< ficusResults)
 
 uploadAnalysisWithFirstPartyLicensesToS3 ::
   ( Has Diagnostics sig m