Skip to content

Commit 736b11d

Browse files
Merge pull request #3666 from nulib/dependabot/hex/app/dependencies/wait_for_it-2.1.2
Bump wait_for_it from 1.4.3 to 2.1.2 in /app
2 parents 47589a6 + cc66c02 commit 736b11d

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

app/lib/meadow/pipeline.ex

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,17 @@ defmodule Meadow.Pipeline do
6060
end
6161

6262
defp wait_for_checksum_tags(%{core_metadata: %{location: location}} = file_set, context \\ %{}) do
63-
with %{host: bucket, path: "/" <> key} <- URI.parse(location) do
64-
case wait(AWS.check_object_tags!(bucket, key, Config.required_checksum_tags()),
65-
timeout: Config.checksum_wait_timeout(),
66-
frequency: 1_000
67-
) do
68-
{:ok, true} ->
69-
kickoff(file_set, Map.merge(context, %{role: file_set.role.id}))
70-
71-
{:timeout, timeout} ->
72-
Logger.error(
73-
"Timed out after #{timeout}ms waiting for checksum tags for file set id: #{file_set.id}"
74-
)
63+
with %{host: bucket, path: "/" <> key} <- URI.parse(location),
64+
timeout <- Config.checksum_wait_timeout() do
65+
if wait(AWS.check_object_tags!(bucket, key, Config.required_checksum_tags()),
66+
timeout: timeout,
67+
frequency: 1_000
68+
) do
69+
kickoff(file_set, Map.merge(context, %{role: file_set.role.id}))
70+
else
71+
Logger.error(
72+
"Timed out after #{timeout}ms waiting for checksum tags for file set id: #{file_set.id}"
73+
)
7574
end
7675
end
7776
end

app/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ defmodule Meadow.MixProject do
106106
{:telemetry_poller, "~> 0.5"},
107107
{:tzdata, "~> 1.1.0"},
108108
{:ueberauth_nusso, "~> 1.0"},
109-
{:wait_for_it, "~> 1.4.3"},
109+
{:wait_for_it, "~> 2.1.2"},
110110
{:wormwood, "~> 0.1.0"}
111111
]
112112
end

app/mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"ueberauth_nusso": {:hex, :ueberauth_nusso, "1.0.0", "063e19268ef250ee32821d814b286a84a55517f85f53bf3c57ab84a5ac377999", [:mix], [{:httpoison, ">= 0.0.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:ueberauth, ">= 0.7.0", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "667c707b65b83efcf99b1fec76f0dab68a84774518047d8bcfb6f04631746cca"},
100100
"unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
101101
"unsafe": {:hex, :unsafe, "1.0.1", "a27e1874f72ee49312e0a9ec2e0b27924214a05e3ddac90e91727bc76f8613d8", [:mix], [], "hexpm", "6c7729a2d214806450d29766abc2afaa7a2cbecf415be64f36a6691afebb50e5"},
102-
"wait_for_it": {:hex, :wait_for_it, "1.4.3", "72d2cf197a65f1993f10d9437f11186bc8cf50e1de62ddb5dfcf4f3ff102470a", [:mix], [], "hexpm", "7474acf2fdda2b00ce55b4ce45246bd4a8759d05e234f8e670c87c028e1f08c0"},
102+
"wait_for_it": {:hex, :wait_for_it, "2.1.2", "6fab134097dd4446f1590f4b5409247be6c0eeab9d24569f665b5bf0b57cb1b7", [:mix], [], "hexpm", "c47be5ad9db9c24ef28d24dc27977243b8bc7ca366bf3e36d56af0093ef257d1"},
103103
"websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
104104
"websock_adapter": {:hex, :websock_adapter, "0.5.5", "9dfeee8269b27e958a65b3e235b7e447769f66b5b5925385f5a569269164a210", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"},
105105
"wormwood": {:hex, :wormwood, "0.1.3", "7dfd322ea33f74526f9c904693276a387b48daf6931020e02b9ca7cadeadc821", [:mix], [{:absinthe, "~> 1.4", [hex: :absinthe, repo: "hexpm", optional: false]}], "hexpm", "dcd8ca257b70065edaa4788a4ce006347dfa65d3a28adfcb99a7f71acacc265b"},

0 commit comments

Comments
 (0)