@@ -5,13 +5,11 @@ defmodule MixAudit.CLI.Audit do
5
5
format = Keyword . get ( opts , :format )
6
6
ignored_advisory_ids = ignored_advisory_ids ( opts )
7
7
ignored_package_names = ignored_package_names ( opts )
8
- ignored_ids_from_file = ignored_ids_from_file ( opts )
9
8
10
9
# Synchronize and get security advisories
11
10
advisories =
12
11
MixAudit.Repo . advisories ( )
13
12
|> Enum . reject ( & ( & 1 . id in ignored_advisory_ids ) )
14
- |> Enum . reject ( & ( & 1 . id in ignored_ids_from_file ) )
15
13
|> Enum . group_by ( & & 1 . package )
16
14
17
15
# Get project dependencies
@@ -35,20 +33,20 @@ defmodule MixAudit.CLI.Audit do
35
33
end
36
34
37
35
defp ignored_advisory_ids ( opts ) do
38
- opts
39
- |> Keyword . get ( :ignore_advisory_ids , "" )
40
- |> String . split ( "," )
41
- |> Enum . map ( & String . trim / 1 )
36
+ ignored_ids_from_cli = ignored_advisory_ids_from_cli ( opts )
37
+ ignored_ids_from_file = ignored_advisory_ids_from_file ( opts )
38
+
39
+ Enum . uniq ( ignored_ids_from_cli ++ ignored_ids_from_file )
42
40
end
43
41
44
- defp ignored_package_names ( opts ) do
42
+ defp ignored_advisory_ids_from_cli ( opts ) do
45
43
opts
46
- |> Keyword . get ( :ignore_package_names , "" )
44
+ |> Keyword . get ( :ignore_advisory_ids , "" )
47
45
|> String . split ( "," )
48
46
|> Enum . map ( & String . trim / 1 )
49
47
end
50
48
51
- def ignored_ids_from_file ( opts ) do
49
+ def ignored_advisory_ids_from_file ( opts ) do
52
50
case Keyword . get ( opts , :ignore_file ) do
53
51
nil ->
54
52
[ ]
@@ -60,4 +58,11 @@ defmodule MixAudit.CLI.Audit do
60
58
|> Enum . reject ( fn line -> String . starts_with? ( line , "#" ) || String . trim ( line ) == "" end )
61
59
end
62
60
end
61
+
62
+ defp ignored_package_names ( opts ) do
63
+ opts
64
+ |> Keyword . get ( :ignore_package_names , "" )
65
+ |> String . split ( "," )
66
+ |> Enum . map ( & String . trim / 1 )
67
+ end
63
68
end
0 commit comments