CMR-11116: pr nitpicks

Author: daniel-zamora

common-lib/src/cmr/common/cache/fallback_cache.clj

@@ -77,6 +77,11 @@
     (cache/set-value backup-cache key value)
     (cache/set-value primary-cache key value))
 
+  (evict
+    [_this key]
+    (cache/evict primary-cache key)
+    (cache/evict backup-cache key))
+
   (cache-size
    [_]
    (+ (cache/cache-size primary-cache)

common-lib/src/cmr/common/cache/single_thread_lookup_cache.clj

@@ -130,6 +130,11 @@
     (when (cache/simple-cache? delegate-cache)
       (cache/set-value delegate-cache cache-key value)))
 
+   (evict
+    [_this cache-key]
+    (when (cache/simple-cache? delegate-cache)
+      (cache/evict delegate-cache cache-key)))
+
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    life/Lifecycle
    (start

mock-echo-app/src/cmr/mock_echo/api/urs.clj

@@ -66,11 +66,12 @@
       (let [expires-in 1600
             validation-info (get @launchpad-token-validations token)]
         (if validation-info
-          (let [elapsed-seconds (t/in-seconds (t/interval (:first-validated-at validation-info) (time-keeper/now)))]
-            (if (>= elapsed-seconds expires-in)
+          (let [stored-expires-in (:expires-in validation-info)
+                elapsed-seconds (t/in-seconds (t/interval (:first-validated-at validation-info) (time-keeper/now)))]
+            (if (>= elapsed-seconds stored-expires-in)
               {:status 401 :body {:error (format "Launchpad token (partially redacted) [%s] has expired."
                                                   (common-util/scrub-token token))}}
-              {:status 200 :body {:uid "user1" :lp_token_expires_in (- expires-in elapsed-seconds)}}))
+              {:status 200 :body {:uid "user1" :lp_token_expires_in (- stored-expires-in elapsed-seconds)}}))
           (do
             (swap! launchpad-token-validations assoc token {:first-validated-at (time-keeper/now) :expires-in expires-in})
             {:status 200 :body {:uid "user1" :lp_token_expires_in expires-in}})))

redis-utils-lib/src/cmr/redis_utils/redis_cache.clj

@@ -85,6 +85,11 @@
       (wcar* s-key false primary-connection (carmine/set s-key {:value value})
              (when ttl (carmine/expire s-key ttl)))))
 
+  (evict
+    [_this key]
+    (let [s-key (serialize key)]
+      (wcar* key false primary-connection (carmine/del s-key))))
+
   (cache-size
     [_]
     (reduce #(+ %1 (if-let [size (wcar* (serialize %2) true read-connection (carmine/memory-usage (serialize %2)))]

system-int-test/test/cmr/system_int_test/misc/launchpad_user_cache.clj

@@ -23,7 +23,7 @@
 (deftest launchpad-user-cache-test
   (testing "launchpad cache initial value"
     (let [launchpad-token (echo-util/login-with-launchpad-token (system/context) "user1")
-          token-key (keyword (DigestUtils/sha256Hex launchpad-token))]
+          token-key (DigestUtils/sha256Hex launchpad-token)]
       (is (empty? (cache-util/list-cache-keys (url/ingest-read-caches-url) "launchpad-user" transmit-config/mock-echo-system-token)))
       (let [concept (data-umm-c/collection-concept {})
             {:keys [concept-id revision-id]} (ingest/ingest-concept concept {:token launchpad-token})]
@@ -35,7 +35,7 @@
         (is (= (:uid (cache-util/get-cache-value
                       (url/ingest-read-caches-url)
                       "launchpad-user"
-                      (name token-key)
+                      token-key
                       transmit-config/mock-echo-system-token
                       200))
                "user1"))
@@ -52,7 +52,7 @@
           (let [expiration-time (:expiration-time (cache-util/get-cache-value
                                                    (url/ingest-read-caches-url)
                                                    "launchpad-user"
-                                                   (name token-key)
+                                                   token-key
                                                    transmit-config/mock-echo-system-token
                                                    200))]
             (ingest/ingest-concept concept {:token launchpad-token})
@@ -61,7 +61,7 @@
             (is (= expiration-time (:expiration-time (cache-util/get-cache-value
                                                       (url/ingest-read-caches-url)
                                                       "launchpad-user"
-                                                      (name token-key)
+                                                      token-key
                                                       transmit-config/mock-echo-system-token
                                                       200))))
             (testing "token cache value expires"
@@ -100,7 +100,7 @@
 (deftest non-transient-errors-are-cached-test
   (testing "Non-transient errors are cached for 5 minutes"
     (let [token "ABC-INV-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
-          token-key (keyword (DigestUtils/sha256Hex token))]
+          token-key (DigestUtils/sha256Hex token)]
       (let [resp (ingest/ingest-concept (data-umm-c/collection-concept {}) {:token token})]
         (is (= 401 (:status resp))))
 
@@ -109,7 +109,7 @@
       (let [cached-value (cache-util/get-cache-value
                           (url/ingest-read-caches-url)
                           "launchpad-user"
-                          (name token-key)
+                          token-key
                           transmit-config/mock-echo-system-token
                           200)]
         (is (false? (:valid cached-value)))

transmit-lib/src/cmr/transmit/launchpad_user_cache.clj

@@ -55,7 +55,7 @@
                                          :error-type error-type
                                          :expiration-time (t/plus (time-keeper/now) (t/minutes (transmit-config/invalid-token-timeout)))})))))]
     (if-let [cache (cache/context->cache context launchpad-user-cache-key)]
-      (let [cache-key (keyword (DigestUtils/sha256Hex token))
+      (let [cache-key (DigestUtils/sha256Hex token)
             token-info (cache/get-value cache cache-key get-launchpad-user-fn)]
         (if (t/before? (:expiration-time token-info) (time-keeper/now))
           ;; Cache entry expired (after 5 min for errors, or token lifetime for valid tokens)