Skip to content

Commit def0da2

Browse files
authored
Merge branch 'main' into test/conversion
2 parents a42d579 + ecd20bd commit def0da2

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

crates/stackable-operator/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ All notable changes to this project will be documented in this file.
77
### Changed
88

99
- Update `kube` to `1.1.0` ([#1049]).
10+
- BREAKING: Return type for `ListenerOperatorVolumeSourceBuilder::new()` is no onger a `Result` ([#1058]).
1011

1112
### Removed
1213

1314
- BREAKING: Removed `last_update_time` from CRD ClusterCondition status ([#1054]).
1415

1516
[#1049]: https://github.com/stackabletech/operator-rs/pull/1049
1617
[#1054]: https://github.com/stackabletech/operator-rs/pull/1054
18+
[#1058]: https://github.com/stackabletech/operator-rs/pull/1058
1719

1820
## [0.93.2] - 2025-05-26
1921

crates/stackable-operator/src/builder/pod/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ impl PodBuilder {
396396
) -> Result<&mut Self> {
397397
let listener_reference = ListenerReference::ListenerClass(listener_class.to_string());
398398
let volume = ListenerOperatorVolumeSourceBuilder::new(&listener_reference, labels)
399-
.context(ListenerVolumeSnafu { name: volume_name })?
400399
.build_ephemeral()
401400
.context(ListenerVolumeSnafu { name: volume_name })?;
402401

@@ -483,7 +482,6 @@ impl PodBuilder {
483482
) -> Result<&mut Self> {
484483
let listener_reference = ListenerReference::ListenerName(listener_name.to_string());
485484
let volume = ListenerOperatorVolumeSourceBuilder::new(&listener_reference, labels)
486-
.context(ListenerVolumeSnafu { name: volume_name })?
487485
.build_ephemeral()
488486
.context(ListenerVolumeSnafu { name: volume_name })?;
489487

crates/stackable-operator/src/builder/pod/volume.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ pub enum ListenerOperatorVolumeSourceBuilderError {
471471
/// &ListenerReference::ListenerClass("nodeport".into()),
472472
/// &labels,
473473
/// )
474-
/// .unwrap()
475474
/// .build_ephemeral()
476475
/// .unwrap();
477476
///
@@ -497,11 +496,11 @@ impl ListenerOperatorVolumeSourceBuilder {
497496
pub fn new(
498497
listener_reference: &ListenerReference,
499498
labels: &Labels,
500-
) -> Result<ListenerOperatorVolumeSourceBuilder, ListenerOperatorVolumeSourceBuilderError> {
501-
Ok(Self {
499+
) -> ListenerOperatorVolumeSourceBuilder {
500+
Self {
502501
listener_reference: listener_reference.to_owned(),
503502
labels: labels.to_owned(),
504-
})
503+
}
505504
}
506505

507506
fn build_spec(&self) -> PersistentVolumeClaimSpec {
@@ -636,8 +635,7 @@ mod tests {
636635
let builder = ListenerOperatorVolumeSourceBuilder::new(
637636
&ListenerReference::ListenerClass("public".into()),
638637
&labels,
639-
)
640-
.unwrap();
638+
);
641639

642640
let volume_source = builder.build_ephemeral().unwrap();
643641

crates/stackable-versioned-macros/src/codegen/module.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ impl Module {
108108
),
109109
}
110110
}
111-
_ => continue,
111+
// NOTE (@NickLarsenNZ): We throw an error here so the developer isn't surprised when items they have
112+
// defined in the module are no longer accessible (because they are not re-emitted).
113+
disallowed_item => errors.push(
114+
Error::custom(
115+
"Item not allowed here. Please move it ouside of the versioned module",
116+
)
117+
.with_span(&disallowed_item),
118+
),
112119
};
113120
}
114121

0 commit comments

Comments
 (0)