chore: Update templated files (f1f1a9e) (#730)

* 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 7102f3f.

* Revert "ci: use nightly toolchain for cargo udeps"

This reverts commit bf3d30a.

---------

Co-authored-by: Nick Larsen <[email protected]>

Author: stackable-bot

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

@@ -1,4 +1,4 @@
-# Bump Rust Dependencies for Stackable Release XX.(X)X
+# Bump Rust Dependencies for Stackable Release YY.M.X
 
 <!--
     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>
 
 ```[tasklist]
 ### Bump Rust Dependencies
-- [ ] Bump `stackable-operator` and friends.
-- [ ] Bump `product-version`.
-- [ ] Bump all other dependencies.
+- [ ] Bump `stackable-operator` and friends
+- [ ] Bump `product-config`
+- [ ] Bump all other dependencies
 ```

.github/workflows/build.yml

@@ -26,7 +26,8 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: '0'
   CARGO_PROFILE_DEV_DEBUG: '0'
-  RUST_TOOLCHAIN_VERSION: "1.84.1"
+  RUST_TOOLCHAIN_VERSION: "1.85.0"
+  RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-01-15"
   PYTHON_VERSION: "3.12"
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: "-D warnings"
@@ -136,9 +137,11 @@ jobs:
           submodules: recursive
       - uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c
         with:
-          toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
           components: rustfmt
-      - run: cargo fmt --all -- --check
+      - env:
+          RUST_TOOLCHAIN_VERSION: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
+        run: cargo "+$RUST_TOOLCHAIN_VERSION" fmt --all -- --check
 
   run_clippy:
     name: Run Clippy

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "rustfmt",
+        "+nightly-2025-01-15",
+        "--"
+    ],
+}

nix/sources.json

@@ -1,3 +1,3 @@
 # DO NOT EDIT, this file is generated by operator-templating
 [toolchain]
-channel = "1.84.1"
+channel = "1.85.0"

rust-toolchain.toml

@@ -13,14 +13,14 @@ use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     builder::{
         self,
-        pod::{container::ContainerBuilder, PodBuilder},
+        pod::{PodBuilder, container::ContainerBuilder},
     },
     commons::{
         authentication::{AuthenticationClass, AuthenticationClassProvider},
         product_image_selection::ResolvedProductImage,
     },
     k8s_openapi::api::core::v1::{Container, EnvVar, Volume, VolumeMount},
-    kube::{runtime::reflector::ObjectRef, ResourceExt},
+    kube::{ResourceExt, runtime::reflector::ObjectRef},
 };
 use strum::EnumDiscriminants;
 use tracing::trace;
@@ -29,11 +29,11 @@ use crate::{
     authentication::{
         oidc::{OidcAuthenticator, TrinoOidcAuthentication},
         password::{
-            file::FileAuthenticator, ldap::LdapAuthenticator, TrinoPasswordAuthentication,
-            TrinoPasswordAuthenticator,
+            TrinoPasswordAuthentication, TrinoPasswordAuthenticator, file::FileAuthenticator,
+            ldap::LdapAuthenticator,
         },
     },
-    crd::{authentication::ResolvedAuthenticationClassRef, TrinoRole},
+    crd::{TrinoRole, authentication::ResolvedAuthenticationClassRef},
 };
 
 pub(crate) mod oidc;
@@ -44,7 +44,9 @@ const HTTP_SERVER_AUTHENTICATION_TYPE: &str = "http-server.authentication.type";
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-    #[snafu(display("The Trino Operator does not support the AuthenticationClass provider [{authentication_class_provider}] from AuthenticationClass [{authentication_class}]."))]
+    #[snafu(display(
+        "The Trino Operator does not support the AuthenticationClass provider [{authentication_class_provider}] from AuthenticationClass [{authentication_class}]."
+    ))]
     AuthenticationClassProviderNotSupported {
         authentication_class_provider: String,
         authentication_class: ObjectRef<AuthenticationClass>,
@@ -61,7 +63,9 @@ pub enum Error {
     #[snafu(display("Failed to configure trino OAuth2 authentication"))]
     InvalidOauth2AuthenticationConfig { source: oidc::Error },
 
-    #[snafu(display("OIDC authentication details not specified. The AuthenticationClass {auth_class_name:?} uses an OIDC provider, you need to specify OIDC authentication details (such as client credentials) as well"))]
+    #[snafu(display(
+        "OIDC authentication details not specified. The AuthenticationClass {auth_class_name:?} uses an OIDC provider, you need to specify OIDC authentication details (such as client credentials) as well"
+    ))]
     OidcAuthenticationDetailsNotSpecified { auth_class_name: String },
 
     #[snafu(display("failed to add needed volume"))]
@@ -740,9 +744,11 @@ mod tests {
     #[test]
     fn test_trino_password_authenticator_config_files() {
         // Nothing for workers
-        assert!(setup_authentication_config()
-            .config_files(&TrinoRole::Worker)
-            .is_empty());
+        assert!(
+            setup_authentication_config()
+                .config_files(&TrinoRole::Worker)
+                .is_empty()
+        );
 
         // coordinators
         let config_files = setup_authentication_config().config_files(&TrinoRole::Coordinator);
@@ -791,12 +797,16 @@ mod tests {
     #[test]
     fn test_trino_password_authenticator_volume_mounts() {
         // nothing for workers
-        assert!(setup_authentication_config()
-            .volume_mounts(&TrinoRole::Worker, &crate::crd::Container::Trino,)
-            .is_empty());
-        assert!(setup_authentication_config()
-            .volume_mounts(&TrinoRole::Worker, &crate::crd::Container::Prepare,)
-            .is_empty());
+        assert!(
+            setup_authentication_config()
+                .volume_mounts(&TrinoRole::Worker, &crate::crd::Container::Trino,)
+                .is_empty()
+        );
+        assert!(
+            setup_authentication_config()
+                .volume_mounts(&TrinoRole::Worker, &crate::crd::Container::Prepare,)
+                .is_empty()
+        );
 
         // coordinator - main container
         let coordinator_main_mounts = setup_authentication_config()
@@ -817,12 +827,16 @@ mod tests {
         let auth_config_with_ldap_bind = setup_authentication_config_bind_credentials();
 
         // nothing for workers
-        assert!(auth_config
-            .commands(&TrinoRole::Worker, &crate::crd::Container::Trino)
-            .is_empty());
-        assert!(auth_config_with_ldap_bind
-            .commands(&TrinoRole::Worker, &crate::crd::Container::Trino)
-            .is_empty());
+        assert!(
+            auth_config
+                .commands(&TrinoRole::Worker, &crate::crd::Container::Trino)
+                .is_empty()
+        );
+        assert!(
+            auth_config_with_ldap_bind
+                .commands(&TrinoRole::Worker, &crate::crd::Container::Trino)
+                .is_empty()
+        );
 
         // we expect 0 entries because no bind credentials env export
         assert_eq!(

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

@@ -7,7 +7,7 @@ use stackable_operator::commons::{authentication::oidc, tls_verification::TlsCli
 use crate::{
     authentication::TrinoAuthenticationConfig,
     command,
-    crd::{TrinoRole, STACKABLE_CLIENT_TLS_DIR},
+    crd::{STACKABLE_CLIENT_TLS_DIR, TrinoRole},
 };
 
 // Trino properties

rust/operator-binary/src/authentication/oidc/mod.rs

@@ -16,10 +16,10 @@ use tracing::trace;
 
 use crate::{
     authentication::{
-        password::{file::FileAuthenticator, ldap::LdapAuthenticator},
         TrinoAuthenticationConfig,
+        password::{file::FileAuthenticator, ldap::LdapAuthenticator},
     },
-    crd::{Container, TrinoRole, RW_CONFIG_DIR_NAME},
+    crd::{Container, RW_CONFIG_DIR_NAME, TrinoRole},
 };
 
 pub mod file;
@@ -299,24 +299,32 @@ mod tests {
         // check file auth
         assert_eq!(
             config_files.get(&file_auth_1.config_file_name()).unwrap(),
-            &format!("file.password-file=/stackable/users/{FILE_AUTH_CLASS_1}.db\npassword-authenticator.name=file\n")
+            &format!(
+                "file.password-file=/stackable/users/{FILE_AUTH_CLASS_1}.db\npassword-authenticator.name=file\n"
+            )
         );
         // check ldap
-        assert!(config_files
-            .get(&ldap_auth_1.config_file_name())
-            .unwrap()
-            .contains("password-authenticator.name=ldap"));
+        assert!(
+            config_files
+                .get(&ldap_auth_1.config_file_name())
+                .unwrap()
+                .contains("password-authenticator.name=ldap")
+        );
 
         // Coordinator
-        assert!(!auth_config
-            .volume_mounts(&TrinoRole::Coordinator, &Container::Trino)
-            .is_empty());
+        assert!(
+            !auth_config
+                .volume_mounts(&TrinoRole::Coordinator, &Container::Trino)
+                .is_empty()
+        );
         assert!(!auth_config.volumes().is_empty());
 
         // Nothing to be set for workers
-        assert!(auth_config
-            .volume_mounts(&TrinoRole::Worker, &Container::Trino)
-            .is_empty());
+        assert!(
+            auth_config
+                .volume_mounts(&TrinoRole::Worker, &Container::Trino)
+                .is_empty()
+        );
         assert!(auth_config.config_files(&TrinoRole::Worker).is_empty());
     }
 }

rust/operator-binary/src/authentication/password/mod.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use stackable_operator::client::Client;
 
-use super::{config::CatalogConfig, FromTrinoCatalogError, ToCatalogConfig};
+use super::{FromTrinoCatalogError, ToCatalogConfig, config::CatalogConfig};
 use crate::crd::catalog::black_hole::BlackHoleConnector;
 
 pub const CONNECTOR_NAME: &str = "blackhole";

rust/operator-binary/src/catalog/black_hole.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use snafu::{ensure, OptionExt, ResultExt};
+use snafu::{OptionExt, ResultExt, ensure};
 use stackable_operator::{
     builder::pod::volume::{VolumeBuilder, VolumeMountBuilder},
     client::Client,
@@ -11,19 +11,19 @@ use stackable_operator::{
 };
 
 use super::{
+    ExtendCatalogConfig, FromTrinoCatalogError,
     config::CatalogConfig,
     from_trino_catalog_error::{
         ConfigureS3Snafu, FailedToGetDiscoveryConfigMapDataKeySnafu,
         FailedToGetDiscoveryConfigMapDataSnafu, FailedToGetDiscoveryConfigMapSnafu,
         ObjectHasNoNamespaceSnafu, S3TlsNoVerificationNotSupportedSnafu, S3TlsRequiredSnafu,
     },
-    ExtendCatalogConfig, FromTrinoCatalogError,
 };
 use crate::{
     command,
     crd::{
-        catalog::commons::{HdfsConnection, MetastoreConnection},
         CONFIG_DIR_NAME, STACKABLE_CLIENT_TLS_DIR,
+        catalog::commons::{HdfsConnection, MetastoreConnection},
     },
 };