@@ -5,7 +5,6 @@ module Security.Advisories.Queries
5
5
where
6
6
7
7
import Control.Monad.IO.Class (MonadIO )
8
- import Data.Text (Text )
9
8
import Distribution.Types.Version (Version )
10
9
import Distribution.Types.VersionRange (VersionRange )
11
10
import Validation (Validation (.. ))
@@ -16,22 +15,22 @@ import Security.Advisories.Parse
16
15
17
16
type QueryResult = Validation [(FilePath , ParseAdvisoryError )] [Advisory ]
18
17
19
- -- | List the advisories matching a package name and a version
18
+ -- | List the advisories matching a component and a version
20
19
listVersionAffectedBy
21
20
:: MonadIO m
22
- => FilePath -> Text -> Version -> m QueryResult
21
+ => FilePath -> ComponentIdentifier -> Version -> m QueryResult
23
22
listVersionAffectedBy = listAffectedByHelper isVersionAffectedBy
24
23
25
- -- | List the advisories matching a package name and a version range
24
+ -- | List the advisories matching a component and a version range
26
25
listVersionRangeAffectedBy
27
26
:: (MonadIO m )
28
- => FilePath -> Text -> VersionRange -> m QueryResult
27
+ => FilePath -> ComponentIdentifier -> VersionRange -> m QueryResult
29
28
listVersionRangeAffectedBy = listAffectedByHelper isVersionRangeAffectedBy
30
29
31
30
-- | Helper function for 'listVersionAffectedBy' and 'listVersionRangeAffectedBy'
32
31
listAffectedByHelper
33
32
:: (MonadIO m )
34
- => (ComponentIdentifier -> a -> Advisory -> Bool ) -> FilePath -> Text -> a -> m QueryResult
35
- listAffectedByHelper checkAffectedBy root queryPackageName queryVersionish =
36
- fmap (filter (checkAffectedBy ( Hackage queryPackageName) queryVersionish)) <$>
33
+ => (ComponentIdentifier -> a -> Advisory -> Bool ) -> FilePath -> ComponentIdentifier -> a -> m QueryResult
34
+ listAffectedByHelper checkAffectedBy root queryComponent queryVersionish =
35
+ fmap (filter (checkAffectedBy queryComponent queryVersionish)) <$>
37
36
listAdvisories root
0 commit comments