Skip to content

Commit befe14e

Browse files
sgessaremi
authored andcommittedMar 19, 2024··
Fix credo
1 parent e413c85 commit befe14e

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed
 

‎lib/mix_audit/cli/audit.ex

+14-9
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ defmodule MixAudit.CLI.Audit do
55
format = Keyword.get(opts, :format)
66
ignored_advisory_ids = ignored_advisory_ids(opts)
77
ignored_package_names = ignored_package_names(opts)
8-
ignored_ids_from_file = ignored_ids_from_file(opts)
98

109
# Synchronize and get security advisories
1110
advisories =
1211
MixAudit.Repo.advisories()
1312
|> Enum.reject(&(&1.id in ignored_advisory_ids))
14-
|> Enum.reject(&(&1.id in ignored_ids_from_file))
1513
|> Enum.group_by(& &1.package)
1614

1715
# Get project dependencies
@@ -35,20 +33,20 @@ defmodule MixAudit.CLI.Audit do
3533
end
3634

3735
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)
4240
end
4341

44-
defp ignored_package_names(opts) do
42+
defp ignored_advisory_ids_from_cli(opts) do
4543
opts
46-
|> Keyword.get(:ignore_package_names, "")
44+
|> Keyword.get(:ignore_advisory_ids, "")
4745
|> String.split(",")
4846
|> Enum.map(&String.trim/1)
4947
end
5048

51-
def ignored_ids_from_file(opts) do
49+
def ignored_advisory_ids_from_file(opts) do
5250
case Keyword.get(opts, :ignore_file) do
5351
nil ->
5452
[]
@@ -60,4 +58,11 @@ defmodule MixAudit.CLI.Audit do
6058
|> Enum.reject(fn line -> String.starts_with?(line, "#") || String.trim(line) == "" end)
6159
end
6260
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
6368
end

0 commit comments

Comments
 (0)
Please sign in to comment.