to-squash: address comments confidential-containers#1

Author: manuelh-dev

confidential-data-hub/hub/src/storage/drivers/luks2.rs

@@ -12,7 +12,7 @@
 
 use std::path::Path;
 
-use anyhow::{bail, Context};
+use anyhow::Context;
 use libcryptsetup_rs::consts::flags::{CryptActivate, CryptDeactivate, CryptVolumeKey};
 use libcryptsetup_rs::consts::vals::EncryptionFormat;
 use libcryptsetup_rs::{CryptInit, CryptParamsLuks2, CryptParamsLuks2Ref};
@@ -135,12 +135,7 @@ fn init_device(
     header_path: Option<&Path>,
 ) -> anyhow::Result<libcryptsetup_rs::CryptDevice> {
     let device_paths = match header_path {
-        Some(header_path) => {
-            if !header_path.exists() {
-                bail!("LUKS header file not found: {}", header_path.display());
-            }
-            libcryptsetup_rs::Either::Right((header_path, device_path))
-        }
+        Some(header_path) => libcryptsetup_rs::Either::Right((header_path, device_path)),
         None => libcryptsetup_rs::Either::Left(device_path),
     };
 

confidential-data-hub/hub/src/storage/volume_type/blockdevice/mod.rs

@@ -143,19 +143,12 @@ pub(crate) fn prepare_luks_header_file(
     device_path: &Path,
 ) -> Result<std::path::PathBuf> {
     let header_path = luks_header_path(device_id, device_path);
-    if header_path.exists() {
-        return Err(std::io::Error::new(
-            std::io::ErrorKind::AlreadyExists,
-            format!("LUKS header file already exists: {}", header_path.display()),
-        )
-        .into());
-    }
     if let Some(parent) = header_path.parent() {
         std::fs::create_dir_all(parent)?;
     }
     // error "LUKS header file not found: <path/to/header>" from libcryptsetup if header file doesn't exist.
     let file = std::fs::OpenOptions::new()
-        .create(true)
+        .create_new(true)
         .write(true)
         .open(&header_path)?;
     // error "Device ... is too small" / OS error 5" from libcryptsetup if header isn't sized.