Merge branch 'main' into feat/request-secret-lifetime

crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs

@@ -13,7 +13,7 @@
 #[derive(
     Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource,
 )]
-pub struct FooSpec {
+pub(crate) struct FooSpec {
     #[versioned(
         added(since = "v1beta1"),
         changed(since = "v1", from_name = "bah", from_type = "u16")

crates/stackable-versioned-macros/src/codegen/container/mod.rs

@@ -93,13 +93,15 @@ impl Container {
         enum_variant_idents: &[IdentString],
         enum_variant_strings: &[String],
         fn_calls: &[TokenStream],
+        vis: &Visibility,
         is_nested: bool,
     ) -> Option<TokenStream> {
         match self {
             Container::Struct(s) => s.generate_kubernetes_merge_crds(
                 enum_variant_idents,
                 enum_variant_strings,
                 fn_calls,
+                vis,
                 is_nested,
             ),
             Container::Enum(_) => None,
@@ -216,6 +218,7 @@ impl StandaloneContainer {
             &kubernetes_enum_variant_idents,
             &kubernetes_enum_variant_strings,
             &kubernetes_merge_crds_fn_calls,
+            vis,
             false,
         ));
 

crates/stackable-versioned-macros/src/codegen/container/struct.rs

@@ -3,7 +3,7 @@ use std::ops::Not;
 use darling::{util::IdentString, Error, FromAttributes, Result};
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_quote, ItemStruct, Path};
+use syn::{parse_quote, ItemStruct, Path, Visibility};
 
 use crate::{
     attrs::container::NestedContainerAttributes,
@@ -332,6 +332,7 @@ impl Struct {
         enum_variant_idents: &[IdentString],
         enum_variant_strings: &[String],
         fn_calls: &[TokenStream],
+        vis: &Visibility,
         is_nested: bool,
     ) -> Option<TokenStream> {
         match &self.common.options.kubernetes_options {
@@ -347,13 +348,12 @@ impl Struct {
                 let k8s_openapi_path = &*kubernetes_options.crates.k8s_openapi;
                 let kube_core_path = &*kubernetes_options.crates.kube_core;
 
-                // TODO (@Techassi): Use proper visibility instead of hard-coding 'pub'
                 // TODO (@Techassi): Move the YAML printing code into 'stackable-versioned' so that we don't
                 // have any cross-dependencies and the macro can be used on it's own (K8s features of course
                 // still need kube and friends).
                 Some(quote! {
                     #automatically_derived
-                    pub enum #enum_ident {
+                    #vis enum #enum_ident {
                         #(#enum_variant_idents),*
                     }
 
@@ -368,7 +368,7 @@ impl Struct {
 
                     #automatically_derived
                     impl #enum_ident {
-                        /// Generates a merged CRD which contains all versions defined using the `#[versioned()]` macro.
+                        /// Generates a merged CRD containing all versions and marking `stored_apiversion` as stored.
                         pub fn merged_crd(
                             stored_apiversion: Self
                         ) -> ::std::result::Result<#k8s_openapi_path::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition, #kube_core_path::crd::MergeError> {

crates/stackable-versioned-macros/src/codegen/module.rs

@@ -137,6 +137,7 @@ impl Module {
                     kubernetes_enum_variant_idents,
                     kubernetes_enum_variant_strings,
                     kubernetes_merge_crds_fn_calls,
+                    version_module_vis,
                     self.preserve_module,
                 ));
             }

crates/stackable-versioned/CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Use visibility of container definition or module for generated CRD enum ([#923]).
 - Add support to apply the `#[versioned()]` macro to modules to version all contained items at
   once ([#891]).
 - Add support for passing a `status`, `crates`, and `shortname` arguments through to the `#[kube]`
@@ -35,6 +36,7 @@ All notable changes to this project will be documented in this file.
 [#919]: https://github.com/stackabletech/operator-rs/pull/919
 [#920]: https://github.com/stackabletech/operator-rs/pull/920
 [#922]: https://github.com/stackabletech/operator-rs/pull/922
+[#923]: https://github.com/stackabletech/operator-rs/pull/923
 
 ## [0.4.1] - 2024-10-23