improve(runner): more consistent naming

Author: tvsfx

fortanix-vme/fortanix-vme-runner/src/lib.rs

@@ -14,7 +14,7 @@ use vsock::{self, SockAddr as VsockAddr, Std, Vsock, VsockListener, VsockStream}
 
 mod platforms;
 pub use platforms::{Platform, NitroEnclaves, EnclaveSimulator, EnclaveSimulatorArgs};
-pub use platforms::amdsev::{AmdSevVm, RunningVm, VmRunArgs, VmSimulator};
+pub use platforms::amdsevsnp::{AmdSevVm, RunningVm, VmRunArgs, VmSimulator};
 
 const MAX_LOG_MESSAGE_LEN: usize = 80;
 const PROXY_BUFF_SIZE: usize = 4192;

fortanix-vme/fortanix-vme-runner/src/main.rs

@@ -69,7 +69,7 @@ enum Commands {
     AwsNitro(AwsNitroArgs),
 }
 
-struct AmdSevCli {
+struct AmdSevSnpCli {
     common_args: CommonArgs,
     amd_sev_snp_args: AmdSevSnpArgs,
 }
@@ -81,7 +81,10 @@ struct AwsNitroCli {
 
 #[derive(Clone, Debug, Args)]
 struct AmdSevSnpArgs {
-    #[arg(long = "firmware-image", help = "Path to the firmware image file")]
+    #[arg(
+        long = "firmware-image",
+        help = "Path to the firmware image file, defaulting to the relevant vendored image if not provided"
+    )]
     firmware_image_path: Option<PathBuf>,
 
     #[arg(
@@ -126,7 +129,7 @@ impl AwsNitroCli {
     }
 }
 
-impl AmdSevCli {
+impl AmdSevSnpCli {
     fn to_vm_run_args(&self) -> Result<VmRunArgs> {
         let cpu_count = self.common_args.cpu_count;
         let memory_mib = self.common_args.memory;
@@ -155,7 +158,7 @@ fn main() -> Result<()> {
 
     let common_args = cli.common_args;
     match cli.command {
-        Commands::AmdSevSnp(amd_sev_snp_args) => run_amd_sev_enclave(AmdSevCli {
+        Commands::AmdSevSnp(amd_sev_snp_args) => run_amd_sev_enclave(AmdSevSnpCli {
             common_args,
             amd_sev_snp_args,
         }),
@@ -166,13 +169,14 @@ fn main() -> Result<()> {
     }
 }
 
-fn run_amd_sev_enclave(amd_sev_cli: AmdSevCli) -> Result<()> {
+fn run_amd_sev_enclave(amd_sev_cli: AmdSevSnpCli) -> Result<()> {
     let run_args = amd_sev_cli.to_vm_run_args()?;
-    let AmdSevCli {
+    let AmdSevSnpCli {
         common_args,
         amd_sev_snp_args,
     } = amd_sev_cli;
     if common_args.simulate {
+        info!("running in simulation mode without confidential computing protection");
         run_to_completion::<VmSimulator>(
             run_args,
             amd_sev_snp_args.enclave_name,
@@ -199,7 +203,7 @@ fn run_nitro_enclave(nitro_cli: AwsNitroCli) -> Result<()> {
         let elf = eif.application().context("failed to parse enclave file")?;
         let elf_path = create_elf(elf).context("failed to create executable file")?;
 
-        info!("Simulating enclave as {}", elf_path.display(),);
+        info!("simulating enclave as {}", elf_path.display(),);
         let run_args = EnclaveSimulatorArgs::new(elf_path);
         run_to_completion::<EnclaveSimulator>(
             run_args,

…tanix-vme-runner/src/platforms/amdsev.rs …ix-vme-runner/src/platforms/amdsevsnp.rsfortanix-vme/fortanix-vme-runner/src/platforms/amdsev.rs renamed to fortanix-vme/fortanix-vme-runner/src/platforms/amdsevsnp.rs fortanix-vme/fortanix-vme-runner/src/platforms/amdsev.rs renamed to fortanix-vme/fortanix-vme-runner/src/platforms/amdsevsnp.rs

@@ -1,6 +1,6 @@
 use super::VmeError;
 
-pub(crate) mod amdsev;
+pub(crate) mod amdsevsnp;
 
 mod nitro;
 pub use nitro::NitroEnclaves;

fortanix-vme/fortanix-vme-runner/src/platforms/mod.rs

@@ -3,6 +3,10 @@ name = "elf2uki"
 version = "0.1.0"
 edition = "2021"
 
+[[bin]]
+name = "ftxvme-elf2uki"
+path = "src/main.rs"
+
 [dependencies]
 anyhow = "1.0.100"
 clap = { version = "4.4", features = ["cargo", "derive"] }