fix utoipa test (#4525)

quickwit-oss · Feb 6, 2024 · 6c7c16e · 6c7c16e
1 parent 739d8cb
commit 6c7c16e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/quickwit/quickwit-config/src/index_template/mod.rs b/quickwit/quickwit-config/src/index_template/mod.rs
@@ -23,7 +23,7 @@ use anyhow::ensure;
 use quickwit_common::uri::Uri;
 use quickwit_proto::types::IndexId;
 use serde::{Deserialize, Serialize};
-pub use serialize::VersionedIndexTemplate;
+pub use serialize::{IndexTemplateV0_7, VersionedIndexTemplate};
 
 use crate::index_config::validate_index_config;
 use crate::{

diff --git a/quickwit/quickwit-config/src/index_template/serialize.rs b/quickwit/quickwit-config/src/index_template/serialize.rs
@@ -33,8 +33,11 @@ pub enum VersionedIndexTemplate {
 #[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(deny_unknown_fields)]
 pub struct IndexTemplateV0_7 {
+    #[schema(value_type = String)]
     pub template_id: IndexTemplateId,
+    #[schema(value_type = Vec<String>)]
     pub index_id_patterns: Vec<IndexIdPattern>,
+    #[schema(value_type = String)]
     #[serde(default)]
     pub index_root_uri: Option<Uri>,
     #[serde(default)]

diff --git a/quickwit/quickwit-config/src/lib.rs b/quickwit/quickwit-config/src/lib.rs
@@ -60,6 +60,7 @@ pub use source_config::{
 };
 use tracing::warn;
 
+use crate::index_template::IndexTemplateV0_7;
 pub use crate::index_template::{IndexTemplate, IndexTemplateId, VersionedIndexTemplate};
 use crate::merge_policy_config::{
     ConstWriteAmplificationMergePolicyConfig, MergePolicyConfig, StableLogMergePolicyConfig,
@@ -89,6 +90,8 @@ pub use crate::storage_config::{
     SourceConfigV0_7,
     VersionedIndexConfig,
     IndexConfigV0_7,
+    VersionedIndexTemplate,
+    IndexTemplateV0_7,
     SourceInputFormat,
     SourceParams,
     FileSourceParams,

diff --git a/quickwit/quickwit-serve/src/openapi.rs b/quickwit/quickwit-serve/src/openapi.rs
@@ -162,7 +162,6 @@ impl OpenApiMerger for utoipa::openapi::OpenApi {
     }
 }
 
-/*
 #[cfg(test)]
 mod openapi_schema_tests {
     use std::collections::BTreeSet;
@@ -542,5 +541,3 @@ mod openapi_schema_tests {
         }
     }
 }
-
-*/