Remove unused code

wojtekmach · Jul 18, 2024 · f6fb034 · f6fb034
1 parent 60253db
commit f6fb034
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 48 deletions.
diff --git a/lib/req/steps.ex b/lib/req/steps.ex
@@ -1199,61 +1199,43 @@ defmodule Req.Steps do
         :service,
         :region,
         :datetime,
-        :into,
 
         # for req_s3
         :expires
       ])
 
-      {into, aws_options} = Keyword.pop(aws_options, :into, :headers)
-
-      case into do
-        :headers ->
-          {body, options} =
-            case request.body do
-              nil ->
-                {"", []}
-
-              iodata when is_binary(iodata) or is_list(iodata) ->
-                {iodata, []}
+      {body, options} =
+        case request.body do
+          nil ->
+            {"", []}
 
-              _enumerable ->
-                if Req.Request.get_header(request, "content-length") == [] do
-                  raise "content-length header must be explicitly set when streaming request body"
-                end
+          iodata when is_binary(iodata) or is_list(iodata) ->
+            {iodata, []}
 
-                {"", [body_digest: "UNSIGNED-PAYLOAD"]}
+          _enumerable ->
+            if Req.Request.get_header(request, "content-length") == [] do
+              raise "content-length header must be explicitly set when streaming request body"
             end
 
-          request = Req.Request.put_new_header(request, "host", request.url.host)
-
-          headers = for {name, values} <- request.headers, value <- values, do: {name, value}
+            {"", [body_digest: "UNSIGNED-PAYLOAD"]}
+        end
 
-          headers =
-            Req.Utils.aws_sigv4_headers(
-              aws_options ++
-                [
-                  method: request.method,
-                  url: to_string(request.url),
-                  headers: headers,
-                  body: body
-                ] ++ options
-            )
+      request = Req.Request.put_new_header(request, "host", request.url.host)
 
-          Req.merge(request, headers: headers)
+      headers = for {name, values} <- request.headers, value <- values, do: {name, value}
 
-        :url ->
-          url =
-            Req.Utils.aws_sigv4_url(
-              aws_options ++
-                [
-                  method: request.method,
-                  url: to_string(request.url)
-                ]
-            )
+      headers =
+        Req.Utils.aws_sigv4_headers(
+          aws_options ++
+            [
+              method: request.method,
+              url: to_string(request.url),
+              headers: headers,
+              body: body
+            ] ++ options
+        )
 
-          put_in(request.url, url)
-      end
+      Req.merge(request, headers: headers)
     else
       request
     end

diff --git a/test/req/integration_test.exs b/test/req/integration_test.exs
@@ -81,11 +81,5 @@ defmodule Req.IntegrationTest do
       )
 
     assert Req.get!(req, url: "/key1").body == String.duplicate(now, 2)
-
-    req = Req.merge(req, url: "/key1")
-    req = put_in(req.options[:aws_sigv4][:into], :url)
-    url = Req.Request.prepare(req).url
-
-    assert Req.get!(url).body == String.duplicate(now, 2)
   end
 end