Skip to content

prep for clj-kondo bump to 2026.07.24 #437

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

Merged
corporate-gadfly merged 1 commit into from
Jul 27, 2026
Merged

prep for clj-kondo bump to 2026.07.24 #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/puppetlabs/puppetdb/query/paging.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
was successful; throws an exception with a useful error message otherwise."
[order_by]
(if-let [bad-order-by (some
(fn [x] (when (keys (dissoc x :field :order)) x))
(fn [x] (when (seq (dissoc x :field :order)) x))
order_by)]
(throw (bad-query-ex
(tru "Illegal value ''{0}'' in :order_by; unknown key ''{1}''."
Expand Down
2 changes: 1 addition & 1 deletion src/puppetlabs/puppetdb/scf/storage.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,7 +1980,7 @@
(s/defn add-report! :- processing-status-schema
"Add a report and all of the associated events to the database."
([report received-timestamp db conn-status]
(add-report! report received-timestamp db conn-status true))
(add-report! report received-timestamp db conn-status nil))
([{:keys [certname producer_timestamp] :as report} :- reports/report-wireformat-schema
received-timestamp :- pls/Timestamp
db conn-status
Expand Down
1 change: 1 addition & 0 deletions test/puppetlabs/puppetdb/catalogs_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
(is (thrown? AssertionError (resource-spec-to-map "Class[Foo")))
(is (thrown? AssertionError (resource-spec-to-map "ClassFoo]")))
(is (thrown? AssertionError (resource-spec-to-map "ClassFoo")))
#_{:clj-kondo/ignore [:type-mismatch]}
(is (thrown? AssertionError (resource-spec-to-map nil))))

(testing "should correctly parse well-formed input"
Expand Down
3 changes: 3 additions & 0 deletions test/puppetlabs/puppetdb/random_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

(testing "should only accept a positive integer"
(is (thrown? IllegalArgumentException (random-string -1)))
#_{:clj-kondo/ignore [:type-mismatch]}
(is (thrown? ClassCastException (random-string "asdf")))))

(deftest test-random-string-alpha
Expand All @@ -43,6 +44,7 @@

(testing "should only accept a positive integer"
(is (thrown? IllegalArgumentException (random-string-alpha -1)))
#_{:clj-kondo/ignore [:type-mismatch]}
(is (thrown? ClassCastException (random-string-alpha "asdf")))))

(deftest test-random-ascii-string
Expand All @@ -56,6 +58,7 @@

(testing "should only accept a positive integer"
(is (thrown? IllegalArgumentException (random-ascii-string -1)))
#_{:clj-kondo/ignore [:type-mismatch]}
(is (thrown? ClassCastException (random-ascii-string "asdf")))))

(deftest test-random-bool
Expand Down
2 changes: 1 addition & 1 deletion test/puppetlabs/puppetdb/testutils/services.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
"Returns the number of messages discarded from the command queue by
the current PuppetDB instance."
[]
(-> (pdb-metrics-url "/mbeans/puppetlabs.puppetdb.command:type=global,name=discarded")
(-> (metrics-url-str "/mbeans/puppetlabs.puppetdb.command:type=global,name=discarded")
get-or-throw
(get-in [:body :Count])))

Expand Down
Loading