diff --git a/Cargo.lock b/Cargo.lock index b3185a7d..fec2ffc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler2" @@ -1461,7 +1461,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core", ] [[package]] @@ -4781,7 +4781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ "windows-collections", - "windows-core 0.61.2", + "windows-core", "windows-future", "windows-link 0.1.3", "windows-numerics", @@ -4793,7 +4793,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" dependencies = [ - "windows-core 0.61.2", + "windows-core", ] [[package]] @@ -4805,21 +4805,8 @@ dependencies = [ "windows-implement", "windows-interface", "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-result", + "windows-strings", ] [[package]] @@ -4828,7 +4815,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ - "windows-core 0.61.2", + "windows-core", "windows-link 0.1.3", "windows-threading", ] @@ -4873,7 +4860,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ - "windows-core 0.61.2", + "windows-core", "windows-link 0.1.3", ] @@ -4886,15 +4873,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-strings" version = "0.4.2" @@ -4904,15 +4882,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-sys" version = "0.52.0" diff --git a/Cargo.nix b/Cargo.nix index 85845ee4..d6271bc3 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1238,7 +1238,7 @@ rec { "cert-tools" = rec { crateName = "cert-tools"; version = "0.1.1"; - edition = "2021"; + edition = "2024"; crateBin = [ { name = "cert-tools"; @@ -4714,7 +4714,7 @@ rec { } { name = "windows-core"; - packageId = "windows-core 0.62.2"; + packageId = "windows-core"; target = { target, features }: ("windows" == target."os" or null); } ]; @@ -12242,7 +12242,7 @@ rec { "stackable-krb5-provision-keytab" = rec { crateName = "stackable-krb5-provision-keytab"; version = "0.0.0-dev"; - edition = "2021"; + edition = "2024"; crateBin = [ { name = "stackable-krb5-provision-keytab"; @@ -12559,7 +12559,7 @@ rec { "stackable-secret-operator" = rec { crateName = "stackable-secret-operator"; version = "0.0.0-dev"; - edition = "2021"; + edition = "2024"; crateBin = [ { name = "stackable-secret-operator"; @@ -12748,7 +12748,7 @@ rec { "stackable-secret-operator-olm-deployer" = rec { crateName = "stackable-secret-operator-olm-deployer"; version = "0.0.0-dev"; - edition = "2021"; + edition = "2024"; crateBin = [ { name = "stackable-secret-operator-olm-deployer"; @@ -12813,7 +12813,7 @@ rec { "stackable-secret-operator-utils" = rec { crateName = "stackable-secret-operator-utils"; version = "0.0.0-dev"; - edition = "2021"; + edition = "2024"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/utils; }; libName = "stackable_secret_operator_utils"; authors = [ @@ -16823,7 +16823,7 @@ rec { } { name = "windows-core"; - packageId = "windows-core 0.61.2"; + packageId = "windows-core"; usesDefaultFeatures = false; } { @@ -17547,7 +17547,7 @@ rec { dependencies = [ { name = "windows-core"; - packageId = "windows-core 0.61.2"; + packageId = "windows-core"; usesDefaultFeatures = false; } ]; @@ -17555,7 +17555,7 @@ rec { "default" = [ "std" ]; }; }; - "windows-core 0.61.2" = rec { + "windows-core" = rec { crateName = "windows-core"; version = "0.61.2"; edition = "2021"; @@ -17582,51 +17582,12 @@ rec { } { name = "windows-result"; - packageId = "windows-result 0.3.4"; - usesDefaultFeatures = false; - } - { - name = "windows-strings"; - packageId = "windows-strings 0.4.2"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "std" ]; - "std" = [ "windows-result/std" "windows-strings/std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; - "windows-core 0.62.2" = rec { - crateName = "windows-core"; - version = "0.62.2"; - edition = "2021"; - sha256 = "1swxpv1a8qvn3bkxv8cn663238h2jccq35ff3nsj61jdsca3ms5q"; - libName = "windows_core"; - dependencies = [ - { - name = "windows-implement"; - packageId = "windows-implement"; - usesDefaultFeatures = false; - } - { - name = "windows-interface"; - packageId = "windows-interface"; - usesDefaultFeatures = false; - } - { - name = "windows-link"; - packageId = "windows-link 0.2.1"; - usesDefaultFeatures = false; - } - { - name = "windows-result"; - packageId = "windows-result 0.4.1"; + packageId = "windows-result"; usesDefaultFeatures = false; } { name = "windows-strings"; - packageId = "windows-strings 0.5.1"; + packageId = "windows-strings"; usesDefaultFeatures = false; } ]; @@ -17645,7 +17606,7 @@ rec { dependencies = [ { name = "windows-core"; - packageId = "windows-core 0.61.2"; + packageId = "windows-core"; usesDefaultFeatures = false; } { @@ -17745,7 +17706,7 @@ rec { dependencies = [ { name = "windows-core"; - packageId = "windows-core 0.61.2"; + packageId = "windows-core"; usesDefaultFeatures = false; } { @@ -17758,7 +17719,7 @@ rec { "default" = [ "std" ]; }; }; - "windows-result 0.3.4" = rec { + "windows-result" = rec { crateName = "windows-result"; version = "0.3.4"; edition = "2021"; @@ -17779,25 +17740,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "windows-result 0.4.1" = rec { - crateName = "windows-result"; - version = "0.4.1"; - edition = "2021"; - sha256 = "1d9yhmrmmfqh56zlj751s5wfm9a2aa7az9rd7nn5027nxa4zm0bp"; - libName = "windows_result"; - dependencies = [ - { - name = "windows-link"; - packageId = "windows-link 0.2.1"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; - "windows-strings 0.4.2" = rec { + "windows-strings" = rec { crateName = "windows-strings"; version = "0.4.2"; edition = "2021"; @@ -17818,24 +17761,6 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "windows-strings 0.5.1" = rec { - crateName = "windows-strings"; - version = "0.5.1"; - edition = "2021"; - sha256 = "14bhng9jqv4fyl7lqjz3az7vzh8pw0w4am49fsqgcz67d67x0dvq"; - libName = "windows_strings"; - dependencies = [ - { - name = "windows-link"; - packageId = "windows-link 0.2.1"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; "windows-sys 0.52.0" = rec { crateName = "windows-sys"; version = "0.52.0"; diff --git a/Cargo.toml b/Cargo.toml index 49b78bee..51bbe86f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ resolver = "2" version = "0.0.0-dev" authors = ["Stackable GmbH "] license = "OSL-3.0" -edition = "2021" +edition = "2024" repository = "https://github.com/stackabletech/secret-operator" [workspace.dependencies] diff --git a/rust/krb5-provision-keytab/src/credential_cache.rs b/rust/krb5-provision-keytab/src/credential_cache.rs index 01f9d498..44d1a9b0 100644 --- a/rust/krb5-provision-keytab/src/credential_cache.rs +++ b/rust/krb5-provision-keytab/src/credential_cache.rs @@ -94,10 +94,9 @@ impl CredentialCache { .expect("key was just confirmed to exist in cache"))) } else { tracing::info!("credential not found in cache, generating..."); - match mk_value(Ctx { + match TryFutureExt::into_future(mk_value(Ctx { cache_ref: self.cache_ref.clone(), - }) - .into_future() + })) .await { Ok(value) => { diff --git a/rust/operator-binary/src/crd/secret_class/v1alpha1_impl.rs b/rust/operator-binary/src/crd/secret_class/v1alpha1_impl.rs index 2c9b80fe..75c0dcbd 100644 --- a/rust/operator-binary/src/crd/secret_class/v1alpha1_impl.rs +++ b/rust/operator-binary/src/crd/secret_class/v1alpha1_impl.rs @@ -20,7 +20,7 @@ impl SecretClassBackend { pub fn refers_to_config_map( &self, config_map: &PartialObjectMeta, - ) -> impl Iterator { + ) -> impl Iterator + use<> { let cm_namespace = config_map.metadata.namespace.as_deref(); match self { Self::K8sSearch(backend) => { @@ -40,7 +40,7 @@ impl SecretClassBackend { pub fn refers_to_secret( &self, secret: &PartialObjectMeta, - ) -> impl Iterator { + ) -> impl Iterator + use<> { match self { Self::AutoTls(backend) => { (backend.ca.secret == *secret).then_some(SearchNamespaceMatchCondition::True) diff --git a/rust/operator-binary/src/crd/secret_class/v1alpha2_impl.rs b/rust/operator-binary/src/crd/secret_class/v1alpha2_impl.rs index dc644750..22aaedf6 100644 --- a/rust/operator-binary/src/crd/secret_class/v1alpha2_impl.rs +++ b/rust/operator-binary/src/crd/secret_class/v1alpha2_impl.rs @@ -26,7 +26,7 @@ impl SecretClassBackend { pub fn refers_to_config_map( &self, config_map: &PartialObjectMeta, - ) -> impl Iterator { + ) -> impl Iterator + use<> { let cm_namespace = config_map.metadata.namespace.as_deref(); match self { Self::K8sSearch(backend) => { @@ -46,7 +46,7 @@ impl SecretClassBackend { pub fn refers_to_secret( &self, secret: &PartialObjectMeta, - ) -> impl Iterator { + ) -> impl Iterator + use<> { match self { Self::AutoTls(backend) => { (backend.ca.secret == *secret).then_some(SearchNamespaceMatchCondition::True) diff --git a/rust/operator-binary/src/utils.rs b/rust/operator-binary/src/utils.rs index 637377be..8e018d05 100644 --- a/rust/operator-binary/src/utils.rs +++ b/rust/operator-binary/src/utils.rs @@ -121,6 +121,7 @@ pub fn error_full_message(err: &dyn std::error::Error) -> String { } /// Propagates `Ok(true)` and `Err(_)` from `stream`, otherwise returns `Ok(false)`. +#[allow(tail_expr_drop_order)] pub async fn trystream_any>, E>(stream: S) -> Result { pin_mut!(stream); while let Some(value) = stream.next().await { diff --git a/rust/p12/src/lib.rs b/rust/p12/src/lib.rs index 30a2006b..610cbd9a 100644 --- a/rust/p12/src/lib.rs +++ b/rust/p12/src/lib.rs @@ -635,7 +635,7 @@ fn pbepkcs12sha1core(d: &[u8], i: &[u8], a: &mut Vec, iterations: u64) -> Ve a.append(&mut ai.clone()); ai } - +#[allow(clippy::manual_div_ceil)] // This is a fork, ignoring errors #[allow(clippy::many_single_char_names)] fn pbepkcs12sha1(pass: &[u8], salt: &[u8], iterations: u64, id: u8, size: u64) -> Vec { const U: u64 = 160 / 8;