CMR-9776: Resolve linter errors & warnings in common-app-lib; add lin…

…ting config

.clj-kondo/config.edn

@@ -0,0 +1,10 @@
+{:skip-comments true
+ ;; no linting for all dev/user.clj namespaces
+ :config-in-ns {user {:ignore true}}
+ ;; CMR custom macros
+ :lint-as {cmr.common.config/defconfig clojure.core/def
+           cmr.common.jobs/defjob clojure.core/defn
+           cmr.common.jobs/def-stateful-job clojure.core/defn
+           cmr.common.util/are3 clj-kondo.lint-as/def-catch-all}
+ ;; dynamically generated functions/vars
+ :linters {:unresolved-var {:exclude [digest/md5 digest/sha-1]}}}

.clj-kondo/rewrite-clj/rewrite-clj/config.edn

@@ -0,0 +1,5 @@
+{:lint-as
+ {rewrite-clj.zip/subedit-> clojure.core/->
+  rewrite-clj.zip/subedit->> clojure.core/->>
+  rewrite-clj.zip/edit-> clojure.core/->
+  rewrite-clj.zip/edit->> clojure.core/->>}}

.gitignore

@@ -18,7 +18,6 @@ browse-scaler/src/node_modules
 .cider-repl-history
 **/ignore.*
 .calva*
-*.clj-kondo
 *.ruby-version
 .cljfmt.edn
 dev-system/local.edn

common-app-lib/src/cmr/common_app/api/enabled.clj

@@ -7,10 +7,8 @@
   anything from writing on the NGAP side while we are transitioning."
   (:require
    [cheshire.core :as json]
-   [cmr.common.api.context :as context]
    [cmr.transmit.cache.consistent-cache :as consistent-cache]
    [cmr.common.cache :as cache]
-   [cmr.common.cache.in-memory-cache :as mem-cache]
    [cmr.common.cache.single-thread-lookup-cache :as stl-cache]
    [cmr.common.config :refer [defconfig]]
    [cmr.common.log :refer [error warn]]

common-app-lib/src/cmr/common_app/api/health.clj

@@ -9,7 +9,7 @@
    [cmr.common.config :refer [defconfig]]
    [cmr.common.log :refer [warn]]
    [cmr.common.mime-types :as mt]
-   [compojure.core :refer :all]))
+   [compojure.core :refer [GET OPTIONS context]]))
 
 (def health-cache-key
   "The key used to store the health cache in the system cache map."
@@ -56,6 +56,6 @@
   working as expected."
   [health-fn]
   (context "/health" []
-    (OPTIONS "/" req (common-routes/options-response))
+    (OPTIONS "/" _req (common-routes/options-response))
     (GET "/" {:keys [request-context]}
       (get-app-health request-context health-fn))))

common-app-lib/src/cmr/common_app/api/launchpad_token_validation.clj

@@ -1,9 +1,6 @@
 (ns cmr.common-app.api.launchpad-token-validation
   "Validate Launchpad token."
   (:require
-   [cheshire.core :as json]
-   [clojure.data.codec.base64 :as base64]
-   [clojure.string :as string]
    [cmr.common-app.config :as config]
    [cmr.common.services.errors :as errors]
    [cmr.common.util :as common-util]

common-app-lib/src/cmr/common_app/api/request_context_user_augmenter.clj

@@ -12,7 +12,6 @@
    [cheshire.core :as json]
    [cmr.common.cache :as cache]
    [cmr.common.cache.in-memory-cache :as mem-cache]
-   [cmr.common.log :refer (info)]
    [cmr.common.services.errors :as errors]
    [cmr.common.util :as util]
    [cmr.transmit.access-control :as access-control]
@@ -85,7 +84,7 @@
   It expects the request context is already associated with the request."
   [handler]
   (fn [request]
-    (let [{:keys [request-context]} request]
+    (let [{:keys [_request-context]} request]
       (-> request
           (update-in [:request-context] add-user-id-and-sids-to-context)
           (handler)))))

common-app-lib/src/cmr/common_app/api/request_logger.clj

@@ -8,18 +8,18 @@
    [clojure.string :as string]
    [cmr.common-app.config :as config]
    [cmr.common.date-time-parser :as dtp]
-   [cmr.common.log :refer [debug info warn error report]]
+   [cmr.common.log :refer [report]]
    [cmr.common.util :as util]
    [cmr.common.time-keeper :as tk]
    [digest :as digest]
    [ring.middleware.params :as params]
    [ring.util.codec :as codec]))
 
 (defn- request->uri
-  [request]
   "Reconstruct a url that a request client may have asked for (assuming port
    number was given). Special care is taken to scrub token from the URL parameter
    list if provided at 'token'."
+  [request]
   ;; Another filter may have already parsed the parameters found at :query-params,
   ;; use that to save time, otherwise do it ourself from :query-string
   (let [raw-query (or (:query-params request) (codec/form-encode (:query-string request)))

common-app-lib/src/cmr/common_app/api/routes.clj

@@ -7,12 +7,10 @@
    [cmr.common.cache :as cache]
    [cmr.common.hash-cache :as hcache]
    [cmr.common.jobs :as jobs]
-   [cmr.common.log :refer [debug info warn error]]
    [cmr.common.mime-types :as mt]
    [cmr.common.xml :as cx]
    [compojure.core :refer [context GET POST]]
    [ring.middleware.json :as ring-json]
-   [ring.util.codec :as rc]
    [ring.util.response :as ring-resp]))
 
 (def RESPONSE_REQUEST_ID_HEADER
@@ -107,15 +105,15 @@
   "Create routes for the cache querying/management api"
   (context "/caches" []
     ;; Get the list of caches
-    (GET "/" {:keys [params request-context headers]}
+    (GET "/" {:keys [_params request-context _headers]}
       (acl/verify-ingest-management-permission request-context :read)
       (let [caches (map name (keys (get-in request-context [:system :caches])))]
         {:status 200
          :body (json/generate-string caches)}))
     ;; Get the keys for the given cache
-    (GET "/:cache-name" {{:keys [cache-name] :as params} :params
+    (GET "/:cache-name" {{:keys [cache-name] :as _params} :params
                          request-context :request-context
-                         headers :headers}
+                         _headers :headers}
       (acl/verify-ingest-management-permission request-context :read)
       (let [cache (cache/context->cache request-context (keyword cache-name))]
         (when cache
@@ -126,9 +124,9 @@
              :body (json/generate-string result)}))))
 
     ;; Get the value for the given key for the given cache
-    (GET "/:cache-name/:cache-key" {{:keys [cache-name cache-key] :as params} :params
+    (GET "/:cache-name/:cache-key" {{:keys [cache-name cache-key] :as _params} :params
                                     request-context :request-context
-                                    headers :headers}
+                                    _headers :headers}
       (acl/verify-ingest-management-permission request-context :read)
       (let [cache-key (keyword cache-key)
             cache (cache/context->cache request-context (keyword cache-name))
@@ -143,7 +141,7 @@
             :body (json/generate-string
                    {:error (format "missing key [%s] for cache [%s]" cache-key cache-name)})})))
 
-    (POST "/clear-cache" {:keys [request-context params headers]}
+    (POST "/clear-cache" {:keys [request-context _params _headers]}
       (acl/verify-ingest-management-permission request-context :update)
       (cache/reset-caches request-context)
       (hcache/reset-caches request-context)
@@ -157,19 +155,19 @@
   ([additional-job-routes]
    (context "/jobs" []
      ;; Pause all jobs
-     (POST "/pause" {:keys [request-context params headers]}
+     (POST "/pause" {:keys [request-context _params _headers]}
        (acl/verify-ingest-management-permission request-context :update)
        (jobs/pause-jobs (get-in request-context [:system :scheduler]))
        {:status 204})
 
      ;; Resume all jobs
-     (POST "/resume" {:keys [request-context params headers]}
+     (POST "/resume" {:keys [request-context _params _headers]}
        (acl/verify-ingest-management-permission request-context :update)
        (jobs/resume-jobs (get-in request-context [:system :scheduler]))
        {:status 204})
 
      ;; Retrieve status of jobs - whether they are paused or active
-     (GET "/status" {:keys [request-context params headers]}
+     (GET "/status" {:keys [request-context _params _headers]}
        (acl/verify-ingest-management-permission request-context :update)
        (let [paused? (jobs/paused? (get-in request-context [:system :scheduler]))]
          {:status 200
@@ -245,7 +243,7 @@
   "Adds a number of security related response headers."
   [handler]
   (fn [{context :request-context :as request}]
-    (if-let [request-id (cxt/context->request-id context)]
+    (if-let [_request-id (cxt/context->request-id context)]
       (-> request
           (handler)
           (assoc-in [:headers RESPONSE_STRICT_TRANSPORT_SECURITY_HEADER] "max-age=31536000")

common-app-lib/src/cmr/common_app/app_events.clj

@@ -54,7 +54,7 @@
   "Add a shutdown hook to call the CMR app stop command found in most if not all
    CMR microservices. Caller must supply a function that calls the application's
    stop function such as: #(cmr.search.system/stop system)"
-  [app-name stop-thread]
+  [_app-name stop-thread]
   (.addShutdownHook (Runtime/getRuntime) (new Thread stop-thread)))
 
 (defn dump-on-exit-hook
@@ -70,5 +70,5 @@
 (comment
   ;; use these to create a memory file locally for use in Visual VM
   (config/set-dump-diagnostics-on-exit-to! "/tmp/dump-auto.txt")
-  (dump-heap "/tmp/dump.txt" true)
-  (dump-heap "/tmp/dump.hprof" false))
+  (dump-heap "appname1" "/tmp/dump.txt" true)
+  (dump-heap "appname2" "/tmp/dump.hprof" false))

common-app-lib/src/cmr/common_app/data/collections_for_gran_acls_by_concept_id_cache.clj

@@ -119,8 +119,8 @@
      collection-found))
 
 (defn get-collection-for-gran-acls
-  [context coll-concept-id]
   "Gets a single collection from the cache by concept id. If collection is not found in cache, but exists in elastic, it will add it to the cache and will return the found collection."
+  [context coll-concept-id]
   (let [coll-by-concept-id-cache (hash-cache/context->cache context coll-by-concept-id-cache-key)
         collection (hash-cache/get-value coll-by-concept-id-cache
                                          coll-by-concept-id-cache-key
@@ -132,7 +132,7 @@
       (time-strs->clj-times collection))))
 
 (defjob RefreshCollectionsCacheForGranuleAclsJob
-        [ctx system]
+        [_ctx system]
         (refresh-entire-cache {:system system}))
 
 (defn refresh-collections-cache-for-granule-acls-job

common-app-lib/src/cmr/common_app/data/humanizer_alias_cache.clj

@@ -15,7 +15,7 @@
    [cmr.common.config :refer [defconfig]]
    [cmr.common.hash-cache :as hash-cache]
    [cmr.common.jobs :refer [defjob]]
-   [cmr.common.log :as log :refer (debug info warn error)]
+   [cmr.common.log :as log :refer (info warn)]
    [cmr.common.redis-log-util :as rl-util]
    [cmr.common.util :as util]
    [cmr.redis-utils.config :as redis-config]
@@ -116,7 +116,7 @@
   :type Long})
 
 (defjob RefreshHumanizerAliasCache
-  [ctx system]
+  [_ctx system]
   (refresh-entire-cache {:system system}))
 
 (defn refresh-humanizer-alias-cache-job

common-app-lib/src/cmr/common_app/humanizer.clj

@@ -27,16 +27,16 @@
   "Map of humanizer JSON type values to functions which take a field value and
   humanizer configuration and return a transformed field value. The functions
   can assume that the humanizer should be applied to the value."
-  (fn [humanizer value]
+  (fn [humanizer _value]
     (:type humanizer)))
 
 (defmethod to-human "trim_whitespace"
-  [humanizer value]
+  [_humanizer value]
   (assoc value
          :value (str/trim (str/replace (:value value) #"\s+" " "))))
 
 (defmethod to-human "capitalize"
-  [humanizer value]
+  [_humanizer value]
   (assoc value
          :value (->> (str/split (:value value) #"\b")
                      (map str/capitalize)
@@ -48,7 +48,7 @@
          :value (:replacement_value humanizer)))
 
 (defmethod to-human "ignore"
-  [humanizer value]
+  [_humanizer _value]
   nil)
 
 (defmethod to-human "priority"

common-app-lib/src/cmr/common_app/services/jvm_info.clj

@@ -3,7 +3,7 @@
   (:require
    [cmr.common.config :refer [defconfig]]
    [cmr.common.jobs :refer [defjob]]
-   [cmr.common.log :refer [debug warn info error]])
+   [cmr.common.log :refer [info]])
   (:import
    (java.lang Runtime)))
 

common-app-lib/src/cmr/common_app/services/kms_fetcher.clj

@@ -11,15 +11,15 @@
                      {...}]}
          :providers [...]}"
   (:require
+   [clojure.string :as string]
    [cmr.common-app.services.kms-lookup :as kms-lookup]
    [cmr.common.cache :as cache]
    [cmr.common.log :refer [error]]
    [cmr.common.redis-log-util :as rl-util]
    [cmr.common.util :as util]
    [cmr.redis-utils.config :as redis-config]
    [cmr.redis-utils.redis-cache :as redis-cache]
-   [cmr.transmit.kms :as kms])
-  (:import (clojure.lang ExceptionInfo)))
+   [cmr.transmit.kms :as kms]))
 
 (def nested-fields-mappings
   "Mapping from field name to the list of subfield names in order from the top of the hierarchy to
@@ -77,7 +77,7 @@
                   [keyword-scheme keyword-scheme-value]
                   [keyword-scheme (get kms-cache-value keyword-scheme)])))))
     (catch Exception e
-      (if (clojure.string/includes? (ex-message e) "Carmine connection error")
+      (if (string/includes? (ex-message e) "Carmine connection error")
         (error "fetch-gcmd-keywords-map found redis carmine exception. Will return nil result." e)
         (throw e)))))
 

common-app-lib/src/cmr/common_app/services/kms_lookup.clj

@@ -28,8 +28,7 @@
    [cmr.common.util :as util]
    [cmr.redis-utils.config :as redis-config]
    [cmr.redis-utils.redis-hash-cache :as rhcache]
-   [cmr.transmit.kms :as kms])
-  (:import (clojure.lang ExceptionInfo)))
+   [cmr.transmit.kms :as kms]))
 
 (def kms-short-name-cache-key
   "The key used to store the data generated from KMS into a short name index cache

common-app-lib/src/cmr/common_app/services/search.clj

@@ -2,13 +2,10 @@
   "This contains common code for implementing search capabilities in a CMR application"
   (:require
    [cmr.common.util :as u]
-   [cmr.common.cache.fallback-cache :as fallback-cache]
-   [cmr.common.cache.single-thread-lookup-cache :as stl-cache]
    [cmr.common.config :as cfg :refer [defconfig]]
-   [cmr.common.log :refer (debug info warn error)]
+   [cmr.common.log :refer (info)]
    [cmr.common.services.errors :as errors]
    [cmr.common.cache :as cache]
-   [cmr.common.cache.in-memory-cache :as mem-cache]
    [cmr.common-app.services.search.query-validation :as qv]
    [cmr.common-app.services.search.query-execution :as qe]
    [cmr.common-app.services.search.query-model :as qm]
@@ -58,20 +55,20 @@
 (defn validate-query
   "Validates a query model. Throws an exception to return to user with errors.
   Returns the query model if validation is successful so it can be chained with other calls."
-  [context query]
+  [_context query]
   (if-let [errors (seq (qv/validate query))]
     (errors/throw-service-errors :bad-request errors)
     query))
 
 (defmulti search-results->response
   "Converts query search results into a string response."
-  (fn [context query results]
+  (fn [_context query _results]
     [(:concept-type query) (qm/base-result-format query)]))
 
 (defmulti single-result->response
   "Returns a string representation of a single concept in the format
   specified in the query."
-  (fn [context query results]
+  (fn [_context query _results]
     [(:concept-type query) (qm/base-result-format query)]))
 
 (defn- add-scroll-results-to-cache

common-app-lib/src/cmr/common_app/services/search/acl_results_handler_helper.clj

@@ -32,7 +32,7 @@
 
 (defmulti parse-elastic-item
   "Parses the Elasticsearch response into a map that can be used to enforce ACLs."
-  (fn [concept-type elastic-result]
+  (fn [concept-type _elastic-result]
     concept-type))
 
 (defmethod parse-elastic-item :collection

common-app-lib/src/cmr/common_app/services/search/complex_to_simple.clj

@@ -1,5 +1,4 @@
-(ns cmr.common-app.services.search.complex-to-simple
-  (:require [cmr.common-app.services.search.query-model :as cqm]))
+(ns cmr.common-app.services.search.complex-to-simple)
 
 (defprotocol ComplexQueryToSimple
   "Defines a function to convert a complex / high level query/condition into simpler ones that
@@ -34,6 +33,6 @@
   ;; catch all
   java.lang.Object
   (reduce-query-condition
-    [this context]
+    [this _context]
     ;; do nothing
     this))