CMR-11116: pr nitpicks

Author: daniel-zamora

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

@@ -95,12 +95,37 @@
     (is (= 2 (cache/get-value cache :foo always-fail)))
     (is (= 2 @counter))))
 
+(defn- evict-test
+  "Checks that evicting a key removes it from the cache"
+  [cache]
+  (let [lookup-called (atom false)
+        lookup-fn #(do (reset! lookup-called true) "new-value")]
+    ;; Set a value
+    (cache/set-value cache :foo "initial-value")
+    (is (= "initial-value" (cache/get-value cache :foo)))
+
+    ;; Evict the key
+    (cache/evict cache :foo)
+
+    ;; Value should be gone, lookup function should be called
+    (is (= "new-value" (cache/get-value cache :foo lookup-fn)))
+    (is @lookup-called "Lookup function should have been called after evict"))
+
+  ;; Test that evict only removes the specified key
+  (cache/reset cache)
+  (cache/set-value cache :foo "foo-value")
+  (cache/set-value cache :bar "bar-value")
+  (cache/evict cache :foo)
+  (is (nil? (cache/get-value cache :foo)))
+  (is (= "bar-value" (cache/get-value cache :bar))))
+
 (def ^:private cache-test-fns
   "Defines the minimum set of test functions that check a cache implementation"
   [#'value-type-support
    #'key-type-support
    #'get-value-with-lookup-fn-test
-   #'clear-cache-test])
+   #'clear-cache-test
+   #'evict-test])
 
 (defn- get-cache-test-fns
   "Returns the functions to test for verifying the cache. Not all caches will delete all values

redis-utils-lib/test/cmr/redis_utils/test/test_redis_cache.clj

@@ -47,6 +47,31 @@
       (is (= -1
              (wcar* s-key true (redis-config/redis-conn-opts) (carmine/ttl s-key)))))))
 
+(deftest test-redis-cache-evict
+  (testing "Evict removes key from Redis cache"
+    (let [rcache (redis-cache/create-redis-cache {:read-connection (redis-config/redis-read-conn-opts)
+                                                  :primary-connection (redis-config/redis-conn-opts)})
+          lookup-called (atom false)
+          lookup-fn (fn [] (reset! lookup-called true) "new-value")]
+      (cache/set-value rcache "test-key" "initial-value")
+      (is (= "initial-value" (cache/get-value rcache "test-key")))
+
+      (cache/evict rcache "test-key")
+
+      (is (= "new-value" (cache/get-value rcache "test-key" lookup-fn)))
+      (is @lookup-called "Lookup function should have been called after evict")))
+
+  (testing "Evict only removes specified key"
+    (let [rcache (redis-cache/create-redis-cache {:read-connection (redis-config/redis-read-conn-opts)
+                                                  :primary-connection (redis-config/redis-conn-opts)})]
+      (cache/set-value rcache "foo" "foo-value")
+      (cache/set-value rcache "bar" "bar-value")
+
+      (cache/evict rcache "foo")
+
+      (is (nil? (cache/get-value rcache "foo")))
+      (is (= "bar-value" (cache/get-value rcache "bar"))))))
+
 (deftest test-get-keys
   (wcar* "get-keys-pattern#-test1" false (redis-config/redis-conn-opts) (carmine/set "get-keys-pattern#-test1" "test1"))
   (wcar* "get-keys-pattern#-test2" false (redis-config/redis-conn-opts) (carmine/set "get-keys-pattern#-test2" "test2"))

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 (DigestUtils/sha256Hex launchpad-token)]
+          token-key (keyword (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"
-                      token-key
+                      (name 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"
-                                                   token-key
+                                                   (name 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"
-                                                      token-key
+                                                      (name 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 (DigestUtils/sha256Hex token)]
+          token-key (keyword (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"
-                          token-key
+                          (name token-key)
                           transmit-config/mock-echo-system-token
                           200)]
         (is (false? (:valid cached-value)))

transmit-lib/src/cmr/transmit/cache/consistent_cache.clj

@@ -119,6 +119,11 @@
     (c/set-value memory-cache key value)
     (c/set-value hash-cache (key->hash-cache-key key) (hash value)))
 
+  (evict
+    [_this key]
+    (c/evict memory-cache key)
+    (c/evict hash-cache (key->hash-cache-key key)))
+
   (cache-size
    [_]
    (+ (c/cache-size memory-cache)

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 (DigestUtils/sha256Hex token)
+      (let [cache-key (keyword (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)