docker: allows elasticsearch8 tests to delete with wildcards

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Dec 29, 2023 · 6961ef8 · 6961ef8
1 parent ee5e762
commit 6961ef8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml b/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml
@@ -19,3 +19,6 @@ xpack.security.enabled: false
 xpack.ml.enabled: false
 cluster.initial_master_nodes:
   - zipkin-elasticsearch
+# This is a test image, so we are not afraid to delete all indices. Avoids:
+#   Wildcard expressions or all indices are not allowed
+action.destructive_requires_name: false
diff --git a/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchStorage.java b/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchStorage.java
@@ -268,6 +268,8 @@ public void clear() throws IOException {
     Set<String> toClear = new LinkedHashSet<>();
     toClear.add(indexNameFormatter().formatType(TYPE_SPAN));
     toClear.add(indexNameFormatter().formatType(TYPE_DEPENDENCY));
+    // Note: Elasticsearch 8.x requires this config to clear with wildcards:
+    // action.destructive_requires_name: false
     for (String index : toClear) clear(index);
   }