Skip to content

Commit 8ad7b39

Browse files
Saul-STFCsbernauer
andauthored
chore: bump Rust edition to 2024 and apply cargo fix + clippy updates (#943)
* chore: bump Rust edition to 2024 and apply cargo fix + clippy updates Run `cargo fix --edition` and resolve resulting warnings: - Add `use<>` syntax to `impl Trait` return types (auto-fixed) - Fix Rust 2024 temporary drop order change by simplifying `_initial_reconcile_rx` handling - Apply rustFMT suggestions * Fix: Update built to address RustSec advisories * Fix: update dependencies for RustSec advisories * Update generated Cargo.nix * Update Cargo.toml Co-authored-by: Sebastian Bernauer <sebastian.bernauer@stackable.tech> --------- Co-authored-by: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
1 parent 1c53f74 commit 8ad7b39

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

Cargo.nix

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resolver = "2"
66
version = "0.0.0-dev"
77
authors = ["Stackable GmbH <info@stackable.tech>"]
88
license = "OSL-3.0"
9-
edition = "2021"
9+
edition = "2024"
1010
repository = "https://github.com/stackabletech/nifi-operator"
1111

1212
[workspace.dependencies]

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,16 @@ pub fn build_merged_jvm_config(
9797
// respects these JVM-wide SSL system properties. So there is no plugin-level configuration
9898
// available for truststore settings. This was last checked for version 1.7.0 of the Styra
9999
// OPA Java SDK.
100-
if let Some(authz_config) = authorization_config {
101-
if authz_config.has_opa_tls() {
102-
operator_generated.push(format!(
103-
"-Djavax.net.ssl.trustStore={STACKABLE_SERVER_TLS_DIR}/truststore.p12"
104-
));
105-
operator_generated.push(format!(
106-
"-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"
107-
));
108-
operator_generated.push("-Djavax.net.ssl.trustStoreType=pkcs12".to_owned());
109-
}
100+
if let Some(authz_config) = authorization_config
101+
&& authz_config.has_opa_tls()
102+
{
103+
operator_generated.push(format!(
104+
"-Djavax.net.ssl.trustStore={STACKABLE_SERVER_TLS_DIR}/truststore.p12"
105+
));
106+
operator_generated.push(format!(
107+
"-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"
108+
));
109+
operator_generated.push("-Djavax.net.ssl.trustStoreType=pkcs12".to_owned());
110110
}
111111

112112
Ok(merged_jvm_argument_overrides.apply_to(operator_generated))

rust/operator-binary/src/webhooks/conversion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub async fn create_webhook_server(
4040
field_manager: FIELD_MANAGER.to_owned(),
4141
};
4242

43-
let (conversion_webhook, _initial_reconcile_rx) =
43+
let (conversion_webhook, _) =
4444
ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
4545

4646
let webhook_server_options = WebhookServerOptions {

0 commit comments

Comments
 (0)