remove crd::s3 which included iam fields

Author: razvan

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

@@ -132,8 +132,7 @@ mod tests {
               location: s3://my-bucket/spooling
               filesystem:
                 s3:
-                  connection:
-                    reference: test-s3-connection
+                  reference: test-s3-connection
         "#};
 
         let deserializer = serde_yaml::Deserializer::from_str(config_yaml);

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

@@ -212,16 +212,6 @@ impl ResolvedFaultTolerantExecutionConfig {
                         s3_exchange_config.base_directories.join(","),
                     );
 
-                    Self::insert_if_present(
-                        &mut exchange_manager_properties,
-                        "exchange.s3.iam-role",
-                        s3_exchange_config.s3_config.iam_role.as_ref(),
-                    );
-                    Self::insert_if_present(
-                        &mut exchange_manager_properties,
-                        "exchange.s3.external-id",
-                        s3_exchange_config.s3_config.external_id.as_ref(),
-                    );
                     Self::insert_if_present(
                         &mut exchange_manager_properties,
                         "exchange.s3.max-error-retries",
@@ -285,7 +275,7 @@ impl ResolvedFaultTolerantExecutionConfig {
             match &exchange_config.backend {
                 ExchangeManagerBackend::S3(s3_config) => {
                     let resolved_s3_config = config::s3::ResolvedS3Config::from_config(
-                        &s3_config.s3_config,
+                        &s3_config.connection,
                         client,
                         namespace,
                     )
@@ -339,12 +329,9 @@ mod tests {
     use stackable_operator::shared::time::Duration;
 
     use super::*;
-    use crate::crd::{
-        fault_tolerant_execution::{
-            ExchangeManagerConfig, LocalExchangeConfig, QueryRetryConfig, S3ExchangeConfig,
-            TaskRetryConfig,
-        },
-        s3::S3Config,
+    use crate::crd::fault_tolerant_execution::{
+        ExchangeManagerConfig, LocalExchangeConfig, QueryRetryConfig, S3ExchangeConfig,
+        TaskRetryConfig,
     };
 
     #[tokio::test]
@@ -481,12 +468,9 @@ mod tests {
                     base_directories: vec!["s3://my-bucket/exchange".to_string()],
                     max_error_retries: Some(5),
                     upload_part_size: Some(Quantity("10Mi".to_string())),
-                    s3_config: S3Config { connection: stackable_operator::crd::s3::v1alpha1::InlineConnectionOrReference::Reference(
+                    connection: stackable_operator::crd::s3::v1alpha1::InlineConnectionOrReference::Reference(
                         "test-s3-connection".to_string()
                     ),
-                    iam_role: Some("arn:aws:iam::123456789012:role/TrinoRole".to_string()),
-                    external_id: Some("external-id-123".to_string()),
-                    }
                 }),
             },
         });
@@ -520,18 +504,6 @@ mod tests {
             Some(&"s3://my-bucket/exchange".to_string())
         );
 
-        assert_eq!(
-            fte_config
-                .exchange_manager_properties
-                .get("exchange.s3.iam-role"),
-            Some(&"arn:aws:iam::123456789012:role/TrinoRole".to_string())
-        );
-        assert_eq!(
-            fte_config
-                .exchange_manager_properties
-                .get("exchange.s3.external-id"),
-            Some(&"external-id-123".to_string())
-        );
         assert_eq!(
             fte_config
                 .exchange_manager_properties

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

@@ -8,10 +8,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::{Volume, VolumeMount},
 };
 
-use crate::{
-    command,
-    crd::{STACKABLE_CLIENT_TLS_DIR, s3 as trino_s3},
-};
+use crate::{command, crd::STACKABLE_CLIENT_TLS_DIR};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -49,7 +46,7 @@ impl ResolvedS3Config {
     /// Resolve S3 connection properties from Kubernetes resources
     /// and prepare spooling filesystem configuration.
     pub async fn from_config(
-        config: &trino_s3::S3Config,
+        connection: &stackable_operator::crd::s3::v1alpha1::InlineConnectionOrReference,
         client: &Client,
         namespace: &str,
     ) -> Result<Self, Error> {
@@ -60,8 +57,7 @@ impl ResolvedS3Config {
             init_container_extra_start_commands: Vec::new(),
         };
 
-        let s3_connection = config
-            .connection
+        let s3_connection = connection
             .clone()
             .resolve(client, namespace)
             .await

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

@@ -3,8 +3,6 @@
 use serde::{Deserialize, Serialize};
 use stackable_operator::schemars::{self, JsonSchema};
 
-use crate::crd::s3::S3Config;
-
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum ClientProtocolConfig {
@@ -24,5 +22,5 @@ pub struct ClientSpoolingProtocolConfig {
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum SpoolingFileSystemConfig {
-    S3(S3Config),
+    S3(stackable_operator::crd::s3::v1alpha1::InlineConnectionOrReference),
 }

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

@@ -13,7 +13,6 @@ use stackable_operator::{
 };
 
 use super::catalog::commons::HdfsConnection;
-use crate::crd::s3::S3Config;
 
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -142,8 +141,7 @@ pub struct S3ExchangeConfig {
 
     /// S3 connection configuration.
     /// Learn more about S3 configuration in the [S3 concept docs](DOCS_BASE_URL_PLACEHOLDER/concepts/s3).
-    #[serde(flatten)]
-    pub s3_config: S3Config,
+    pub connection: stackable_operator::crd::s3::v1alpha1::InlineConnectionOrReference,
 }
 
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]

rust/operator-binary/src/crd/fault_tolerant_execution.rs

@@ -4,7 +4,6 @@ pub mod catalog;
 pub mod client_protocol;
 pub mod discovery;
 pub mod fault_tolerant_execution;
-pub mod s3;
 
 use std::{collections::BTreeMap, ops::Div, str::FromStr};