PR comments

Author: louiscb

lib/remote_persistent_term/fetcher/s3.ex

@@ -10,7 +10,7 @@ defmodule RemotePersistentTerm.Fetcher.S3 do
           bucket: String.t(),
           key: String.t(),
           region: String.t(),
-          failover_buckets: [{String.t(), String.t()}] | nil
+          failover_buckets: [[bucket: String.t(), region: String.t()]] | nil
         }
   defstruct [:bucket, :key, :region, :failover_buckets]
 
@@ -31,10 +31,11 @@ defmodule RemotePersistentTerm.Fetcher.S3 do
       doc: "The AWS region of the s3 bucket."
     ],
     failover_buckets: [
-      type: {:list, {:tuple, [:string, :string]}},
+      type: {:list, :keyword_list},
       required: false,
       doc:
-        "A list of tuples containing {bucket_name, region} to use as failover if the primary bucket fails."
+        "A list of keyword lists containing [bucket: bucket_name, region: region] to use as failover if the primary bucket fails. \n
+        The directory structure in failover buckets must match the primary bucket."
     ]
   ]
 
@@ -176,7 +177,12 @@ defmodule RemotePersistentTerm.Fetcher.S3 do
 
   defp try_failover_buckets(_op, [], _opts, _state), do: {:error, "All buckets failed"}
 
-  defp try_failover_buckets(op, [{bucket, region} | remaining_buckets], opts, state) do
+  defp try_failover_buckets(
+         op,
+         [[bucket: bucket, region: region] | remaining_buckets],
+         opts,
+         state
+       ) do
     Logger.info(%{
       bucket: bucket,
       key: state.key,
@@ -202,8 +208,7 @@ defmodule RemotePersistentTerm.Fetcher.S3 do
   end
 
   defp perform_request(op, bucket, region, opts) do
-    op
-    |> apply([bucket, opts])
+    op.(bucket, opts)
     |> client().request(region: region)
   end
 

test/remote_persistent_term/fetcher/s3_test.exs

@@ -9,8 +9,8 @@ defmodule RemotePersistentTerm.Fetcher.S3Test do
   @key "test-key"
   @region "test-region"
   @failover_buckets [
-    {"failover-bucket-1", "failover-region-1"},
-    {"failover-bucket-2", "failover-region-2"}
+    [bucket: "failover-bucket-1", region: "failover-region-1"],
+    [bucket: "failover-bucket-2", region: "failover-region-2"]
   ]
   @version "F76V.weh4uOlU15f7a2OLHPgCLXkDpm4"
 
@@ -45,7 +45,11 @@ defmodule RemotePersistentTerm.Fetcher.S3Test do
       bucket = "my-bucket"
       key = "my-key"
       region = "my-region"
-      failover_buckets = [{"backup-bucket", "backup-region"}, {"dr-bucket", "dr-region"}]
+
+      failover_buckets = [
+        [bucket: "backup-bucket", region: "backup-region"],
+        [bucket: "dr-bucket", region: "dr-region"]
+      ]
 
       assert {:ok,
               %S3{bucket: bucket, key: key, region: region, failover_buckets: failover_buckets}} ==