From 974b71dd95992d04051cb3de6b5403b7684b27b5 Mon Sep 17 00:00:00 2001 From: Karen Shaw Date: Wed, 28 Aug 2024 18:56:33 +0000 Subject: [PATCH] Change IIIF server requests to v3 --- app/config/config.exs | 2 +- app/config/test.exs | 2 +- app/lib/meadow/utils/aws.ex | 12 ++++++------ app/test/meadow/config_test.exs | 4 ++-- app/test/meadow/data/file_sets_test.exs | 4 ++-- .../pipeline/actions/generate_poster_image_test.exs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/config/config.exs b/app/config/config.exs index 5679b7449..58a191c30 100644 --- a/app/config/config.exs +++ b/app/config/config.exs @@ -134,7 +134,7 @@ config :meadow, iiif_server_url: aws_secret("meadow", dig: ["iiif", "base_url"], - default: "https://iiif.dev.rdc.library.northwestern.edu/iiif/2/#{prefix()}" + default: "https://iiif.dev.rdc.library.northwestern.edu/iiif/3/#{prefix()}" ), iiif_manifest_url_deprecated: aws_secret("meadow", diff --git a/app/config/test.exs b/app/config/test.exs index 46e977fbd..263aeb07c 100644 --- a/app/config/test.exs +++ b/app/config/test.exs @@ -21,7 +21,7 @@ config :meadow, index_interval: 1234, mediaconvert_client: MediaConvert.Mock, streaming_url: "https://test-streaming-url/", - iiif_server_url: "http://localhost:8184/iiif/2/", + iiif_server_url: "http://localhost:8184/iiif/3/", iiif_manifest_url_deprecated: "http://test-pyramids.s3.localhost.localstack.cloud:4566/public/", digital_collections_url: "https://fen.rdc-staging.library.northwestern.edu/" diff --git a/app/lib/meadow/utils/aws.ex b/app/lib/meadow/utils/aws.ex index 0eb86cc3c..1f1b9baf4 100644 --- a/app/lib/meadow/utils/aws.ex +++ b/app/lib/meadow/utils/aws.ex @@ -80,12 +80,12 @@ defmodule Meadow.Utils.AWS do do: MultipartCopy.copy_object(dest_bucket, dest_object, src_bucket, src_object, opts) def invalidate_cache(file_set, invalidation_type), do: invalidate_cache(file_set, invalidation_type, Config.environment()) - def invalidate_cache(file_set, :pyramid, :dev), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/#{file_set.id}/*") - def invalidate_cache(file_set, :pyramid, :test), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/#{file_set.id}/*") - def invalidate_cache(file_set, :pyramid, _), do: perform_iiif_invalidation("/iiif/2/#{file_set.id}/*") - def invalidate_cache(file_set, :poster, :dev), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/posters/#{file_set.id}/*") - def invalidate_cache(file_set, :poster, :test), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/posters/#{file_set.id}/*") - def invalidate_cache(file_set, :poster, _), do: perform_iiif_invalidation("/iiif/2/posters/#{file_set.id}/*") + def invalidate_cache(file_set, :pyramid, :dev), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/#{file_set.id}/*") + def invalidate_cache(file_set, :pyramid, :test), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/#{file_set.id}/*") + def invalidate_cache(file_set, :pyramid, _), do: perform_iiif_invalidation("/iiif/3/#{file_set.id}/*") + def invalidate_cache(file_set, :poster, :dev), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/posters/#{file_set.id}/*") + def invalidate_cache(file_set, :poster, :test), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/posters/#{file_set.id}/*") + def invalidate_cache(file_set, :poster, _), do: perform_iiif_invalidation("/iiif/3/posters/#{file_set.id}/*") def invalidate_cache(_file_set, :streaming, :dev), do: :ok def invalidate_cache(_file_set, :streaming, :test), do: :ok def invalidate_cache(file_set, :streaming, _), do: perform_streaming_invalidation("/#{Pairtree.generate!(file_set.id)}/*") diff --git a/app/test/meadow/config_test.exs b/app/test/meadow/config_test.exs index 9ffb2284f..c1df81aed 100644 --- a/app/test/meadow/config_test.exs +++ b/app/test/meadow/config_test.exs @@ -90,7 +90,7 @@ defmodule Meadow.ConfigTest do end test "trailing slashes/0" do - Application.put_env(:meadow, :iiif_server_url, "http://no-slash-test/iiif/2") + Application.put_env(:meadow, :iiif_server_url, "http://no-slash-test/iiif/3") Application.put_env( :meadow, @@ -98,7 +98,7 @@ defmodule Meadow.ConfigTest do "http://no-slash-test/minio/test-pyramids/public" ) - assert Config.iiif_server_url() == "http://no-slash-test/iiif/2/" + assert Config.iiif_server_url() == "http://no-slash-test/iiif/3/" assert Config.iiif_manifest_url_deprecated() == "http://no-slash-test/minio/test-pyramids/public/" diff --git a/app/test/meadow/data/file_sets_test.exs b/app/test/meadow/data/file_sets_test.exs index 2f1b72bb1..dc787e274 100644 --- a/app/test/meadow/data/file_sets_test.exs +++ b/app/test/meadow/data/file_sets_test.exs @@ -216,7 +216,7 @@ defmodule Meadow.Data.FileSetsTest do with uri <- file_set |> FileSets.representative_image_url_for() |> URI.parse() do assert uri.host == "localhost" - assert uri.path == "/iiif/2/posters/#{file_set.id}" + assert uri.path == "/iiif/3/posters/#{file_set.id}" end end @@ -230,7 +230,7 @@ defmodule Meadow.Data.FileSetsTest do with uri <- file_set |> FileSets.representative_image_url_for() |> URI.parse() do assert uri.host == "localhost" - assert uri.path == "/iiif/2/#{file_set.id}" + assert uri.path == "/iiif/3/#{file_set.id}" end end diff --git a/app/test/pipeline/actions/generate_poster_image_test.exs b/app/test/pipeline/actions/generate_poster_image_test.exs index 046d6089f..2e072e33d 100644 --- a/app/test/pipeline/actions/generate_poster_image_test.exs +++ b/app/test/pipeline/actions/generate_poster_image_test.exs @@ -85,7 +85,7 @@ defmodule Meadow.Pipeline.Actions.GeneratePosterImageTest do assert log |> String.contains?( - "Skipping cache invalidation for: /iiif/2/#{prefix()}/posters/#{file_set_id}/*. No distribution id found." + "Skipping cache invalidation for: /iiif/3/#{prefix()}/posters/#{file_set_id}/*. No distribution id found." ) end end