Return full ficus analysis result

Author: nficca

integration-test/Analysis/FicusSpec.hs

@@ -4,7 +4,7 @@
 module Analysis.FicusSpec (spec) where
 
 import App.Fossa.Ficus.Analyze (analyzeWithFicus)
-import App.Fossa.Ficus.Types (FicusSnippetScanResults (..))
+import App.Fossa.Ficus.Types (FicusAnalysisResults (..), FicusSnippetScanResults (..))
 import App.Types (ProjectRevision (..))
 import Control.Carrier.Diagnostics (runDiagnostics)
 import Control.Carrier.Stack (runStack)
@@ -56,9 +56,9 @@ spec = do
       case result of
         Success _warnings analysisResult -> do
           case analysisResult of
-            Just results -> do
-              ficusSnippetScanResultsAnalysisId results `shouldSatisfy` (> 0)
-            Nothing -> do
+            Just (FicusAnalysisResults{snippetScanResults = Just (FicusSnippetScanResults analysisId)}) -> do
+              analysisId `shouldSatisfy` (> 0)
+            _ -> do
               -- No snippet scan results returned - this is acceptable for integration testing
               True `shouldBe` True
         Failure _warnings errors -> do

src/App/Fossa/Analyze.hs

@@ -51,6 +51,7 @@ 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 (..))
@@ -361,7 +362,7 @@ analyze cfg = Diag.context "fossa-analyze" $ do
                   (Config.licenseScanPathFilters vendoredDepsOptions)
                   (orgSnippetScanSourceCodeRetentionDays =<< orgInfo)
                   (Config.debugDir cfg)
-  let ficusResults = join $ resultToMaybe maybeFicusResults
+  let ficusResults = (snippetScanResults =<<) . join $ resultToMaybe maybeFicusResults
 
   maybeLernieResults <-
     Diag.errorBoundaryIO . diagToDebug $

src/App/Fossa/Ficus/Analyze.hs

@@ -99,9 +99,9 @@ analyzeWithFicus ::
   Maybe LicenseScanPathFilters ->
   Maybe Int ->
   Maybe FilePath -> -- Debug directory (if enabled)
-  m (Maybe FicusSnippetScanResults)
+  m (Maybe FicusAnalysisResults)
 analyzeWithFicus rootDir apiOpts revision filters snippetScanRetentionDays maybeDebugDir = do
-  analyzeWithFicusMain rootDir apiOpts revision filters snippetScanRetentionDays maybeDebugDir
+  Just <$> analyzeWithFicusMain rootDir apiOpts revision filters snippetScanRetentionDays maybeDebugDir
 
 analyzeWithFicusMain ::
   ( Has Diagnostics sig m
@@ -114,12 +114,12 @@ analyzeWithFicusMain ::
   Maybe LicenseScanPathFilters ->
   Maybe Int ->
   Maybe FilePath -> -- Debug directory (if enabled)
-  m (Maybe FicusSnippetScanResults)
+  m FicusAnalysisResults
 analyzeWithFicusMain rootDir apiOpts revision filters snippetScanRetentionDays maybeDebugDir = do
   logDebugWithTime "Preparing Ficus analysis configuration..."
   ficusResults <- runFicus maybeDebugDir ficusConfig
   logDebugWithTime "runFicus completed, processing results..."
-  case ficusResults of
+  case snippetScanResults ficusResults of
     Just results ->
       logInfo $ pretty (formatFicusScanSummary results)
     Nothing -> logInfo "Ficus analysis completed but no fingerprint findings were found"
@@ -225,7 +225,7 @@ runFicus ::
   ) =>
   Maybe FilePath ->
   FicusConfig ->
-  m (Maybe FicusSnippetScanResults)
+  m FicusAnalysisResults
 runFicus maybeDebugDir ficusConfig = do
   logDebugWithTime "About to extract Ficus binary..."
   withFicusBinary $ \bin -> do
@@ -282,7 +282,7 @@ runFicus maybeDebugDir ficusConfig = do
         logInfo $ pretty (Text.unlines stdErrLines)
         logInfo "\n==== END Ficus STDERR ====\n"
       else logInfo "[Ficus] Ficus exited successfully"
-    pure $ snippetScanResults result
+    pure result
   where
     currentTimeStamp :: IO String
     currentTimeStamp = do