Skip to content

Commit 75503fb

Browse files
chore: Update templated files (f1f1a9e) (#769)
* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@f1f1a9e Reference-to: stackabletech/operator-templating@f1f1a9e (Bump Rust to 1.85.0) * fix: rustfmt lint * ci: use nightly toolchain for cargo udeps * ci: use nightly toolchain for cargo udeps * Revert "ci: use nightly toolchain for cargo udeps" This reverts commit d968bd8. * Revert "ci: use nightly toolchain for cargo udeps" This reverts commit 0065b0d. --------- Co-authored-by: Nick Larsen <[email protected]>
1 parent dd338e6 commit 75503fb

File tree

18 files changed

+164
-169
lines changed

18 files changed

+164
-169
lines changed

.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Bump Rust Dependencies for Stackable Release XX.(X)X
1+
# Bump Rust Dependencies for Stackable Release YY.M.X
22

33
<!--
44
Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/pre-release-operator-rust-deps.md'
@@ -32,7 +32,7 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
3232
3333
```[tasklist]
3434
### Bump Rust Dependencies
35-
- [ ] Bump `stackable-operator` and friends.
36-
- [ ] Bump `product-version`.
37-
- [ ] Bump all other dependencies.
35+
- [ ] Bump `stackable-operator` and friends
36+
- [ ] Bump `product-config`
37+
- [ ] Bump all other dependencies
3838
```

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ env:
2626
CARGO_TERM_COLOR: always
2727
CARGO_INCREMENTAL: '0'
2828
CARGO_PROFILE_DEV_DEBUG: '0'
29-
RUST_TOOLCHAIN_VERSION: "1.84.1"
29+
RUST_TOOLCHAIN_VERSION: "1.85.0"
30+
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-01-15"
3031
PYTHON_VERSION: "3.12"
3132
RUSTFLAGS: "-D warnings"
3233
RUSTDOCFLAGS: "-D warnings"
@@ -136,9 +137,11 @@ jobs:
136137
submodules: recursive
137138
- uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c
138139
with:
139-
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
140+
toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
140141
components: rustfmt
141-
- run: cargo fmt --all -- --check
142+
- env:
143+
RUST_TOOLCHAIN_VERSION: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
144+
run: cargo "+$RUST_TOOLCHAIN_VERSION" fmt --all -- --check
142145

143146
run_clippy:
144147
name: Run Clippy

.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"rust-analyzer.rustfmt.overrideCommand": [
3+
"rustfmt",
4+
"+nightly-2025-01-15",
5+
"--"
6+
],
7+
}

Cargo.nix

Lines changed: 18 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# DO NOT EDIT, this file is generated by operator-templating
22
[toolchain]
3-
channel = "1.84.1"
3+
channel = "1.85.0"

rust/operator-binary/src/config/mod.rs

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ use std::{
44
};
55

66
use jvm::build_merged_jvm_config;
7-
use product_config::{types::PropertyNameKind, ProductConfigManager};
7+
use product_config::{ProductConfigManager, types::PropertyNameKind};
88
use snafu::{ResultExt, Snafu};
99
use stackable_operator::{
1010
commons::resources::Resources,
1111
memory::MemoryQuantity,
1212
product_config_utils::{
13-
transform_all_roles_to_config, validate_all_roles_and_groups_config,
14-
ValidatedRoleConfigByPropertyKind,
13+
ValidatedRoleConfigByPropertyKind, transform_all_roles_to_config,
14+
validate_all_roles_and_groups_config,
1515
},
1616
role_utils::{GenericRoleConfig, JavaCommonConfig, Role},
1717
};
1818
use strum::{Display, EnumIter};
1919

2020
use crate::{
2121
crd::{
22-
v1alpha1, NifiConfig, NifiConfigFragment, NifiRole, NifiStorageConfig, HTTPS_PORT,
23-
PROTOCOL_PORT,
22+
HTTPS_PORT, NifiConfig, NifiConfigFragment, NifiRole, NifiStorageConfig, PROTOCOL_PORT,
23+
v1alpha1,
2424
},
2525
operations::graceful_shutdown::graceful_shutdown_config_properties,
2626
security::{
@@ -64,6 +64,7 @@ impl NifiRepository {
6464
pub fn repository(&self) -> String {
6565
format!("{}-repository", self)
6666
}
67+
6768
pub fn mount_path(&self) -> String {
6869
format!("/stackable/data/{}", self)
6970
}
@@ -695,9 +696,7 @@ mod tests {
695696
"#;
696697
let bootstrap_conf = construct_bootstrap_conf(input);
697698

698-
assert_eq!(
699-
bootstrap_conf,
700-
indoc! {"
699+
assert_eq!(bootstrap_conf, indoc! {"
701700
conf.dir=./conf
702701
graceful.shutdown.seconds=300
703702
java=java
@@ -716,8 +715,7 @@ mod tests {
716715
lib.dir=./lib
717716
preserve.environment=false
718717
run.as=
719-
"}
720-
);
718+
"});
721719
}
722720

723721
#[test]
@@ -763,9 +761,7 @@ mod tests {
763761
"#;
764762
let bootstrap_conf = construct_bootstrap_conf(input);
765763

766-
assert_eq!(
767-
bootstrap_conf,
768-
indoc! {"
764+
assert_eq!(bootstrap_conf, indoc! {"
769765
conf.dir=./conf
770766
graceful.shutdown.seconds=300
771767
java=java
@@ -786,8 +782,7 @@ mod tests {
786782
lib.dir=./lib
787783
preserve.environment=false
788784
run.as=
789-
"}
790-
);
785+
"});
791786
}
792787

793788
fn construct_bootstrap_conf(nifi_cluster: &str) -> String {

0 commit comments

Comments
 (0)