From 2c80e5ba6b5f932bd7d97013bac33bc68cde76c2 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 10 May 2024 12:40:16 +0200 Subject: [PATCH] use full import name for product config error --- rust/crd/src/lib.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 117b53f0..d87a70c9 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -5,6 +5,7 @@ use security::AuthenticationConfig; use serde::{Deserialize, Serialize}; use snafu::{OptionExt, ResultExt, Snafu}; use stackable_operator::kube::ResourceExt; +use stackable_operator::product_config_utils; use stackable_operator::{ commons::{ affinity::StackableAffinity, @@ -19,7 +20,7 @@ use stackable_operator::{ config::{fragment, fragment::Fragment, fragment::ValidationError, merge::Merge}, k8s_openapi::apimachinery::pkg::api::resource::Quantity, kube::{runtime::reflector::ObjectRef, CustomResource}, - product_config_utils::{Configuration, Error as ConfigError}, + product_config_utils::Configuration, product_logging::{self, spec::Logging}, role_utils::{GenericRoleConfig, Role, RoleGroup, RoleGroupRef}, schemars::{self, JsonSchema}, @@ -442,7 +443,7 @@ impl Configuration for MetaStoreConfigFragment { &self, hive: &Self::Configurable, _role_name: &str, - ) -> Result>, ConfigError> { + ) -> Result>, product_config_utils::Error> { let mut result = BTreeMap::new(); let env = formatdoc! {" @@ -464,7 +465,7 @@ impl Configuration for MetaStoreConfigFragment { &self, hive: &Self::Configurable, _role_name: &str, - ) -> Result>, ConfigError> { + ) -> Result>, product_config_utils::Error> { let mut result = BTreeMap::new(); result.insert( MetaStoreConfig::DB_TYPE_CLI.to_string(), @@ -478,7 +479,7 @@ impl Configuration for MetaStoreConfigFragment { hive: &Self::Configurable, _role_name: &str, file: &str, - ) -> Result>, ConfigError> { + ) -> Result>, product_config_utils::Error> { let mut result = BTreeMap::new(); match file {