Skip to content

Commit 3e69cd9

Browse files
committed
Fix compilation
1 parent 263b9cd commit 3e69cd9

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

rust/stackable-cockpit/src/platform/operator/listener_operator.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub enum ListenerClassPreset {
1717
EphemeralNodes,
1818
}
1919

20-
impl ListenerOperatorPreset {
20+
impl ListenerClassPreset {
2121
pub fn as_helm_values(&self) -> String {
2222
let preset_value = match self {
2323
Self::None => "none",
@@ -29,9 +29,7 @@ impl ListenerOperatorPreset {
2929
}
3030

3131
#[instrument]
32-
pub async fn determine_and_store_listener_class_preset(
33-
from_cli: Option<&ListenerClassPreset>,
34-
) {
32+
pub async fn determine_and_store_listener_class_preset(from_cli: Option<&ListenerClassPreset>) {
3533
if let Some(from_cli) = from_cli {
3634
LISTENER_CLASS_PRESET
3735
.set(*from_cli)

rust/stackable-cockpit/src/platform/operator/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{fmt::Display, str::FromStr};
22

3-
use listener_operator::LISTENER_OPERATOR_PRESET;
3+
use listener_operator::LISTENER_CLASS_PRESET;
44
use semver::Version;
55
use serde::Serialize;
66
use snafu::{ResultExt, Snafu, ensure};
@@ -213,7 +213,7 @@ impl OperatorSpec {
213213
let mut helm_values = None;
214214
if self.name == "listener" {
215215
helm_values = Some(
216-
LISTENER_OPERATOR_PRESET.get()
216+
LISTENER_CLASS_PRESET.get()
217217
.expect("At this point LISTENER_OPERATOR_PRESET must be set by determine_and_store_listener_operator_preset")
218218
.as_helm_values()
219219
);

rust/stackablectl/src/args/operator_configs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clap::Args;
2-
use stackable_cockpit::platform::operator::listener_operator::ListenerOperatorPreset;
2+
use stackable_cockpit::platform::operator::listener_operator::ListenerClassPreset;
33

44
#[derive(Debug, Args)]
55
#[command(next_help_heading = "Operator specific configurations")]
@@ -13,5 +13,5 @@ pub struct CommonOperatorConfigsArgs {
1313
/// This argument is likely temporary until we support setting arbitrary helm values for the
1414
/// operators!
1515
#[arg(long, global = true)]
16-
pub listener_class_presets: Option<ListenerOperatorPreset>,
16+
pub listener_class_presets: Option<ListenerClassPreset>,
1717
}

rust/stackablectl/src/cli/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use stackable_cockpit::{
77
constants::{HELM_REPO_NAME_DEV, HELM_REPO_NAME_STABLE, HELM_REPO_NAME_TEST},
88
helm,
99
platform::operator::{
10-
ChartSourceType, listener_operator::determine_and_store_listener_operator_preset,
10+
ChartSourceType, listener_operator::determine_and_store_listener_class_preset,
1111
},
1212
utils::path::{
1313
IntoPathOrUrl, IntoPathsOrUrls, ParsePathsOrUrls, PathOrUrl, PathOrUrlParseError,
@@ -191,7 +191,7 @@ impl Cli {
191191
// TODO (Techassi): Do we still want to auto purge when running cache commands?
192192
cache.auto_purge().await.unwrap();
193193

194-
determine_and_store_listener_operator_preset(
194+
determine_and_store_listener_class_preset(
195195
self.operator_configs.listener_class_presets.as_ref(),
196196
)
197197
.await;

0 commit comments

Comments
 (0)