wip

threatgrid · Aug 30, 2024 · 78a033e · 78a033e
1 parent 8dc758b
commit 78a033e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 307 deletions.
diff --git a/src/ctia/properties.clj b/src/ctia/properties.clj
@@ -44,6 +44,7 @@
    (str prefix store ".update-mappings")  s/Bool
    (str prefix store ".update-settings")  s/Bool
    (str prefix store ".refresh-mappings") s/Bool
+   (str prefix store ".migrate-to-ilm") s/Bool
    (str prefix store ".default-sort") s/Str
    (str prefix store ".auth.type") AuthParamsType
    (str prefix store ".auth.params.id") s/Str

diff --git a/src/ctia/stores/es/init.clj b/src/ctia/stores/es/init.clj
@@ -113,11 +113,6 @@
   (index/create-index-template! conn index (:template config))
   (log/infof "updated template: %s" index))
 
-(s/defn upsert-template!
-  [{:keys [conn index config props]} :- ESConnState]
-  (index/create-template! conn index config)
-  (log/infof "updated template: %s" index))
-
 (defn system-exit-error
   []
   (log/error (str "CTIA tried to start with an invalid configuration: \n"
@@ -211,7 +206,7 @@
                                     {:update-mappings! update-mappings!
                                      :update-settings! update-settings!
                                      :refresh-mappings! refresh-mappings!
-                                     :upsert-template! upsert-template!
+                                     :upsert-template! upsert-index-template!
                                      :update-ilm-settings! update-ilm-settings!}))
   ([{{update-mappings?  :update-mappings
       update-settings?  :update-settings
@@ -232,7 +227,7 @@
      ;; if it fails a System/exit is triggered because
      ;; this means that the mapping in invalid and thus
      ;; must not be propagated to the template that would accept it
-     (upsert-template! conn-state)
+     (upsert-index-template! conn-state)
      (when refresh-mappings?
        (refresh-mappings! conn-state)))
    (when update-settings?

diff --git a/src/ctia/task/settings.clj b/src/ctia/task/settings.clj
diff --git a/src/ctia/task/update_mapping.clj b/src/ctia/task/update_mapping.clj
diff --git a/test/ctia/stores/es/init_test.clj b/test/ctia/stores/es/init_test.clj
@@ -394,7 +394,8 @@
          services)
         existing-indices (sut/get-existing-indices conn index)]
     (when-not (seq existing-indices)
-      (sut/upsert-template! conn-state))
+      (index/create-template! conn index config)
+      (log/infof "updated template: %s" index))
     (when (empty? existing-indices)
       ;;https://github.com/elastic/elasticsearch/pull/34499
       (index/create! conn

diff --git a/test/ctia/task/settings_test.clj b/test/ctia/task/settings_test.clj
diff --git a/test/ctia/task/update_mapping_test.clj b/test/ctia/task/update_mapping_test.clj