Skip to content

Commit 17b90dc

Browse files
jonathannewmanjonathannewman
committed
(maint) address some linting issues
This addresses some of the clj-kondo linting issues.
1 parent bce72fa commit 17b90dc

File tree

12 files changed

+67
-62
lines changed

12 files changed

+67
-62
lines changed

‎.clj-kondo/config.edn‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
{:linters {:refer-all {:exclude [clojure.test]}}
1+
{:linters {:refer-all {:exclude [clojure.test]}
2+
:unused-referred-var {:level :warning :exclude {slingshot.slingshot [try+ throw+]}}
3+
:unresolved-symbol {:level :warning :exclude [(puppetlabs.trapperkeeper.core/defservice)
4+
(slingshot.slingshot/try+ [&throw-context])
5+
(puppetlabs.trapperkeeper.testutils.bootstrap/with-app-with-config)]}}
6+
:lint-as {slingshot.slingshot/try+ clojure.core/try
7+
puppetlabs.trapperkeeper.core/defservice clojure.core/def}
28
:output {:linter-name true}}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ pom.xml.asc
1717
/eng-resources
1818

1919
/dev-resources/i18n/bin
20+
.clj-kondo/.cache

‎src/puppetlabs/pcp/broker/connection.clj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
(ns puppetlabs.pcp.broker.connection
2-
(:require [clojure.string :as str]
3-
[puppetlabs.kitchensink.core :as ks]
4-
[puppetlabs.pcp.broker.websocket :refer [Websocket ws->remote-address ws->common-name]]
2+
(:require [puppetlabs.pcp.broker.websocket :refer [Websocket ws->remote-address ws->common-name]]
53
[puppetlabs.pcp.protocol :as p]
6-
[schema.core :as s]
7-
[slingshot.slingshot :refer [throw+ try+]])
4+
[schema.core :as s])
85
(:import (clojure.lang IFn)))
96

107
(def Codec

‎src/puppetlabs/pcp/broker/core.clj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[puppetlabs.pcp.client :as pcp-client]
1313
[puppetlabs.pcp.protocol :as p]
1414
[puppetlabs.metrics :refer [time!]]
15-
[clj-time.core :refer [now plus equal?]]
15+
[clj-time.core :refer [now equal?]]
1616
[puppetlabs.ssl-utils.core :as ssl-utils]
1717
[puppetlabs.structured-logging.core :as sl]
1818
[puppetlabs.trapperkeeper.authorization.ring :as ring]
@@ -255,12 +255,12 @@
255255

256256
(defn- validate-message-type
257257
[^String message-type]
258-
(if-not (re-matches #"^[\w\-.:/]*$" message-type)
258+
(when-not (re-matches #"^[\w\-.:/]*$" message-type)
259259
(i18n/trs "Illegal message type: ''{0}''." message-type)))
260260

261261
(defn- validate-target
262262
[^String target]
263-
(if-not (re-matches #"^[\w\-.:/*]*$" target)
263+
(when-not (re-matches #"^[\w\-.:/*]*$" target)
264264
(i18n/trs "Illegal message target: ''{0}''." target)))
265265

266266
(s/defn make-ring-request :- (s/maybe ring/Request)
@@ -341,7 +341,7 @@
341341
in order, if the message: 1) is an associate-request as expected during
342342
Session Association; 2) is authenticated; 3) is authorized; 4) does not
343343
use multicast delivery."
344-
[broker :- Broker message :- Message connection :- Connection is-association-request :- s/Bool]
344+
[broker :- Broker message :- Message connection :- Connection _is-association-request :- s/Bool]
345345
(cond
346346
(not (authenticated? message connection)) :not-authenticated
347347
(not (authorized? broker message connection)) :not-authorized
@@ -433,7 +433,7 @@
433433
message
434434
(i18n/trs "Error {0} handling message: {1}" (:type m) &throw-context)
435435
connection))))
436-
(catch map? m
436+
(catch map? _m
437437
(sl/maplog
438438
[:puppetlabs.pcp.broker.pcp_access :warn]
439439
(assoc (connection/summarize connection)
@@ -471,12 +471,12 @@
471471

472472
(defn- on-bytes!
473473
"OnMessage (binary) websocket event handler"
474-
[broker ws bytes offset len]
474+
[broker ws bytes _offset _len]
475475
(on-message! broker ws bytes))
476476

477477
(defn all-controllers-disconnected?
478478
[broker]
479-
(and (not (empty? @(:controllers broker)))
479+
(and (seq @(:controllers broker))
480480
(= (set (keys @(:controllers broker)))
481481
(set (keys (:warning-bin @(:database broker)))))))
482482

@@ -720,16 +720,15 @@
720720
#(i18n/trs "Checking the existing {0} connections for expired CRLs." (:count %)))
721721
(doseq [[uri client-connection] inventory-snapshot]
722722
(when (:expired client-connection)
723-
(do
724-
(sl/maplog :debug {:uri (str uri)} #(i18n/trs "Closing expired connection for {0}." (:uri %)))
725-
(Thread/sleep throttle-duration)
726-
(websocket-session/close!
727-
(:websocket client-connection)
728-
1012 ;; code SERVER_RESTART, client *should* reconnect soon
729-
(i18n/trs "CRL reloaded"))
730-
(sl/maplog
731-
:info {}
732-
(fn [_] (i18n/trs "Evicted stale client connections because of CRL reload."))))))))
723+
(sl/maplog :debug {:uri (str uri)} #(i18n/trs "Closing expired connection for {0}." (:uri %)))
724+
(Thread/sleep throttle-duration)
725+
(websocket-session/close!
726+
(:websocket client-connection)
727+
1012 ;; code SERVER_RESTART, client *should* reconnect soon
728+
(i18n/trs "CRL reloaded"))
729+
(sl/maplog
730+
:info {}
731+
(fn [_] (i18n/trs "Evicted stale client connections because of CRL reload.")))))))
733732

734733
(defn on-controller-connect!
735734
[broker controller-uri _ws]
@@ -744,8 +743,9 @@
744743

745744
(defn schedule-client-purge!
746745
[broker timestamp controller-disconnection-ms]
747-
(future (do (Thread/sleep controller-disconnection-ms)
748-
(maybe-purge-clients! broker timestamp)))
746+
(future
747+
(Thread/sleep controller-disconnection-ms)
748+
(maybe-purge-clients! broker timestamp))
749749
(sl/maplog
750750
:debug {:timeout controller-disconnection-ms}
751751
;; 0 : number of milliseconds
@@ -755,7 +755,7 @@
755755
[broker :- Broker
756756
uri :- s/Str
757757
controller-disconnection-ms :- s/Int
758-
client :- Client]
758+
_client :- Client]
759759
(let [timestamp (now)]
760760
(sl/maplog
761761
:info {:uri uri}
@@ -808,7 +808,7 @@
808808
check-interval (:crl-check-period broker)]
809809
(loop []
810810
(close-expired-connections! broker)
811-
(if (nil? (deref should-stop check-interval nil))
811+
(when (nil? (deref should-stop check-interval nil))
812812
(recur))))))
813813

814814
(s/defn expire-ssl-connections*
@@ -890,7 +890,7 @@
890890
(when (get-route :v2)
891891
(swap! (:handlers broker) conj
892892
(add-websocket-handler (build-websocket-handlers broker message/v2-codec) {:route-id :v2})))
893-
(catch IllegalArgumentException e
893+
(catch IllegalArgumentException _e
894894
(sl/maplog :info {:type :v2-unavailable}
895895
(fn [_] (i18n/trs "v2 protocol endpoint not configured.")))))
896896
broker))

‎src/puppetlabs/pcp/broker/inventory.clj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
(:require [puppetlabs.pcp.protocol :as p]
33
[puppetlabs.pcp.broker.shared :refer [Broker deliver-server-message] :as shared]
44
[puppetlabs.pcp.broker.message :as message]
5-
[clojure.set :refer [intersection union]]
65
[schema.core :as s])
7-
(:import [clojure.lang Numbers]
8-
[puppetlabs.pcp.broker.connection Connection]))
6+
(:import [clojure.lang Numbers]))
97

108
(s/defn init-database :- shared/BrokerDatabase
119
[]
@@ -82,7 +80,7 @@
8280
filtered-updates))
8381
(transient []))
8482
persistent!)]
85-
(if (seq filtered)
83+
(when (seq filtered)
8684
{:changes filtered})))
8785

8886
(s/defn subscribe-client! :- shared/BrokerDatabase
@@ -132,7 +130,7 @@
132130
(fn [database]
133131
(if (identical? (-> database :subscriptions (get subscriber)) subscription) ;; is the subscription in the live database still the same?
134132
(do
135-
(if (nil? @processed-count-atom) ;; have we not sent the update to this subscriber yet?
133+
(when (nil? @processed-count-atom) ;; have we not sent the update to this subscriber yet?
136134
(let [data (-> (subvec updates next-update-offset) ;; skip updates which have already been sent to this subscriber
137135
(build-update-data (:pattern-sets subscription)))]
138136
(if (or (nil? data) ;; there are no updates for this subscriber
@@ -171,7 +169,7 @@
171169
(let [should-stop (:should-stop broker)]
172170
(loop []
173171
(send-updates broker)
174-
(if (nil? (deref should-stop batch-update-interval-ms nil))
172+
(when (nil? (deref should-stop batch-update-interval-ms nil))
175173
(recur))))))
176174

177175
(s/defn stop-inventory-updates!

‎src/puppetlabs/pcp/broker/message.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[puppetlabs.pcp.message-v2 :as m2]
44
[puppetlabs.pcp.protocol :as p]
55
[puppetlabs.pcp.broker.util :refer [update-when assoc-when ensure-vec]]
6-
[clojure.set :refer [rename-keys intersection]]
6+
[clojure.set :refer [rename-keys]]
77
[schema.core :as s]))
88

99
;; Allow an extra multicast-message parameter for flagging multicast messages.

‎src/puppetlabs/pcp/broker/service.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
controller-allowlist
8080
controller-disconnection-ms))
8181
(core/start broker)
82-
(if-let [filesystem-watcher-service (maybe-get-service this :FilesystemWatchService)]
82+
(when-let [filesystem-watcher-service (maybe-get-service this :FilesystemWatchService)]
8383
(let [watcher (watch-protocol/create-watcher filesystem-watcher-service {:recursive false})]
8484
(core/watch-crl watcher broker ssl-context-factory)))
8585
(sl/maplog :info {:type :broker-started :brokername broker-name}

‎src/puppetlabs/pcp/broker/shared.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns puppetlabs.pcp.broker.shared
22
(:require [metrics.gauges :as gauges]
33
[puppetlabs.trapperkeeper.services.websocket-session :as websocket-session]
4-
[puppetlabs.pcp.broker.connection :as connection :refer [Codec]]
4+
[puppetlabs.pcp.broker.connection :as connection]
55
[puppetlabs.pcp.broker.websocket]
66
[puppetlabs.pcp.broker.message :as message :refer [Message multicast-message?]]
77
[puppetlabs.pcp.client :as pcp-client]
@@ -69,7 +69,7 @@
6969
([broker :- Broker uri :- p/Uri timeout :- s/Int]
7070
(when-let [controller (get @(:controllers broker) uri)]
7171
(pcp-client/wait-for-connection (:websocket controller) timeout)
72-
(if (pcp-client/connected? (:websocket controller))
72+
(when (pcp-client/connected? (:websocket controller))
7373
controller))))
7474

7575
(s/defn build-and-register-metrics :- {s/Keyword Object}

‎src/puppetlabs/pcp/broker/util.clj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
(ns puppetlabs.pcp.broker.util
2-
(:require [schema.core :as s]))
2+
(:require
3+
[clojure.string :as str]
4+
[schema.core :as s]))
35

46
(defn update-cond
57
"Works like update, but only if pred is satisfied"
@@ -31,6 +33,6 @@
3133
(if (vector? v) v (vector v)))
3234

3335
(s/defn hexdump :- s/Str
34-
[data :- (s/either bytes s/Str)]
36+
[data :- (s/conditional bytes? bytes string? s/Str)]
3537
(let [bytes (if (string? data) (.getBytes data) data)]
36-
(clojure.string/join " " (map #(format "%02X" %) bytes))))
38+
(str/join " " (map #(format "%02X" %) bytes))))

‎src/puppetlabs/pcp/broker/websocket.clj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(ns puppetlabs.pcp.broker.websocket
22
(:require [clojure.tools.logging :as log]
33
[puppetlabs.trapperkeeper.services.websocket-session :as websocket-session]
4-
[puppetlabs.kitchensink.core :as ks]
5-
[puppetlabs.pcp.client :as pcp-client])
4+
[puppetlabs.pcp.client :as pcp-client]
5+
[puppetlabs.ssl-utils.core])
66
(:import (puppetlabs.pcp.client Client)
77
(java.net InetSocketAddress InetAddress)
88
(org.eclipse.jetty.websocket.api WebSocketAdapter)))
@@ -14,12 +14,12 @@
1414
(extend-protocol websocket-session/WebSocketProtocol
1515
Client
1616
(send! [c msg] (pcp-client/send! c msg))
17-
(close! [c code msg] (pcp-client/close c))
17+
(close! [c _code _msg] (pcp-client/close c))
1818
(remote-addr [c] (-> c :websocket-client (.getOpenSessions) first (.getRemoteAddress)))
19-
(ssl? [c] true)
20-
(peer-certs [c] nil)
21-
(request-path [c] "/server")
22-
(idle-timeout! [c timeout] nil)
19+
(ssl? [_c] true)
20+
(peer-certs [_c] nil)
21+
(request-path [_c] "/server")
22+
(idle-timeout! [_c _timeout] nil)
2323
(connected? [c] (pcp-client/connected? c)))
2424

2525
(defprotocol WebsocketInterface

0 commit comments

Comments
 (0)