diff --git a/crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs b/crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs index 4e4449a0..3d0251c9 100644 --- a/crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs +++ b/crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs @@ -10,7 +10,9 @@ ) )] // --- -#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] +#[derive( + Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource, +)] pub struct FooSpec { #[versioned( added(since = "v1beta1"), diff --git a/crates/stackable-versioned-macros/fixtures/inputs/k8s/module.rs b/crates/stackable-versioned-macros/fixtures/inputs/k8s/module.rs index d37a5e5b..06822a91 100644 --- a/crates/stackable-versioned-macros/fixtures/inputs/k8s/module.rs +++ b/crates/stackable-versioned-macros/fixtures/inputs/k8s/module.rs @@ -12,6 +12,14 @@ pub(crate) mod versioned { } #[versioned(k8s(group = "foo.example.org", plural = "foos", namespaced))] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] pub struct FooSpec { bar: usize, @@ -23,6 +31,14 @@ pub(crate) mod versioned { } #[versioned(k8s(group = "bar.example.org", plural = "bars"))] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] pub struct BarSpec { baz: String, } diff --git a/crates/stackable-versioned-macros/fixtures/inputs/k8s/module_preserve.rs b/crates/stackable-versioned-macros/fixtures/inputs/k8s/module_preserve.rs index 58992b58..f45921fa 100644 --- a/crates/stackable-versioned-macros/fixtures/inputs/k8s/module_preserve.rs +++ b/crates/stackable-versioned-macros/fixtures/inputs/k8s/module_preserve.rs @@ -13,6 +13,14 @@ pub(crate) mod versioned { } #[versioned(k8s(group = "foo.example.org", plural = "foos", namespaced))] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] pub struct FooSpec { bar: usize, @@ -24,6 +32,14 @@ pub(crate) mod versioned { } #[versioned(k8s(group = "bar.example.org", plural = "bars"))] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] pub struct BarSpec { baz: String, } diff --git a/crates/stackable-versioned-macros/fixtures/inputs/k8s/skip.rs b/crates/stackable-versioned-macros/fixtures/inputs/k8s/skip.rs index aa9f908f..651ca184 100644 --- a/crates/stackable-versioned-macros/fixtures/inputs/k8s/skip.rs +++ b/crates/stackable-versioned-macros/fixtures/inputs/k8s/skip.rs @@ -11,7 +11,9 @@ ) )] // --- -#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] +#[derive( + Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource, +)] pub struct FooSpec { #[versioned( added(since = "v1beta1"), diff --git a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@basic.rs.snap b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@basic.rs.snap index 694454b2..fce0647e 100644 --- a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@basic.rs.snap +++ b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@basic.rs.snap @@ -6,8 +6,14 @@ input_file: crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs #[automatically_derived] pub mod v1alpha1 { use super::*; - #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "stackable.tech", version = "v1alpha1", @@ -32,8 +38,14 @@ impl ::std::convert::From for v1beta1::FooSpec { #[automatically_derived] pub mod v1beta1 { use super::*; - #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "stackable.tech", version = "v1beta1", @@ -59,8 +71,14 @@ impl ::std::convert::From for v1::FooSpec { #[automatically_derived] pub mod v1 { use super::*; - #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "stackable.tech", version = "v1", diff --git a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module.rs.snap b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module.rs.snap index c357340d..dfbe2f79 100644 --- a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module.rs.snap +++ b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module.rs.snap @@ -9,7 +9,14 @@ pub(crate) mod v1alpha1 { pub struct Baz { pub boom: Option, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "foo.example.org", version = "v1alpha1", @@ -21,7 +28,14 @@ pub(crate) mod v1alpha1 { pub bar: usize, pub foo: String, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "bar.example.org", version = "v1alpha1", @@ -73,7 +87,14 @@ pub(crate) mod v1 { pub struct Baz { pub boom: Option, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "foo.example.org", version = "v1", @@ -86,7 +107,14 @@ pub(crate) mod v1 { pub baz: bool, pub foo: String, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube(group = "bar.example.org", version = "v1", kind = "Bar", plural = "bars")] pub struct BarSpec { pub baz: String, @@ -134,7 +162,14 @@ pub(crate) mod v2alpha1 { pub struct Baz { pub boom: Option, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "foo.example.org", version = "v2alpha1", @@ -148,7 +183,14 @@ pub(crate) mod v2alpha1 { #[deprecated] pub deprecated_foo: String, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "bar.example.org", version = "v2alpha1", diff --git a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module_preserve.rs.snap b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module_preserve.rs.snap index a56f6ce5..40246829 100644 --- a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module_preserve.rs.snap +++ b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@module_preserve.rs.snap @@ -10,7 +10,14 @@ pub(crate) mod versioned { pub struct Baz { pub boom: Option, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "foo.example.org", version = "v1alpha1", @@ -22,7 +29,14 @@ pub(crate) mod versioned { pub bar: usize, pub foo: String, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "bar.example.org", version = "v1alpha1", @@ -69,7 +83,14 @@ pub(crate) mod versioned { pub struct Baz { pub boom: Option, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "foo.example.org", version = "v1", @@ -82,7 +103,14 @@ pub(crate) mod versioned { pub baz: bool, pub foo: String, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube(group = "bar.example.org", version = "v1", kind = "Bar", plural = "bars")] pub struct BarSpec { pub baz: String, @@ -125,7 +153,14 @@ pub(crate) mod versioned { pub struct Baz { pub boom: Option, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "foo.example.org", version = "v2alpha1", @@ -139,7 +174,14 @@ pub(crate) mod versioned { #[deprecated] pub deprecated_foo: String, } - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "bar.example.org", version = "v2alpha1", diff --git a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@skip.rs.snap b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@skip.rs.snap index 1b81fbf4..d5fb5502 100644 --- a/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@skip.rs.snap +++ b/crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@skip.rs.snap @@ -6,8 +6,14 @@ input_file: crates/stackable-versioned-macros/fixtures/inputs/k8s/skip.rs #[automatically_derived] pub mod v1alpha1 { use super::*; - #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "stackable.tech", version = "v1alpha1", @@ -32,8 +38,14 @@ impl ::std::convert::From for v1beta1::FooSpec { #[automatically_derived] pub mod v1beta1 { use super::*; - #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "stackable.tech", version = "v1beta1", @@ -59,8 +71,14 @@ impl ::std::convert::From for v1::FooSpec { #[automatically_derived] pub mod v1 { use super::*; - #[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)] - #[derive(::kube::CustomResource)] + #[derive( + Clone, + Debug, + serde::Deserialize, + serde::Serialize, + schemars::JsonSchema, + kube::CustomResource, + )] #[kube( group = "stackable.tech", version = "v1",