disallow delete indices, compat with es tests

quickwit-oss · Feb 27, 2024 · e8d0a2b · e8d0a2b
1 parent f07ec1a
commit e8d0a2b
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 10 deletions.
diff --git a/quickwit/quickwit-index-management/src/index.rs b/quickwit/quickwit-index-management/src/index.rs
@@ -235,7 +235,7 @@ impl IndexService {
         let list_indexes_metadatas_request = ListIndexesMetadataRequest {
             index_id_patterns: index_id_patterns.to_owned(),
         };
-        // disallow index_id patterns containing *
+        // disallow index_id patterns
         for index_id_pattern in &index_id_patterns {
             if index_id_pattern.contains('*') {
                 return Err(IndexServiceError::Metastore(
@@ -244,6 +244,13 @@ impl IndexService {
                     },
                 ));
             }
+            if index_id_pattern == "_all" {
+                return Err(IndexServiceError::Metastore(
+                    MetastoreError::InvalidArgument {
+                        message: format!("index_id pattern _all not supported"),
+                    },
+                ));
+            }
         }
 
         let mut metastore = self.metastore.clone();

diff --git a/quickwit/rest-api-tests/scenarii/es_compatibility/0024-delete_indices.yaml b/quickwit/rest-api-tests/scenarii/es_compatibility/0024-delete_indices.yaml
@@ -1,4 +1,6 @@
----
+--- #Create indices quickwit
+engines:
+  - quickwit
 method: POST
 api_root: http://localhost:7280/api/v1/
 endpoint: indexes/
@@ -9,6 +11,8 @@ json:
     mode: dynamic
 sleep_after: 3
 ---
+engines:
+  - quickwit
 method: POST
 api_root: http://localhost:7280/api/v1/
 endpoint: indexes/
@@ -18,26 +22,64 @@ json:
   doc_mapping:
     mode: dynamic
 sleep_after: 3
+--- # create indices elasticsearch
+engines:
+  - elasticsearch
+method: PUT
+endpoint: test_index1
+json: {
+  "mappings": {
+    "properties": {
+      "created_at": {
+        "type": "date",
+        "store": true
+      }
+    }
+  }
+}
+--- # create indices elasticsearch
+engines:
+  - elasticsearch
+method: PUT
+endpoint: test_index2
+json: {
+  "mappings": {
+    "properties": {
+      "created_at": {
+        "type": "date",
+        "store": true
+      }
+    }
+  }
+}
 ---
+engines:
+  - quickwit
+  - elasticsearch
 method: DELETE
-api_root: http://localhost:7280/api/v1/
-endpoint: _elastic/test_index1,does_not_exist
+endpoint: test_index1,does_not_exist
 status_code: 404
 --- # delete partially matching with ignore_unavailable
+engines:
+  - quickwit
+  - elasticsearch
 method: DELETE
-api_root: http://localhost:7280/api/v1/
-endpoint: _elastic/test_index1,does_not_exist
+endpoint: test_index1,does_not_exist
 status_code: 200
 params:
   ignore_unavailable: "true"
 --- # already deleted
+engines:
+  - quickwit
+  - elasticsearch
 method: DELETE 
-api_root: http://localhost:7280/api/v1/
-endpoint: _elastic/test_index1
+endpoint: test_index1
 status_code: 404
 ---
+engines:
+  - quickwit
+  - elasticsearch
 method: DELETE
-api_root: http://localhost:7280/api/v1/
-endpoint: _elastic/test_index2
+endpoint: test_index2
 status_code: 200
 
diff --git a/quickwit/rest-api-tests/scenarii/es_compatibility/_teardown.elasticsearch.yaml b/quickwit/rest-api-tests/scenarii/es_compatibility/_teardown.elasticsearch.yaml
@@ -4,3 +4,12 @@ endpoint: gharchive
 ---
 method: DELETE
 endpoint: empty_index
+---
+method: DELETE
+endpoint: test_index1
+status_code: null
+---
+method: DELETE
+endpoint: test_index2
+status_code: null
+