Skip to content

Ensure :headers is according to Ring spec #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ensure :headers is according to Ring spec #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e161bc6
Ensure :headers is according to Ring spec
viesti Nov 1, 2022
2e6def6
Add support for multi value headers
ponzao Jan 4, 2023
5b3625f
Use a more data structure appropriate function
ponzao Jan 5, 2023
021483d
Merge pull request #1 from ponzao/master
viesti Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/fierycod/holy_lambda_ring_adapter/core.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@
[{:keys [event ctx]}]
(let [request-ctx (get event :requestContext)
http (get request-ctx :http)
headers (get event :headers)
headers (persistent! (reduce (fn [acc [k v]]
(if (keyword? k)
(assoc! acc (.toLowerCase (name k)) v)
(assoc! acc k v)))
(transient {})
(get event :headers)))
base64? (get event :isBase64Encoded)]
(when-not request-ctx
(throw (ex-info "Incorrect shape of AWS event. The adapter is compatible with following integrations: HttpApi and RestApi on AWS Api Gateway service. If you're testing locally make sure the event shape is valid e.g. use `sam local start-api` instead of `sam local invoke`." {:ctx :hl-ring-adapter})))
Expand Down Expand Up @@ -90,12 +95,16 @@
(h/entrypoint [#'HttpApiProxyGateway])
```"
[response]
(let [^impl/RingResponseBody body (:body response)
{:keys [body encoded?]} (impl/to-hl-response-body body)]
{:statusCode (:status response)
:body body
:isBase64Encoded encoded?
:headers (:headers response)}))
(let [^impl/RingResponseBody body (:body response)
{:keys [body encoded?]} (impl/to-hl-response-body body)
[single-value-headers multi-value-headers] ((juxt remove filter)
(comp coll? val)
(:headers response))]
(cond-> {:statusCode (:status response)
:body body
:isBase64Encoded encoded?}
(seq single-value-headers) (assoc :headers (into {} single-value-headers))
(seq multi-value-headers) (assoc :multiValueHeaders (into {} multi-value-headers)))))

(defn ring<->hl-middleware
"Middleware that converts Ring Request/Response model to Holy Lambda (AWS Lambda) Request/Response model.
Expand Down
41 changes: 38 additions & 3 deletions test/fierycod/holy_lambda_ring_adapter/core_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,34 @@
[hl-request]
(ring-spec-props (hra/hl-request->ring-request hl-request)))

(t/deftest response-transform
(t/testing "should correctly parse single value headers"
(let [ring-response {:status 200
:headers {"upgrade-insecure-requests" "1"}}]
(t/is (= {:statusCode 200,
:body nil,
:isBase64Encoded false,
:headers {"upgrade-insecure-requests" "1"}}
(hra/ring-response->hl-response ring-response)))))
(t/testing "should correctly parse multi value headers"
(let [ring-response {:status 200
:headers {"set-cookie" ["totalOrders=76" "merged-cart=1"]}}]
(t/is (= {:statusCode 200,
:body nil,
:isBase64Encoded false,
:multiValueHeaders {"set-cookie" ["totalOrders=76" "merged-cart=1"]}}
(hra/ring-response->hl-response ring-response)))))
(t/testing "should correctly parse a mix of single and multi value headers"
(let [ring-response {:status 200
:headers {"upgrade-insecure-requests" "1"
"set-cookie" ["totalOrders=76" "merged-cart=1"]}}]
(t/is (= {:statusCode 200,
:body nil,
:isBase64Encoded false,
:headers {"upgrade-insecure-requests" "1"}
:multiValueHeaders {"set-cookie" ["totalOrders=76" "merged-cart=1"]}}
(hra/ring-response->hl-response ring-response))))))

(t/deftest http-api-basic-1
(t/testing "should correctly transform request->ring-request #1"
(let [hl-request {:event
Expand Down Expand Up @@ -190,8 +218,7 @@
(handler (request->ring-request-test request1))))
(t/is (= {:statusCode 200,
:body "Hello world",
:isBase64Encoded false,
:headers nil}
:isBase64Encoded false}
(hra/ring-response->hl-response (handler (request->ring-request-test request2)))))
(t/is (= {:statusCode 200,
:body "hello world HTTP/1.1",
Expand All @@ -202,7 +229,15 @@
:body "hello world HTTP/1.1",
:isBase64Encoded false,
:headers {"something" "something"}}
((hra/ring<->hl-middleware basic-ring-handler-async) request2 identity identity))))))
((hra/ring<->hl-middleware basic-ring-handler-async) request2 identity identity)))))

(t/testing "Ensure :headers is a map of downcase strings as keys"
(t/is (= {"content-type" "application/json"}
(:headers (request->ring-request-test {:event {:path "/foo"
:isBase64Encoded false
:headers {:Content-Type "application/json"}
:requestContext {:httpMethod "GET"}}
:ctx nil}))))))

(t/deftest http-api-json-coerce-1
(t/testing "json coercion should work"
Expand Down