Skip to content

Commit 514c498

Browse files
siegfriedwebersiegfriedweber
committed
chore: Rename GenericProductSpecificCommonConfig to GenericCommonConfig
1 parent cc7e241 commit 514c498

8 files changed

Lines changed: 22 additions & 24 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use crate::{
4141
framework::{
4242
HasName, HasUid, NameIsValidLabelValue,
4343
product_logging::framework::{ValidatedContainerLogConfigChoice, VectorContainerLogConfig},
44-
role_utils::{GenericProductSpecificCommonConfig, RoleGroupConfig},
44+
role_utils::{GenericCommonConfig, RoleGroupConfig},
4545
types::{
4646
common::Port,
4747
kubernetes::{Hostname, ListenerClassName, NamespaceName, SecretClassName, Uid},
@@ -147,7 +147,7 @@ impl ReconcilerError for Error {
147147
}
148148

149149
type OpenSearchRoleGroupConfig = RoleGroupConfig<
150-
GenericProductSpecificCommonConfig,
150+
GenericCommonConfig,
151151
ValidatedOpenSearchConfig,
152152
v1alpha1::OpenSearchConfigOverrides,
153153
>;
@@ -511,7 +511,7 @@ mod tests {
511511
framework::{
512512
builder::pod::container::EnvVarSet,
513513
product_logging::framework::ValidatedContainerLogConfigChoice,
514-
role_utils::GenericProductSpecificCommonConfig,
514+
role_utils::GenericCommonConfig,
515515
types::{
516516
kubernetes::{ListenerClassName, NamespaceName, SecretClassName},
517517
operator::{ClusterName, OperatorName, ProductVersion, RoleGroupName},
@@ -665,7 +665,7 @@ mod tests {
665665
env_overrides: EnvVarSet::default(),
666666
cli_overrides: BTreeMap::default(),
667667
pod_overrides: PodTemplateSpec::default(),
668-
product_specific_common_config: GenericProductSpecificCommonConfig::default(),
668+
product_specific_common_config: GenericCommonConfig::default(),
669669
}
670670
}
671671
}

‎rust/operator-binary/src/controller/build.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ mod tests {
8787
crd::v1alpha1,
8888
framework::{
8989
builder::pod::container::EnvVarSet,
90-
role_utils::GenericProductSpecificCommonConfig,
90+
role_utils::GenericCommonConfig,
9191
types::{
9292
common::Port,
9393
kubernetes::{Hostname, ListenerClassName, NamespaceName, SecretClassName},
@@ -249,7 +249,7 @@ mod tests {
249249
env_overrides: EnvVarSet::default(),
250250
cli_overrides: BTreeMap::default(),
251251
pod_overrides: PodTemplateSpec::default(),
252-
product_specific_common_config: GenericProductSpecificCommonConfig::default(),
252+
product_specific_common_config: GenericCommonConfig::default(),
253253
}
254254
}
255255
}

‎rust/operator-binary/src/controller/build/node_config.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ mod tests {
562562
framework::{
563563
config_overrides::KeyValueConfigOverrides,
564564
product_logging::framework::ValidatedContainerLogConfigChoice,
565-
role_utils::GenericProductSpecificCommonConfig,
565+
role_utils::GenericCommonConfig,
566566
types::{
567567
kubernetes::{
568568
ConfigMapKey, ConfigMapName, ListenerClassName, NamespaceName, SecretClassName,
@@ -635,7 +635,7 @@ mod tests {
635635
),
636636
cli_overrides: BTreeMap::default(),
637637
pod_overrides: PodTemplateSpec::default(),
638-
product_specific_common_config: GenericProductSpecificCommonConfig::default(),
638+
product_specific_common_config: GenericCommonConfig::default(),
639639
};
640640

641641
let security_settings = v1alpha1::SecuritySettings {

‎rust/operator-binary/src/controller/build/role_builder.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ mod tests {
390390
crd::v1alpha1,
391391
framework::{
392392
builder::pod::container::EnvVarSet,
393-
role_utils::GenericProductSpecificCommonConfig,
393+
role_utils::GenericCommonConfig,
394394
types::{
395395
common::Port,
396396
kubernetes::{
@@ -447,7 +447,7 @@ mod tests {
447447
env_overrides: EnvVarSet::default(),
448448
cli_overrides: BTreeMap::default(),
449449
pod_overrides: PodTemplateSpec::default(),
450-
product_specific_common_config: GenericProductSpecificCommonConfig::default(),
450+
product_specific_common_config: GenericCommonConfig::default(),
451451
};
452452

453453
let cluster = ValidatedCluster::new(

‎rust/operator-binary/src/controller/build/role_group_builder.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ mod tests {
14711471
framework::{
14721472
builder::pod::container::EnvVarSet,
14731473
product_logging::framework::VectorContainerLogConfig,
1474-
role_utils::GenericProductSpecificCommonConfig,
1474+
role_utils::GenericCommonConfig,
14751475
types::{
14761476
kubernetes::{
14771477
ConfigMapKey, ConfigMapName, ListenerClassName, ListenerName, NamespaceName,
@@ -1583,7 +1583,7 @@ mod tests {
15831583
env_overrides: EnvVarSet::default(),
15841584
cli_overrides: BTreeMap::default(),
15851585
pod_overrides: PodTemplateSpec::default(),
1586-
product_specific_common_config: GenericProductSpecificCommonConfig::default(),
1586+
product_specific_common_config: GenericCommonConfig::default(),
15871587
};
15881588

15891589
let security_settings = v1alpha1::SecuritySettings {

‎rust/operator-binary/src/controller/validate.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ mod tests {
465465
product_logging::framework::{
466466
ValidatedContainerLogConfigChoice, VectorContainerLogConfig,
467467
},
468-
role_utils::{GenericProductSpecificCommonConfig, RoleGroupConfig},
468+
role_utils::{GenericCommonConfig, RoleGroupConfig},
469469
types::{
470470
common::Port,
471471
kubernetes::{
@@ -684,8 +684,7 @@ mod tests {
684684
}),
685685
..PodTemplateSpec::default()
686686
},
687-
product_specific_common_config: GenericProductSpecificCommonConfig::default(
688-
)
687+
product_specific_common_config: GenericCommonConfig::default()
689688
}
690689
)]
691690
.into(),
@@ -1071,7 +1070,7 @@ mod tests {
10711070
}),
10721071
..PodTemplateSpec::default()
10731072
},
1074-
product_specific_common_config: GenericProductSpecificCommonConfig::default(
1073+
product_specific_common_config: GenericCommonConfig::default(
10751074
),
10761075
},
10771076
role_config: v1alpha1::OpenSearchRoleConfig::default(),
@@ -1136,7 +1135,7 @@ mod tests {
11361135
..PodTemplateSpec::default()
11371136
},
11381137
product_specific_common_config:
1139-
GenericProductSpecificCommonConfig::default(),
1138+
GenericCommonConfig::default(),
11401139
},
11411140
replicas: Some(3),
11421141
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::{
3434
framework::{
3535
NameIsValidLabelValue,
3636
config_overrides::KeyValueConfigOverrides,
37-
role_utils::GenericProductSpecificCommonConfig,
37+
role_utils::GenericCommonConfig,
3838
types::{
3939
kubernetes::{
4040
ConfigMapKey, ConfigMapName, ContainerName, ListenerClassName, SecretClassName,
@@ -53,12 +53,12 @@ type OpenSearchRole = Role<
5353
v1alpha1::OpenSearchConfigFragment,
5454
v1alpha1::OpenSearchConfigOverrides,
5555
v1alpha1::OpenSearchRoleConfig,
56-
GenericProductSpecificCommonConfig,
56+
GenericCommonConfig,
5757
>;
5858

5959
pub type OpenSearchRoleGroup = RoleGroup<
6060
v1alpha1::OpenSearchConfigFragment,
61-
GenericProductSpecificCommonConfig,
61+
GenericCommonConfig,
6262
v1alpha1::OpenSearchConfigOverrides,
6363
>;
6464

‎rust/operator-binary/src/framework/role_utils.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ use super::{
2222
},
2323
};
2424

25-
/// Variant of [`stackable_operator::role_utils::GenericProductSpecificCommonConfig`] that
26-
/// implements [`Merge`]
25+
/// Variant of [`stackable_operator::role_utils::GenericCommonConfig`] that implements [`Merge`]
2726
#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
28-
pub struct GenericProductSpecificCommonConfig {}
27+
pub struct GenericCommonConfig {}
2928

30-
impl Merge for GenericProductSpecificCommonConfig {
29+
impl Merge for GenericCommonConfig {
3130
fn merge(&mut self, _defaults: &Self) {}
3231
}
3332

0 commit comments

Comments
 (0)