fte: refactor to reuse crd::s3 anc move resolved struct out of the crd module

Author: razvan

deploy/helm/trino-operator/crds/crds.yaml

@@ -251,16 +251,6 @@ spec:
                                       description: IAM role to assume for S3 access.
                                       nullable: true
                                       type: string
-                                    maxErrorRetries:
-                                      description: Maximum number of times the S3 client should retry a request.
-                                      format: uint32
-                                      minimum: 0.0
-                                      nullable: true
-                                      type: integer
-                                    uploadPartSize:
-                                      description: Part data size for S3 multi-part upload.
-                                      nullable: true
-                                      type: string
                                   required:
                                     - connection
                                   type: object

rust/operator-binary/src/command.rs

@@ -9,23 +9,22 @@ use stackable_operator::{
 use crate::{
     authentication::TrinoAuthenticationConfig,
     catalog::config::CatalogConfig,
-    config::client_protocol,
+    config::{client_protocol, fault_tolerant_execution},
     controller::{STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR},
     crd::{
         CONFIG_DIR_NAME, Container, EXCHANGE_MANAGER_PROPERTIES, LOG_PROPERTIES,
         RW_CONFIG_DIR_NAME, SPOOLING_MANAGER_PROPERTIES, STACKABLE_CLIENT_TLS_DIR,
         STACKABLE_INTERNAL_TLS_DIR, STACKABLE_MOUNT_INTERNAL_TLS_DIR,
         STACKABLE_MOUNT_SERVER_TLS_DIR, STACKABLE_SERVER_TLS_DIR, STACKABLE_TLS_STORE_PASSWORD,
-        SYSTEM_TRUST_STORE, SYSTEM_TRUST_STORE_PASSWORD, TrinoRole,
-        fault_tolerant_execution::ResolvedFaultTolerantExecutionConfig, v1alpha1,
+        SYSTEM_TRUST_STORE, SYSTEM_TRUST_STORE_PASSWORD, TrinoRole, v1alpha1,
     },
 };
 
 pub fn container_prepare_args(
     trino: &v1alpha1::TrinoCluster,
     catalogs: &[CatalogConfig],
     merged_config: &v1alpha1::TrinoConfig,
-    resolved_fte_config: &Option<ResolvedFaultTolerantExecutionConfig>,
+    resolved_fte_config: &Option<fault_tolerant_execution::ResolvedFaultTolerantExecutionConfig>,
     resolved_spooling_config: &Option<client_protocol::ResolvedClientProtocolConfig>,
 ) -> Vec<String> {
     let mut args = vec![];

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

@@ -137,8 +137,6 @@ mod tests {
                     ),
                 iam_role: None,
                 external_id: None,
-                max_error_retries: None,
-                upload_part_size: None,
             }),
         });