Merge pull request #1162 from tuist/fix/bucket-as-host-double-domain

Fix bucket_as_host with virtual_host causing double bucket in URLs

Author: bernardd

lib/ex_aws/operation/s3.ex

@@ -62,6 +62,12 @@ defmodule ExAws.Operation.S3 do
       raise "#{__MODULE__}.perform/2 cannot perform operation on `nil` bucket"
     end
 
+    def add_bucket_to_path(operation, %{virtual_host: true, bucket_as_host: true} = config) do
+      # When bucket_as_host is true, use the bucket name as the full hostname
+      {put_in(operation.path, ensure_absolute(operation.path)),
+       Map.put(config, :host, operation.bucket)}
+    end
+
     def add_bucket_to_path(operation, %{virtual_host: true, host: base_host} = config) do
       vhost_domain = "#{operation.bucket}.#{base_host}"
 

test/ex_aws/operation/s3_test.exs

@@ -80,4 +80,24 @@ defmodule ExAws.Operation.S3Test do
     {processed_operation, _processed_config} = S3.add_bucket_to_path(operation, config)
     assert processed_operation.path == "/folder/"
   end
+
+  test "S3 uses bucket as host when both virtual_host and bucket_as_host are true" do
+    config = ExAws.Config.new(:s3) |> Map.put(:virtual_host, true) |> Map.put(:bucket_as_host, true)
+    operation = s3_operation("my-custom-domain.com")
+
+    {processed_operation, processed_config} = S3.add_bucket_to_path(operation, config)
+
+    assert(processed_config.host == "my-custom-domain.com")
+    assert(processed_operation.path == "/folder")
+  end
+
+  test "S3 uses standard virtual host when virtual_host is true but bucket_as_host is false" do
+    config = ExAws.Config.new(:s3) |> Map.put(:virtual_host, true) |> Map.put(:bucket_as_host, false)
+    operation = s3_operation()
+
+    {processed_operation, processed_config} = S3.add_bucket_to_path(operation, config)
+
+    assert(processed_config.host == "#{operation.bucket}.#{ExAws.Config.new(:s3).host}")
+    assert(processed_operation.path == "/folder")
+  end
 end