Skip to content

Commit d03915e

Browse files
committed
Fix warnings that were killing CI builds.
1 parent 8e59809 commit d03915e

File tree

1 file changed

+4
-23
lines changed

1 file changed

+4
-23
lines changed

src/App/Fossa/Ficus/Analyze.hs

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import Data.Conduit qualified as Conduit
3636
import Data.Conduit.Combinators qualified as CC
3737
import Data.Conduit.List qualified as CCL
3838
import Data.Hashable (Hashable)
39-
import Data.Maybe (mapMaybe)
4039
import Data.String.Conversion (ToText (toText), toString)
4140
import Data.Text (Text)
4241
import Data.Text qualified as Text
@@ -127,31 +126,13 @@ analyzeWithFicusMain rootDir apiOpts revision filters snippetScanRetentionDays =
127126
, ficusConfigSnippetScanRetentionDays = snippetScanRetentionDays
128127
}
129128

130-
extractAnalysisId :: FicusFinding -> Maybe Int
131-
extractAnalysisId (FicusFinding (FicusMessageData strategy payload))
129+
findingToAnalysisId :: FicusFinding -> Maybe Int
130+
findingToAnalysisId (FicusFinding (FicusMessageData strategy payload))
132131
| Text.toLower strategy == "fingerprint" =
133132
case decode (BL.fromStrict $ Text.Encoding.encodeUtf8 payload) :: Maybe Object of
134133
Just obj -> parseMaybe (.: "analysis_id") obj
135134
Nothing -> Nothing
136-
extractAnalysisId _ = Nothing
137-
138-
ficusMessagesToFicusSnippetScanResults :: FicusMessages -> Maybe FicusSnippetScanResults
139-
ficusMessagesToFicusSnippetScanResults messages =
140-
let isFingerprintStrategy :: FicusFinding -> Bool
141-
isFingerprintStrategy (FicusFinding (FicusMessageData strategy _)) =
142-
Text.toLower strategy == "fingerprint"
143-
144-
extractAnalysisId :: FicusFinding -> Maybe Int
145-
extractAnalysisId (FicusFinding (FicusMessageData _ payload)) =
146-
case decode (BL.fromStrict $ Text.Encoding.encodeUtf8 payload) :: Maybe Object of
147-
Just obj -> parseMaybe (.: "analysis_id") obj
148-
Nothing -> Nothing
149-
150-
matchingFinding = filter isFingerprintStrategy (ficusMessageFindings messages)
151-
analysisId = mapMaybe extractAnalysisId matchingFinding
152-
in case analysisId of
153-
(aid : _) -> Just $ FicusSnippetScanResults{ficusSnippetScanResultsAnalysisId = aid}
154-
[] -> Nothing
135+
findingToAnalysisId _ = Nothing
155136

156137
runFicus ::
157138
( Has Diagnostics sig m
@@ -234,7 +215,7 @@ runFicus ficusConfig = do
234215
pure acc
235216
FicusMessageFinding finding -> do
236217
putStrLn $ "[" ++ timestamp ++ "] FINDING " <> toString (displayFicusFinding finding)
237-
pure $ acc <|> (FicusSnippetScanResults <$> extractAnalysisId finding)
218+
pure $ acc <|> (FicusSnippetScanResults <$> findingToAnalysisId finding)
238219
)
239220
Nothing
240221

0 commit comments

Comments
 (0)