Skip to content

Commit

Permalink
use full import name for product config error
Browse files Browse the repository at this point in the history
  • Loading branch information
maltesander committed May 10, 2024
1 parent 32ddee6 commit 2c80e5b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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},
Expand Down Expand Up @@ -442,7 +443,7 @@ impl Configuration for MetaStoreConfigFragment {
&self,
hive: &Self::Configurable,
_role_name: &str,
) -> Result<BTreeMap<String, Option<String>>, ConfigError> {
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
let mut result = BTreeMap::new();

let env = formatdoc! {"
Expand All @@ -464,7 +465,7 @@ impl Configuration for MetaStoreConfigFragment {
&self,
hive: &Self::Configurable,
_role_name: &str,
) -> Result<BTreeMap<String, Option<String>>, ConfigError> {
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
let mut result = BTreeMap::new();
result.insert(
MetaStoreConfig::DB_TYPE_CLI.to_string(),
Expand All @@ -478,7 +479,7 @@ impl Configuration for MetaStoreConfigFragment {
hive: &Self::Configurable,
_role_name: &str,
file: &str,
) -> Result<BTreeMap<String, Option<String>>, ConfigError> {
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
let mut result = BTreeMap::new();

match file {
Expand Down

0 comments on commit 2c80e5b

Please sign in to comment.