chore(core): update CDI dependency

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

Cargo.lock

@@ -78,7 +78,7 @@ rustix = { version = "1.1", features = ["process"] }
 socket2 = "0.6"
 
 # Serialization
-container-device-interface = { git = "https://github.com/cncf-tags/container-device-interface-rs", rev = "06644c1b167c8dcc247816590901e0a819636b01" }
+container-device-interface = { git = "https://github.com/cncf-tags/container-device-interface-rs", rev = "b8a056e92dbd159423c129cd306c93e410651b18" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yml = "0.0.12"

Cargo.toml

@@ -82,8 +82,6 @@ pub enum CdiError {
         device: String,
         refresh_error: String,
     },
-    #[error("selected CDI device '{0}' is defined by multiple mounted CDI specs")]
-    DuplicateDevice(String),
     #[error("failed to merge CDI edits for '{device}': {error}")]
     EditMerge { device: String, error: String },
     #[error("failed to encode resolved CDI edits: {source}")]

crates/openshell-core/src/cdi.rs

@@ -235,9 +235,6 @@ fn resolve_container_edits(
     selected_devices: &[String],
 ) -> Result<CdiContainerEdits, CdiError> {
     let (mut cache, refresh_error) = build_cache(&context.spec_dirs);
-    if let Some(device) = conflicting_selected_device(refresh_error.as_deref(), selected_devices) {
-        return Err(CdiError::DuplicateDevice(device));
-    }
     let mut merged = UpstreamContainerEdits::new();
     let mut applied_specs = BTreeSet::new();
 
@@ -271,21 +268,6 @@ fn resolve_container_edits(
     serde_json::from_value(value).map_err(|source| CdiError::EditDecode { source })
 }
 
-// Temporary compatibility check for the Rust CDI cache revision pinned by
-// OpenShell. That revision records same-priority device conflicts but leaves
-// the conflicted device resolvable. Remove this once OpenShell uses the
-// upstream fix that excludes conflicts from the cache's device map.
-fn conflicting_selected_device(
-    refresh_error: Option<&str>,
-    selected_devices: &[String],
-) -> Option<String> {
-    let refresh_error = refresh_error?;
-    selected_devices
-        .iter()
-        .find(|device| refresh_error.contains(&format!("conflicting device {device} (specs ")))
-        .cloned()
-}
-
 fn missing_device_error(device: &str, refresh_error: Option<&str>) -> CdiError {
     refresh_error.map_or_else(
         || CdiError::MissingDevice(device.to_string()),
@@ -730,7 +712,11 @@ devices:
         )
         .unwrap_err();
 
-        assert!(matches!(err, CdiError::DuplicateDevice(device) if device == "nvidia.com/gpu=0"));
+        assert!(
+            matches!(err, CdiError::MissingDeviceAfterRefresh { device, refresh_error }
+                if device == "nvidia.com/gpu=0"
+                    && refresh_error.contains("conflicting device nvidia.com/gpu=0"))
+        );
     }
 
     #[test]