chore: Improve code style

Author: siegfriedweber

rust/operator-binary/src/backend/tls/ca.rs

@@ -464,10 +464,10 @@ impl Manager {
         let mut additional_trusted_certificates = vec![];
         for entry in additional_trust_roots {
             let certs = match entry {
-                AdditionalTrustRoot::ConfigMap { config_map } => {
+                AdditionalTrustRoot::ConfigMap(config_map) => {
                     Self::read_certificates_from_config_map(client, config_map).await?
                 }
-                AdditionalTrustRoot::Secret { secret } => {
+                AdditionalTrustRoot::Secret(secret) => {
                     Self::read_certificates_from_secret(client, secret).await?
                 }
             };

rust/operator-binary/src/crd.rs

@@ -149,20 +149,14 @@ pub enum AdditionalTrustRoot {
     /// The extensions of the keys denote its contents: A key suffixed with `.crt` contains a stack
     /// of base64 encoded DER certificates, a key suffixed with `.der` contains a binary DER
     /// certificate.
-    ConfigMap {
-        #[serde(flatten)]
-        config_map: ConfigMapReference,
-    },
+    ConfigMap(ConfigMapReference),
 
     /// Reference (name and namespace) to a Kubernetes Secret object where additional certificates
     /// are stored.
     /// The extensions of the keys denote its contents: A key suffixed with `.crt` contains a stack
     /// of base64 encoded DER certificates, a key suffixed with `.der` contains a binary DER
     /// certificate.
-    Secret {
-        #[serde(flatten)]
-        secret: SecretReference,
-    },
+    Secret(SecretReference),
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -491,18 +485,14 @@ mod test {
                         key_generation: CertificateKeyGeneration::default()
                     },
                     additional_trust_roots: vec![
-                        AdditionalTrustRoot::ConfigMap {
-                            config_map: ConfigMapReference {
-                                name: "tls-root-ca-config-map".to_string(),
-                                namespace: "default".to_string(),
-                            }
-                        },
-                        AdditionalTrustRoot::Secret {
-                            secret: SecretReference {
-                                name: "tls-root-ca-secret".to_string(),
-                                namespace: "default".to_string(),
-                            }
-                        }
+                        AdditionalTrustRoot::ConfigMap(ConfigMapReference {
+                            name: "tls-root-ca-config-map".to_string(),
+                            namespace: "default".to_string(),
+                        }),
+                        AdditionalTrustRoot::Secret(SecretReference {
+                            name: "tls-root-ca-secret".to_string(),
+                            namespace: "default".to_string(),
+                        })
                     ],
                     max_certificate_lifetime: Duration::from_days_unchecked(31),
                 })