Fix cache invalidation configuration issues

nulib · Aug 4, 2023 · b51e3c1 · b51e3c1
1 parent de031ab
commit b51e3c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/config/test.exs b/app/config/test.exs
@@ -84,7 +84,8 @@ config :meadow,
       "api_token_ttl" => 300,
       "base_url" => "http://dcapi-test.northwestern.edu"
     }
-  ]
+  ],
+  iiif_distribution_id: nil
 
 if System.get_env("AWS_DEV_ENVIRONMENT") |> is_nil() do
   [:mediaconvert, :s3, :secretsmanager, :sns, :sqs]

diff --git a/app/lib/meadow/config.ex b/app/lib/meadow/config.ex
@@ -70,7 +70,7 @@ defmodule Meadow.Config do
 
   @doc "Retrieve the IIIF cloudfront distribution id"
   def iiif_cloudfront_distribution_id do
-    Application.get_env(:meadow, :iiif_cloudfront_distribution_id)
+    Application.get_env(:meadow, :iiif_distribution_id)
   end
 
   @doc "Retrieve the IIIF server endpoint"

diff --git a/app/lib/meadow/pipeline/actions/generate_poster_image.ex b/app/lib/meadow/pipeline/actions/generate_poster_image.ex
@@ -7,6 +7,8 @@ defmodule Meadow.Pipeline.Actions.GeneratePosterImage do
   alias Meadow.Repo
   alias Meadow.Utils.{AWS, Lambda}
 
+  import Env
+
   use Meadow.Pipeline.Actions.Common
 
   @timeout 30_000

diff --git a/app/lib/meadow/utils/aws.ex b/app/lib/meadow/utils/aws.ex
@@ -82,8 +82,8 @@ defmodule Meadow.Utils.AWS do
   def invalidate_cache(file_set, :pyramid, :dev), do: perform_invalidation("/iiif/2/#{prefix()}/#{file_set.id}/*")
   def invalidate_cache(file_set, :pyramid, :test), do: perform_invalidation("/iiif/2/#{prefix()}/#{file_set.id}/*")
   def invalidate_cache(file_set, :pyramid, _), do: perform_invalidation("/iiif/2/#{file_set.id}/*")
-  def invalidate_cache(file_set, :poster, :dev), do: perform_invalidation("/iiif/2/posters/#{prefix()}/#{file_set.id}/*")
-  def invalidate_cache(file_set, :poster, :test), do: perform_invalidation("/iiif/2/posters/#{prefix()}/#{file_set.id}/*")
+  def invalidate_cache(file_set, :poster, :dev), do: perform_invalidation("/iiif/2/#{prefix()}/posters/#{file_set.id}/*")
+  def invalidate_cache(file_set, :poster, :test), do: perform_invalidation("/iiif/2/#{prefix()}/posters/#{file_set.id}/*")
   def invalidate_cache(file_set, :poster, _), do: perform_invalidation("/iiif/2/posters#{file_set.id}/*")
 
   defp perform_invalidation(path), do: perform_invalidation(path, Config.iiif_cloudfront_distribution_id())
@@ -123,7 +123,7 @@ defmodule Meadow.Utils.AWS do
     }
 
     case operation |> ExAws.request() do
-      {:ok, status_code: status_code} when status_code in 200..299 ->
+      {:ok, %{status_code: status_code}} when status_code in 200..299 ->
         :ok
 
       _ ->