From 40708ffa1fb54867873c8a576eaeae66ab268faf Mon Sep 17 00:00:00 2001 From: Mateus Dubiela Oliveira Date: Thu, 20 Apr 2023 18:20:35 -0300 Subject: [PATCH 1/2] test: Remove refer-all from clojure-test --- .../extensions/custom_resource_definition_test.clj | 4 ++-- test/kubernetes_api/interceptors/auth_test.clj | 7 +++---- test/kubernetes_api/interceptors/raise_test.clj | 4 ++-- test/kubernetes_api/internals/client_test.clj | 3 ++- test/kubernetes_api/swagger_test.clj | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/kubernetes_api/extensions/custom_resource_definition_test.clj b/test/kubernetes_api/extensions/custom_resource_definition_test.clj index 4f4e879..88c3819 100644 --- a/test/kubernetes_api/extensions/custom_resource_definition_test.clj +++ b/test/kubernetes_api/extensions/custom_resource_definition_test.clj @@ -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" diff --git a/test/kubernetes_api/interceptors/auth_test.clj b/test/kubernetes_api/interceptors/auth_test.clj index 83e2dfc..e10c10c 100644 --- a/test/kubernetes_api/interceptors/auth_test.clj +++ b/test/kubernetes_api/interceptors/auth_test.clj @@ -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" diff --git a/test/kubernetes_api/interceptors/raise_test.clj b/test/kubernetes_api/interceptors/raise_test.clj index 76aa9b3..5a22307 100644 --- a/test/kubernetes_api/interceptors/raise_test.clj +++ b/test/kubernetes_api/interceptors/raise_test.clj @@ -1,7 +1,7 @@ (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 {})] diff --git a/test/kubernetes_api/internals/client_test.clj b/test/kubernetes_api/internals/client_test.clj index e541082..687667f 100644 --- a/test/kubernetes_api/internals/client_test.clj +++ b/test/kubernetes_api/internals/client_test.clj @@ -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 diff --git a/test/kubernetes_api/swagger_test.clj b/test/kubernetes_api/swagger_test.clj index 252753c..408ebaf 100644 --- a/test/kubernetes_api/swagger_test.clj +++ b/test/kubernetes_api/swagger_test.clj @@ -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 From a5977803ba8a242ea72d6577d9927165b4b2c339 Mon Sep 17 00:00:00 2001 From: Mateus Dubiela Oliveira Date: Thu, 20 Apr 2023 18:22:40 -0300 Subject: [PATCH 2/2] interceptors: Allow for overwritting the default k8s interceptors --- src/kubernetes_api/core.clj | 9 +++++---- src/kubernetes_api/interceptors/raise.clj | 2 +- test/kubernetes_api/interceptors/raise_test.clj | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/kubernetes_api/core.clj b/src/kubernetes_api/core.clj index 5e148d5..6c68ab7 100644 --- a/src/kubernetes_api/core.clj +++ b/src/kubernetes_api/core.clj @@ -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 @@ -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 @@ -123,4 +125,3 @@ schemas" [k8s params] (martian/explore k8s (internals.client/find-preferred-route k8s (dissoc params :request)))) - diff --git a/src/kubernetes_api/interceptors/raise.clj b/src/kubernetes_api/interceptors/raise.clj index 02633b3..e242a5b 100644 --- a/src/kubernetes_api/interceptors/raise.clj +++ b/src/kubernetes_api/interceptors/raise.clj @@ -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)} diff --git a/test/kubernetes_api/interceptors/raise_test.clj b/test/kubernetes_api/interceptors/raise_test.clj index 5a22307..8c647f1 100644 --- a/test/kubernetes_api/interceptors/raise_test.clj +++ b/test/kubernetes_api/interceptors/raise_test.clj @@ -4,7 +4,7 @@ [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}}