load registry settings from appcfg

Author: coryodaniel

lib/oci/pagination.ex

@@ -0,0 +1,16 @@
+defmodule OCI.Pagination do
+  @moduledoc """
+  Provides pagination functionality for OCI registry operations, particularly for listing tags.
+
+  This module handles the pagination parameters and results for operations that return
+  large sets of data, such as listing repository tags. It supports the OCI Distribution
+  Specification's pagination model using `n` (number of results) and `last` (last seen value)
+  parameters.
+  """
+  use TypedStruct
+
+  typedstruct do
+    field :n, pos_integer(), enforce: false
+    field :last, String.t(), enforce: false
+  end
+end

lib/oci/plug/handler.ex

@@ -9,7 +9,7 @@ defmodule OCI.Plug.Handler do
   """
   import Plug.Conn
   alias OCI.Registry
-  alias OCI.Registry.Pagination
+  alias OCI.Pagination
 
   def handle(%{halted: true} = conn), do: conn
 

lib/oci/registry.ex

@@ -19,11 +19,6 @@ defmodule OCI.Registry do
     field :repo_name_pattern, Regex.t(), enforce: false, default: @repo_name_pattern
   end
 
-  typedstruct module: Pagination do
-    field :n, pos_integer(), enforce: false
-    field :last, String.t(), enforce: false
-  end
-
   @doc """
   Returns the API version string used in OCI registry paths.
 
@@ -38,9 +33,7 @@ defmodule OCI.Registry do
   @spec api_version() :: String.t()
   def api_version, do: "v2"
 
-  def load_from_env() do
-    oci_cfg = Application.get_all_env(:oci)
-
+  def load_from_keywordlist(oci_cfg) do
     auth_cfg = Keyword.fetch!(oci_cfg, :auth)
     {:ok, auth} = auth_cfg.adapter.init(auth_cfg.config)
 
@@ -53,6 +46,12 @@ defmodule OCI.Registry do
     registry
   end
 
+  def load_from_env() do
+    :oci
+    |> Application.get_all_env()
+    |> load_from_keywordlist
+  end
+
   def authenticate(%{auth: auth}, authorization) do
     adapter(auth).authenticate(auth, authorization)
   end
@@ -83,7 +82,15 @@ defmodule OCI.Registry do
   def init(config) do
     storage = Keyword.fetch!(config, :storage)
     auth = Keyword.fetch!(config, :auth)
-    {:ok, %__MODULE__{storage: storage, auth: auth}}
+    reg = %__MODULE__{storage: storage, auth: auth}
+
+    # Update struct with any additional configuration options
+    reg =
+      Enum.reduce(config, reg, fn
+        {key, value}, acc -> Map.put(acc, key, value)
+      end)
+
+    {:ok, reg}
   end
 
   def repo_exists?(%{storage: storage}, repo, ctx) do

lib/oci/storage/adapter.ex

@@ -177,7 +177,7 @@ defmodule OCI.Storage.Adapter do
   @callback list_tags(
               storage :: t(),
               repo :: String.t(),
-              pagination :: OCI.Registry.Pagination.t(),
+              pagination :: OCI.Pagination.t(),
               ctx :: OCI.Context.t()
             ) ::
               {:ok, tags :: [String.t()]}

mix.exs

@@ -4,7 +4,7 @@ defmodule OCI.MixProject do
   def project do
     [
       app: :oci,
-      version: "0.0.5",
+      version: "0.0.6",
       elixir: "~> 1.15",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,

test/registry_test.exs

@@ -1,6 +1,6 @@
 defmodule OCI.RegistryTest do
   use ExUnit.Case, async: true
-  doctest OCI.Registry
+  # doctest OCI.Registry
 
   defp tmp_storage() do
     OCI.Storage.Local.init(%{path: "./tmp/"})
@@ -17,6 +17,80 @@ defmodule OCI.RegistryTest do
     registry
   end
 
+  defmodule NoAuth do
+    defstruct [:none]
+
+    def init(map) do
+      {:ok, struct(__MODULE__, map)}
+    end
+  end
+
+  defmodule VoidStorage do
+    defstruct [:where]
+    def init(map), do: {:ok, struct(__MODULE__, map)}
+  end
+
+  describe "load_from_keywordlist/1" do
+    test "defaults if not present" do
+      config = [
+        auth: %{
+          adapter: NoAuth,
+          config: %{none: "nope"}
+        },
+        storage: %{
+          adapter: VoidStorage,
+          config: %{where: "nowhere"}
+        }
+      ]
+
+      registry = OCI.Registry.load_from_keywordlist(config)
+
+      assert %OCI.Registry{
+               enable_blob_deletion: true,
+               enable_manifest_deletion: true,
+               max_blob_upload_chunk_size: 10_485_760,
+               max_manifest_size: 4_194_304,
+               realm: "Registry",
+               repo_name_pattern:
+                 ~r/^([a-z0-9]+(?:[._-][a-z0-9]+)*)(\/[a-z0-9]+(?:[._-][a-z0-9]+)*)*$/,
+               auth: %OCI.RegistryTest.NoAuth{none: "nope"},
+               storage: %OCI.RegistryTest.VoidStorage{where: "nowhere"}
+             } = registry
+    end
+
+    test "should include the settings" do
+      config = [
+        realm: "My Registry",
+        max_manifest_size: 1,
+        max_blob_upload_chunk_size: 2,
+        enable_blob_deletion: false,
+        enable_manifest_deletion: false,
+        repo_name_pattern: ~r/^[a-z0-9]+\/[a-z0-9]+$/,
+        auth: %{
+          adapter: NoAuth,
+          config: %{none: "nope"}
+        },
+        storage: %{
+          adapter: VoidStorage,
+          config: %{where: "nowhere"}
+        }
+      ]
+
+      registry = OCI.Registry.load_from_keywordlist(config)
+
+      assert %OCI.Registry{
+               realm: "My Registry",
+               enable_blob_deletion: false,
+               enable_manifest_deletion: false,
+               repo_name_pattern: ~r/^[a-z0-9]+\/[a-z0-9]+$/,
+               max_manifest_size: 1,
+               max_blob_upload_chunk_size: 2,
+               auth: %OCI.RegistryTest.NoAuth{none: "nope"},
+               storage: %OCI.RegistryTest.VoidStorage{where: "nowhere"}
+             } = registry
+    end
+  end
+
   describe "authenticate" do
     test "returns {:ok, ctx} when authentication is successful" do
       registry = registry_with_user("myuser", "mypass")