Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/kubernetes_api/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
[martian.httpkit :as martian-httpkit]
martian.swagger))

(defn default-interceptors [opts]
[(interceptors.auth/new opts)
interceptors.raise/interceptor])

(defn client
"Creates a Kubernetes Client compliant with martian api and its helpers

Expand All @@ -34,9 +38,7 @@
{:basic-auth {:username \"admin\"
:password \"1234\"}})"
[host opts]
(let [interceptors (concat [(interceptors.raise/new opts)
(interceptors.auth/new opts)]
(:interceptors opts)
(let [interceptors (concat (:interceptors opts (default-interceptors opts))
martian-httpkit/default-interceptors)
k8s (internals.client/pascal-case-routes
(martian/bootstrap-swagger host
Expand Down Expand Up @@ -123,4 +125,3 @@
schemas"
[k8s params]
(martian/explore k8s (internals.client/find-preferred-route k8s (dissoc params :request))))

2 changes: 1 addition & 1 deletion src/kubernetes_api/interceptors/raise.clj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
(status-error? (:status response)) (raise-exception response)
:else (:body response)))

(defn new [_]
(def interceptor
{:name ::raise
:leave (fn [{:keys [request response] :as _context}]
(with-meta {:response (check-response response)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns kubernetes-api.extensions.custom-resource-definition-test
(:require [clojure.test :refer :all]
(:require [clojure.test :refer [deftest is testing]]
[kubernetes-api.extensions.custom-resource-definition :as crd]
[matcher-combinators.test]))
[matcher-combinators.test :refer [match?]]))

(deftest new-route-name-test
(testing "list"
Expand Down
7 changes: 3 additions & 4 deletions test/kubernetes_api/interceptors/auth_test.clj
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
(ns kubernetes-api.interceptors.auth-test
(:require [clojure.test :refer :all]
(:require [clojure.test :refer [deftest is testing]]
[kubernetes-api.interceptors.auth :as interceptors.auth]
[matcher-combinators.matchers :as m]
[matcher-combinators.test]
[mockfn.core :refer [providing]]))
[matcher-combinators.test :refer [match?]]
[mockfn.test :refer [providing]]))

(deftest auth-test
(testing "request with basic-auth"
Expand Down
6 changes: 3 additions & 3 deletions test/kubernetes_api/interceptors/raise_test.clj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(ns kubernetes-api.interceptors.raise-test
(:require [clojure.test :refer :all]
(:require [clojure.test :refer [deftest testing is]]
[kubernetes-api.interceptors.raise :as interceptors.raise]
[matcher-combinators.test]))
[matcher-combinators.test :refer [match? thrown-match?]]))

(deftest raise-test
(let [{:keys [leave]} (interceptors.raise/new {})]
(let [{:keys [leave]} interceptors.raise/interceptor]
(testing "should raise the body to be the response on 2xx status"
(is (match?
{:response {:my :body}}
Expand Down
3 changes: 2 additions & 1 deletion test/kubernetes_api/internals/client_test.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(ns kubernetes-api.internals.client-test
(:require [clojure.test :refer :all]
(:require [clojure.test :refer [deftest is testing]]
[kubernetes-api.internals.client :as internals.client]
[matcher-combinators.test :refer [match?]]
[matcher-combinators.matchers :as m]))

(deftest pascal-case-routes-test
Expand Down
2 changes: 1 addition & 1 deletion test/kubernetes_api/swagger_test.clj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns kubernetes-api.swagger-test
(:require [clojure.test :refer :all]
(:require [clojure.test :refer [deftest is testing]]
[kubernetes-api.swagger :as swagger]))

(deftest remove-watch-endpoints-test
Expand Down