chore(cubesql): Bump openapi-generator

cube-js · Feb 13, 2025 · 7b9cf03 · 7b9cf03
1 parent 9956ad7
commit 7b9cf03
Show file tree

Hide file tree

Showing 37 changed files with 1,683 additions and 1,391 deletions.
diff --git a/packages/cubejs-backend-native/Cargo.lock b/packages/cubejs-backend-native/Cargo.lock
diff --git a/rust/cubenativeutils/Cargo.lock b/rust/cubenativeutils/Cargo.lock
diff --git a/rust/cubesql/Cargo.lock b/rust/cubesql/Cargo.lock
diff --git a/rust/cubesql/cubeclient/.openapi-generator/VERSION b/rust/cubesql/cubeclient/.openapi-generator/VERSION
@@ -1 +1 @@
-6.6.0
+7.11.0
diff --git a/rust/cubesql/cubeclient/Cargo.toml b/rust/cubesql/cubeclient/Cargo.toml
@@ -9,9 +9,9 @@ documentation = "https://cube.dev/docs"
 homepage = "https://cube.dev"
 
 [dependencies]
-serde = "1.0.209"
-serde_derive = "1.0.209"
+serde = { version = "1.0.209", features = ["derive"] }
 serde_json = "^1.0"
+serde_repr = "0.1.19"
 url = "^2.2"
 reqwest-middleware = { version = "0.3.2", features = ["json"] }
 anyhow = "1.0"

diff --git a/rust/cubesql/cubeclient/DEVELOPMENT.md b/rust/cubesql/cubeclient/DEVELOPMENT.md
@@ -22,7 +22,7 @@ openapi-generator generate -i ../../packages/cubejs-api-gateway/openspec.yml -g
 From repo root
 
 ```sh
-docker run --rm -v ".:/cube" --workdir /cube/rust/cubesql openapitools/openapi-generator-cli:v6.6.0 generate -i ../../packages/cubejs-api-gateway/openspec.yml -g rust -o cubeclient
+docker run --rm -v ".:/cube" --workdir /cube/rust/cubesql openapitools/openapi-generator-cli:v7.11.0 generate -i ../../packages/cubejs-api-gateway/openspec.yml -g rust -o cubeclient
 ```
 
 Take care around Docker on root and files owner and mode

diff --git a/rust/cubesql/cubeclient/src/apis/default_api.rs b/rust/cubesql/cubeclient/src/apis/default_api.rs
@@ -1,5 +1,6 @@
 use log::{debug, error};
 use reqwest;
+use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 use super::{configuration, Error};

diff --git a/rust/cubesql/cubeclient/src/lib.rs b/rust/cubesql/cubeclient/src/lib.rs
@@ -1,13 +1,10 @@
-// Open spec generator generates ToString methods for enums, let's disable clippy rule as quick
-// workaround. TODO: Use new one open spec generator?
-#![allow(clippy::to_string_trait_impl)]
-
-#[macro_use]
-extern crate serde_derive;
+#![allow(unused_imports)]
+#![allow(clippy::too_many_arguments)]
 
 extern crate reqwest;
 extern crate serde;
 extern crate serde_json;
+extern crate serde_repr;
 extern crate url;
 
 pub mod apis;

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta.rs
@@ -8,39 +8,42 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMeta {
     #[serde(rename = "name")]
     pub name: String,
     #[serde(rename = "title", skip_serializing_if = "Option::is_none")]
     pub title: Option<String>,
     #[serde(rename = "type")]
-    pub r#type: crate::models::V1CubeMetaType,
+    pub r#type: models::V1CubeMetaType,
     #[serde(rename = "meta", skip_serializing_if = "Option::is_none")]
     pub meta: Option<serde_json::Value>,
     #[serde(rename = "description", skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     #[serde(rename = "measures")]
-    pub measures: Vec<crate::models::V1CubeMetaMeasure>,
+    pub measures: Vec<models::V1CubeMetaMeasure>,
     #[serde(rename = "dimensions")]
-    pub dimensions: Vec<crate::models::V1CubeMetaDimension>,
+    pub dimensions: Vec<models::V1CubeMetaDimension>,
     #[serde(rename = "segments")]
-    pub segments: Vec<crate::models::V1CubeMetaSegment>,
+    pub segments: Vec<models::V1CubeMetaSegment>,
     #[serde(rename = "joins", skip_serializing_if = "Option::is_none")]
-    pub joins: Option<Vec<crate::models::V1CubeMetaJoin>>,
+    pub joins: Option<Vec<models::V1CubeMetaJoin>>,
     #[serde(rename = "folders", skip_serializing_if = "Option::is_none")]
-    pub folders: Option<Vec<crate::models::V1CubeMetaFolder>>,
+    pub folders: Option<Vec<models::V1CubeMetaFolder>>,
     #[serde(rename = "hierarchies", skip_serializing_if = "Option::is_none")]
-    pub hierarchies: Option<Vec<crate::models::V1CubeMetaHierarchy>>,
+    pub hierarchies: Option<Vec<models::V1CubeMetaHierarchy>>,
 }
 
 impl V1CubeMeta {
     pub fn new(
         name: String,
-        r#type: crate::models::V1CubeMetaType,
-        measures: Vec<crate::models::V1CubeMetaMeasure>,
-        dimensions: Vec<crate::models::V1CubeMetaDimension>,
-        segments: Vec<crate::models::V1CubeMetaSegment>,
+        r#type: models::V1CubeMetaType,
+        measures: Vec<models::V1CubeMetaMeasure>,
+        dimensions: Vec<models::V1CubeMetaDimension>,
+        segments: Vec<models::V1CubeMetaSegment>,
     ) -> V1CubeMeta {
         V1CubeMeta {
             name,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaDimension {
     #[serde(rename = "name")]
     pub name: String,
@@ -22,7 +25,7 @@ pub struct V1CubeMetaDimension {
     #[serde(rename = "aliasMember", skip_serializing_if = "Option::is_none")]
     pub alias_member: Option<String>,
     #[serde(rename = "granularities", skip_serializing_if = "Option::is_none")]
-    pub granularities: Option<Vec<crate::models::V1CubeMetaDimensionGranularity>>,
+    pub granularities: Option<Vec<models::V1CubeMetaDimensionGranularity>>,
     #[serde(rename = "meta", skip_serializing_if = "Option::is_none")]
     pub meta: Option<serde_json::Value>,
 }

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension_granularity.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_dimension_granularity.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaDimensionGranularity {
     #[serde(rename = "name")]
     pub name: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_folder.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_folder.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaFolder {
     #[serde(rename = "name")]
     pub name: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_hierarchy.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_hierarchy.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaHierarchy {
     #[serde(rename = "name")]
     pub name: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_join.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_join.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaJoin {
     #[serde(rename = "name")]
     pub name: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_measure.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_measure.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaMeasure {
     #[serde(rename = "name")]
     pub name: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_segment.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_segment.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1CubeMetaSegment {
     #[serde(rename = "name")]
     pub name: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_cube_meta_type.rs b/rust/cubesql/cubeclient/src/models/v1_cube_meta_type.rs
@@ -8,6 +8,9 @@
  * Generated by: https://openapi-generator.tech
  */
 
+use crate::models;
+use serde::{Deserialize, Serialize};
+
 /// V1CubeMetaType : Type of cube
 /// Type of cube
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
@@ -18,11 +21,11 @@ pub enum V1CubeMetaType {
     View,
 }
 
-impl ToString for V1CubeMetaType {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for V1CubeMetaType {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            Self::Cube => String::from("cube"),
-            Self::View => String::from("view"),
+            Self::Cube => write!(f, "cube"),
+            Self::View => write!(f, "view"),
         }
     }
 }

diff --git a/rust/cubesql/cubeclient/src/models/v1_error.rs b/rust/cubesql/cubeclient/src/models/v1_error.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1Error {
     #[serde(rename = "error")]
     pub error: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_load_continue_wait.rs b/rust/cubesql/cubeclient/src/models/v1_load_continue_wait.rs
@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1LoadContinueWait {
     pub error: String,

diff --git a/rust/cubesql/cubeclient/src/models/v1_load_request.rs b/rust/cubesql/cubeclient/src/models/v1_load_request.rs
@@ -8,12 +8,15 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1LoadRequest {
     #[serde(rename = "queryType", skip_serializing_if = "Option::is_none")]
     pub query_type: Option<String>,
     #[serde(rename = "query", skip_serializing_if = "Option::is_none")]
-    pub query: Option<crate::models::V1LoadRequestQuery>,
+    pub query: Option<models::V1LoadRequestQuery>,
 }
 
 impl V1LoadRequest {

diff --git a/rust/cubesql/cubeclient/src/models/v1_load_request_query.rs b/rust/cubesql/cubeclient/src/models/v1_load_request_query.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1LoadRequestQuery {
     #[serde(rename = "measures", skip_serializing_if = "Option::is_none")]
     pub measures: Option<Vec<String>>,
@@ -17,19 +20,19 @@ pub struct V1LoadRequestQuery {
     #[serde(rename = "segments", skip_serializing_if = "Option::is_none")]
     pub segments: Option<Vec<String>>,
     #[serde(rename = "timeDimensions", skip_serializing_if = "Option::is_none")]
-    pub time_dimensions: Option<Vec<crate::models::V1LoadRequestQueryTimeDimension>>,
+    pub time_dimensions: Option<Vec<models::V1LoadRequestQueryTimeDimension>>,
     #[serde(rename = "order", skip_serializing_if = "Option::is_none")]
     pub order: Option<Vec<Vec<String>>>,
     #[serde(rename = "limit", skip_serializing_if = "Option::is_none")]
     pub limit: Option<i32>,
     #[serde(rename = "offset", skip_serializing_if = "Option::is_none")]
     pub offset: Option<i32>,
     #[serde(rename = "filters", skip_serializing_if = "Option::is_none")]
-    pub filters: Option<Vec<crate::models::V1LoadRequestQueryFilterItem>>,
+    pub filters: Option<Vec<models::V1LoadRequestQueryFilterItem>>,
     #[serde(rename = "ungrouped", skip_serializing_if = "Option::is_none")]
     pub ungrouped: Option<bool>,
     #[serde(rename = "subqueryJoins", skip_serializing_if = "Option::is_none")]
-    pub subquery_joins: Option<Vec<crate::models::V1LoadRequestQueryJoinSubquery>>,
+    pub subquery_joins: Option<Vec<models::V1LoadRequestQueryJoinSubquery>>,
 }
 
 impl V1LoadRequestQuery {

diff --git a/rust/cubesql/cubeclient/src/models/v1_load_request_query_filter_base.rs b/rust/cubesql/cubeclient/src/models/v1_load_request_query_filter_base.rs
@@ -8,7 +8,10 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct V1LoadRequestQueryFilterBase {
     #[serde(rename = "member", skip_serializing_if = "Option::is_none")]
     pub member: Option<String>,