Use operator-rs macro

Author: sbernauer

rust/operator-binary/Cargo.toml

@@ -9,6 +9,12 @@ repository.workspace = true
 publish = false
 build = "build.rs"
 
+[features]
+# The macro attributed_string_type is used in this operator. It produces test
+# code if the feature "test-support" is set. This feature is defined here to
+# suppress a Clippy warning.
+test-support = []
+
 [dependencies]
 stackable-operator = { workspace = true, features = ["test-support"] }
 

rust/operator-binary/src/controller/dereference.rs

@@ -7,6 +7,7 @@ use std::{num::ParseIntError, str::FromStr};
 
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
+    attributed_string_type,
     client::Client,
     kube::runtime::reflector::{Lookup, ObjectRef},
     v2::controller_utils::get_namespace,
@@ -71,18 +72,17 @@ pub enum Error {
     },
 }
 
-/// TODO: Use a typed String from operator-rs similar to [`stackable_operator::v2::types::operator::ClusterName`].
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub struct TrinoCatalogName(pub String);
-impl AsRef<str> for TrinoCatalogName {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-impl std::fmt::Display for TrinoCatalogName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
+attributed_string_type! {
+    TrinoCatalogName,
+    "The name of a TrinoCluster",
+    "lakehouse",
+    // Suffixes are added to produce resource names.
+    //
+    // 40 characters for catalog names should be sufficient and still allow the operators to append
+    // custom suffixes to build resource names.
+    (max_length = 40),
+    is_rfc_1035_label_name,
+    is_valid_label_value
 }
 
 type Result<T, E = Error> = std::result::Result<T, E>;

rust/operator-binary/src/crd/catalog/mod.rs

@@ -85,7 +85,7 @@ pub mod versioned {
             ///
             /// This is recommended because Kubernetes only allows `a-z` and `-`, while Trino
             /// requires quoting for catalogs containing `-` characters. This mechanism allows
-            /// you to use valid Kubernetes names, but keeps the convenience of using `_` in 
+            /// you to use valid Kubernetes names, but keeps the convenience of using `_` in
             /// catalog names.
             #[serde(default)]
             replace_hyphens_with_underscores: bool,