update column defin

Author: Sehyo Chang

crates/fluvio-controlplane-metadata/src/topic/spec.rs

@@ -786,7 +786,7 @@ impl ColumnDef {
         let name = parts.next().unwrap().to_string(); // always name
         let ty = if let Some(ty_string) = parts.next() {
             match ty_string {
-                "i" => ColumnType::Int,
+                "i" => ColumnType::Integer,
                 "l" => ColumnType::Long,
                 "f" => ColumnType::Float,
                 "d" => ColumnType::Double,
@@ -804,26 +804,23 @@ impl ColumnDef {
 
 #[derive(Decoder, Encoder, Default, Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "use_serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "use_serde", serde(rename_all = "lowercase"))]
 pub enum ColumnType {
     #[fluvio(tag = 0)]
-    String,
+    #[default]
+    Bool,
     #[fluvio(tag = 1)]
-    Int,
+    String,
     #[fluvio(tag = 2)]
-    Long,
+    Integer,
     #[fluvio(tag = 3)]
-    Float,
+    Long,
     #[fluvio(tag = 4)]
-    Double,
+    Float,
     #[fluvio(tag = 5)]
-    #[default]
-    Bool,
+    Double,
     #[fluvio(tag = 6)]
-    Bytes,
-    #[fluvio(tag = 7)]
     Timestamp,
-    #[fluvio(tag = 8)]
-    Json,
 }
 
 #[cfg(test)]

crates/fluvio-controlplane-metadata/tests/topic_col.yaml

@@ -8,13 +8,13 @@ spec:
       partitions: 1
   columns:
     - name: route
-      ty: String
+      ty: string
     - name: speed
-      ty: Int
+      ty: integer
     - name: longitude
-      ty: Double
+      ty: double
     - name: latitude
-      ty: Double
+      ty: double
     - name: time
-      ty: Timestamp
+      ty: timestamp
 

k8-util/helm/fluvio-sys/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: fluvio-sys
 description: A Helm chart for Fluvio
 type: application
-version: 0.9.11
+version: 0.9.12

k8-util/helm/fluvio-sys/templates/crd_topic.yaml

@@ -95,22 +95,23 @@ spec:
                     type: object
                     required:
                     - name
-                    - ty
+                    - typ
                     properties:
                       name:
                         type: string
-                      ty:
+                      key:
+                        type: boolean
+                      typ:
                         type: string
                         enum:
-                          - String
-                          - Int
-                          - Long
-                          - Float
-                          - Double
-                          - Bool
-                          - Bytes
-                          - Timestamp
-                          - Json
+                          - bool
+                          - string
+                          - integer
+                          - long
+                          - float
+                          - double
+                          - timestamp
+
       subresources:
           status: {}
       additionalPrinterColumns: