fix: tedge cert create-csr with profile uses the CN of profile's cert

Signed-off-by: Rina Fujino <[email protected]>

Author: rina23q

crates/core/tedge/src/cli/certificate/cli.rs

@@ -3,6 +3,8 @@ use crate::cli::common::CloudArg;
 use camino::Utf8PathBuf;
 use tedge_config::OptionalConfigError;
 use tedge_config::ProfileName;
+use tedge_config::ReadError;
+use tedge_config::TEdgeConfig;
 
 use super::create::CreateCertCmd;
 use super::create_csr::CreateCsrCmd;
@@ -93,11 +95,14 @@ impl BuildCommand for TEdgeCertCli {
                 cloud,
             } => {
                 let cloud: Option<Cloud> = cloud.map(<_>::try_into).transpose()?;
+
                 // Use the current device id if no id is provided
-                let id = match id {
-                    Some(id) => id,
-                    None => config.device.id()?.clone(),
+                let id = if let Some(id) = id {
+                    id
+                } else {
+                    get_device_id_from_config(&config, &cloud)?
                 };
+
                 let cmd = CreateCsrCmd {
                     id,
                     key_path: config.device_key_path(cloud.as_ref())?.to_owned(),
@@ -186,3 +191,17 @@ pub enum UploadCertCli {
         profile: Option<ProfileName>,
     },
 }
+
+fn get_device_id_from_config(
+    config: &TEdgeConfig,
+    cloud: &Option<Cloud>,
+) -> Result<String, ReadError> {
+    let id = match cloud {
+        None => config.device.id(),
+        Some(Cloud::C8y(profile)) => config.c8y.try_get(profile.as_deref())?.device.id(),
+        Some(Cloud::Azure(profile)) => config.az.try_get(profile.as_deref())?.device.id(),
+        Some(Cloud::Aws(profile)) => config.aws.try_get(profile.as_deref())?.device.id(),
+    }?
+    .to_owned();
+    Ok(id)
+}