use to_upper_camel_case everywhere

Signed-off-by: Sebastian Hoß <[email protected]>

Author: sebhoss

src/analyzer.rs

@@ -22,13 +22,8 @@ pub struct Config {
 /// All found output structs will have its names prefixed by the kind it is for
 pub fn analyze(schema: JSONSchemaProps, kind: &str, cfg: Config) -> Result<Output> {
     let mut res = vec![];
-    let upper_cased_kind: String = kind
-        .chars()
-        .take(1)
-        .flat_map(|c| c.to_uppercase())
-        .chain(kind.chars().skip(1))
-        .collect();
-    analyze_(&schema, "", &upper_cased_kind, 0, &mut res, &cfg)?;
+
+    analyze_(&schema, "", &kind.to_upper_camel_case(), 0, &mut res, &cfg)?;
     Ok(Output(res))
 }
 
@@ -1338,16 +1333,16 @@ type: object
         let structs = analyze(schema, "ArgoCDExport", Cfg::default()).unwrap().0;
 
         let root = &structs[0];
-        assert_eq!(root.name, "ArgoCDExport");
+        assert_eq!(root.name, "ArgoCdExport");
         assert_eq!(root.level, 0);
 
-        let other = &structs[1];
-        assert_eq!(other.name, "ArgoCDExportSpec");
-        assert_eq!(other.level, 1);
+        let spec = &structs[1];
+        assert_eq!(spec.name, "ArgoCdExportSpec");
+        assert_eq!(spec.level, 1);
 
-        let other = &structs[2];
-        assert_eq!(other.name, "ArgoCDExportStatus");
-        assert_eq!(other.level, 1);
+        let status = &structs[2];
+        assert_eq!(status.name, "ArgoCdExportStatus");
+        assert_eq!(status.level, 1);
     }
 
     #[test]

src/main.rs

@@ -2,6 +2,7 @@ use std::{path::PathBuf, str::FromStr};
 #[macro_use] extern crate log;
 use anyhow::{anyhow, Context, Result};
 use clap::{CommandFactory, Parser, Subcommand};
+use heck::ToUpperCamelCase;
 use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::{
     CustomResourceDefinition, CustomResourceDefinitionVersion,
 };
@@ -281,7 +282,7 @@ impl Kopium {
                             .is_some_and(|c| c.contains_key("status")))
                         && self.has_status_resource(&structs)
                     {
-                        println!(r#"#[kube(status = "{}Status")]"#, kind);
+                        println!(r#"#[kube(status = "{}Status")]"#, kind.to_upper_camel_case());
                     }
                     if self.schema != "derived" {
                         println!(r#"#[kube(schema = "{}")]"#, self.schema);
@@ -306,7 +307,10 @@ impl Kopium {
                 }
             } else {
                 self.print_derives(s, &structs);
-                let spec_trimmed_name = s.name.as_str().replace(&format!("{}Spec", kind), kind);
+                let spec_trimmed_name = s
+                    .name
+                    .as_str()
+                    .replace(&format!("{}Spec", kind.to_upper_camel_case()), kind);
                 if s.is_enum {
                     println!("pub enum {} {{", spec_trimmed_name);
                 } else {
@@ -322,7 +326,10 @@ impl Kopium {
                 for annot in &m.extra_annot {
                     println!("    {}", annot);
                 }
-                let spec_trimmed_type = m.type_.as_str().replace(&format!("{}Spec", kind), kind);
+                let spec_trimmed_type = m
+                    .type_
+                    .as_str()
+                    .replace(&format!("{}Spec", kind.to_upper_camel_case()), kind);
                 if s.is_enum {
                     // NB: only supporting plain enumerations atm, not oneOf
                     println!("    {},", name);