:as :json => :as :json-strict to upgrade clj-http 3.10.0

dakrone/clj-http#489 (comment)
frenchy64 · Feb 5, 2020 · cd54860 · cd54860
1 parent 9128b0f
commit cd54860
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/dev/user.clj b/dev/user.clj
@@ -20,7 +20,7 @@
        search-url
        {:basic-auth auth-str
         :headers {"kbn-xsrf" ""}
-        :as :json
+        :as :json-strict
         :content-type :json
         :throw-exceptions false
         :body (json/generate-string
@@ -56,7 +56,7 @@
           search-url
           {:basic-auth auth-str
            :headers {"kbn-xsrf" ""}
-           :as :json
+           :as :json-strict
            :content-type :json
            :throw-exceptions false
            :body (json/generate-string
@@ -90,7 +90,7 @@
           search-url
           {:basic-auth auth-str
            :headers {"kbn-xsrf" ""}
-           :as :json
+           :as :json-strict
            :content-type :json
            :throw-exceptions false
            :body (json/generate-string
@@ -125,7 +125,7 @@
                   (http/get
                    (ctia-verdict-url observable)
                    {:basic-auth auth-str
-                    :as :json
+                    :as :json-strict
                     :content-type :json
                     :throw-exceptions false})]
               (if (= status 200)
@@ -151,7 +151,7 @@
          search-url
          {:basic-auth auth-str
           :headers {"kbn-xsrf" ""}
-          :as :json
+          :as :json-strict
           :content-type :json
           :throw-exceptions false
           :body (json/generate-string
@@ -182,7 +182,7 @@
           search-url
           {:basic-auth auth-str
            :headers {"kbn-xsrf" ""}
-           :as :json
+           :as :json-strict
            :content-type :json
            :throw-exceptions false
            :body (json/generate-string

diff --git a/src/ctia/http/server.clj b/src/ctia/http/server.clj
@@ -54,7 +54,7 @@
 (defn _http-get [params url jwt]
   (log/infof "checkin JWT, GET %s" url)
   (http/get url
-            (into {:as :json
+            (into {:as :json-strict
                    :coerce :always
                    :throw-exceptions false
                    :headers {:Authorization (format "Bearer %s" jwt)}

diff --git a/test/ctia/entity/feed_test.clj b/test/ctia/entity/feed_test.clj
@@ -253,7 +253,7 @@
 
           (let [feed-view-url (:feed_view_url updated-feed)
                 response (client/get feed-view-url
-                                     {:as :json})
+                                     {:as :json-strict})
                 response-body (:body response)]
 
             (is (= 200 (:status response)))

diff --git a/test/ctia/entity/web_test.clj b/test/ctia/entity/web_test.clj
@@ -285,7 +285,7 @@
                                         (str "http://localhost:" (helpers/get-http-port) "/ctia/judgement/" (:short-id judgement-id))
                                         {:headers {"Authorization" (str "Bearer " jwt)}
                                          :throw-exceptions false
-                                         :as :json})]
+                                         :as :json-strict})]
                                    (:status response)))]
              (is (= 201 status))
              (testing "GET /ctia/judgement/:id with bad JWT Authorization header"

diff --git a/test/ctia/test_helpers/es.clj b/test/ctia/test_helpers/es.clj
@@ -148,7 +148,7 @@
   (let [{:keys [status]}
         (http/post
          (url-for-type (-> obj :type keyword))
-         {:as :json
+         {:as :json-strict
           :content-type :json
           :throw-exceptions false
           :body (json/generate-string obj)})]
@@ -190,7 +190,7 @@
 (defn get-cat-indices [host port]
   (let [url (make-cat-indices-url host
                                   port)
-        {:keys [body]} (http/get url {:as :json})]
+        {:keys [body]} (http/get url {:as :json-strict})]
     (->> body
          (map (fn [{:keys [index]
                     :as entry}]