chore(crd-preview): Fix macro, add re-exports

Author: Techassi

Cargo.lock

@@ -42,6 +42,7 @@ opentelemetry-appender-tracing = "0.29.1"
 opentelemetry-otlp = "0.29.0"
 # opentelemetry-semantic-conventions = "0.28.0"
 p256 = { version = "0.13.2", features = ["ecdsa"] }
+paste = "1.0.15"
 pin-project = "1.1.5"
 prettyplease = "0.2.22"
 proc-macro2 = "1.0.86"

Cargo.toml

@@ -13,8 +13,8 @@ mod class;
 mod core;
 mod listeners;
 
-pub use class::ListenerClass;
-pub use listeners::{Listener, PodListeners};
+pub use class::{ListenerClass, ListenerClassVersion};
+pub use listeners::{Listener, ListenerVersion, PodListeners, PodListenersVersion};
 
 // Group all v1alpha1 items in one module.
 pub mod v1alpha1 {

crates/stackable-operator/src/crd/listener/mod.rs

@@ -1,8 +1,8 @@
 mod bucket;
 mod connection;
 
-pub use bucket::S3Bucket;
-pub use connection::S3Connection;
+pub use bucket::{S3Bucket, S3BucketVersion};
+pub use connection::{S3Connection, S3ConnectionVersion};
 
 // Group all v1alpha1 items in one module.
 pub mod v1alpha1 {

crates/stackable-operator/src/crd/s3/mod.rs

@@ -7,6 +7,7 @@ publish = false
 stackable-operator = { path = "../stackable-operator" }
 
 clap.workspace = true
+paste.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 snafu.workspace = true

crates/xtask/Cargo.toml

@@ -18,8 +18,10 @@ pub mod versioned {
         namespaced,
         crates(
             kube_core = "stackable_operator::kube::core",
+            kube_client = "stackable_operator::kube::client",
             k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
+            schemars = "stackable_operator::schemars",
+            versioned = "stackable_operator::versioned"
         )
     ))]
     #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]

crates/xtask/src/crd/dummy.rs

@@ -1,16 +1,20 @@
 use std::path::PathBuf;
 
+use paste::paste;
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     crd::{
-        authentication::core::AuthenticationClass,
-        listener::{Listener, ListenerClass, PodListeners},
-        s3::{S3Bucket, S3Connection},
+        authentication::core::{AuthenticationClass, AuthenticationClassVersion},
+        listener::{
+            Listener, ListenerClass, ListenerClassVersion, ListenerVersion, PodListeners,
+            PodListenersVersion,
+        },
+        s3::{S3Bucket, S3BucketVersion, S3Connection, S3ConnectionVersion},
     },
     kube::core::crd::MergeError,
 };
 
-use crate::crd::dummy::DummyCluster;
+use crate::crd::dummy::{DummyCluster, DummyClusterVersion};
 
 mod dummy;
 
@@ -37,21 +41,23 @@ pub enum Error {
 
 macro_rules! write_crd {
     ($base_path:expr, $crd_name:ident, $stored_crd_version:ident) => {
-        let merged = $crd_name::merged_crd($crd_name::$stored_crd_version)
-            .context(MergeCrdSnafu { crd_name: stringify!($crd_name) })?;
+        paste! {
+            let merged = $crd_name::merged_crd([<$crd_name Version>]::$stored_crd_version)
+                .context(MergeCrdSnafu { crd_name: stringify!($crd_name) })?;
 
-        let mut path = $base_path.join(stringify!($crd_name));
-        path.set_extension("yaml");
+            let mut path = $base_path.join(stringify!($crd_name));
+            path.set_extension("yaml");
 
-        <stackable_operator::k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition
-            as stackable_operator::YamlSchema>
-            ::write_yaml_schema(
-                &merged,
-                &path,
-                "0.0.0-dev",
-                stackable_operator::shared::yaml::SerializeOptions::default(),
-            )
-            .with_context(|_| WriteCrdSnafu { path: path.clone() })?;
+            <stackable_operator::k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition
+                as stackable_operator::YamlSchema>
+                ::write_yaml_schema(
+                    &merged,
+                    &path,
+                    "0.0.0-dev",
+                    stackable_operator::shared::yaml::SerializeOptions::default(),
+                )
+                .with_context(|_| WriteCrdSnafu { path: path.clone() })?;
+        }
     };
 }