Merge pull request #3126 from jarhodes314/feat/poc-multiple-c8ys

refactor: add support to `define_tedge_config` for (optionally) multi-value fields

Cargo.toml

@@ -113,6 +113,8 @@ pem = "1.0"
 pin-project = { version = "1.1.3", features = [] }
 plugin_sm = { path = "crates/core/plugin_sm" }
 predicates = "2.1"
+pretty_assertions = "1.4.1"
+prettyplease = "0.2.22"
 proc-macro2 = "1"
 proptest = "1.0"
 quote = "1"

crates/common/axum_tls/src/config.rs

@@ -77,7 +77,7 @@ pub fn load_ssl_config(
  let cert_key = cert_path.key();
  let key_key = key_path.key();
  let ca_key = ca_path.key();
- if let Some((cert, key)) = load_certificate_and_key(cert_path, key_path)? {
+ if let Some((cert, key)) = load_certificate_and_key(&cert_path, &key_path)? {
  let trust_store = match ca_path.or_none() {
  Some(path) => path
  .load_trust_store()
@@ -103,8 +103,8 @@ pub fn load_ssl_config(
 type CertKeyPair = (Vec<Vec<u8>>, Vec<u8>);
 
 fn load_certificate_and_key(
- cert_path: OptionalConfig<impl PemReader>,
- key_path: OptionalConfig<impl PemReader>,
+ cert_path: &OptionalConfig<impl PemReader>,
+ key_path: &OptionalConfig<impl PemReader>,
 ) -> anyhow::Result<Option<CertKeyPair>> {
  let paths = tedge_config::all_or_nothing((cert_path.as_ref(), key_path.as_ref()))
  .map_err(|e| anyhow!("{e}"))?;

crates/common/tedge_config/src/tedge_config_cli/figment.rs

@@ -216,7 +216,7 @@ impl TEdgeEnv {
  tracing::subscriber::NoSubscriber::default(),
  || lowercase_name.parse::<crate::WritableKey>(),
  )
- .map(|key| key.as_str().to_owned())
+ .map(|key| key.to_string())
  .map_err(|err| {
  let is_read_only_key = matches!(err, crate::ParseKeyError::ReadOnly(_));
  if is_read_only_key && !WARNINGS.lock().unwrap().insert(lowercase_name.clone()) {