feat: rename plugin_key to plugin_id in dfinit (#1358)

Signed-off-by: Gaius <gaius.qi@gmail.com>

Author: gaius-qi

Cargo.lock

@@ -12,7 +12,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.0.20"
+version = "1.0.21"
 authors = ["The Dragonfly Developers"]
 homepage = "https://d7y.io/"
 repository = "https://github.com/dragonflyoss/client.git"
@@ -22,13 +22,13 @@ readme = "README.md"
 edition = "2021"
 
 [workspace.dependencies]
-dragonfly-client = { path = "dragonfly-client", version = "1.0.20" }
-dragonfly-client-core = { path = "dragonfly-client-core", version = "1.0.20" }
-dragonfly-client-config = { path = "dragonfly-client-config", version = "1.0.20" }
-dragonfly-client-storage = { path = "dragonfly-client-storage", version = "1.0.20" }
-dragonfly-client-backend = { path = "dragonfly-client-backend", version = "1.0.20" }
-dragonfly-client-util = { path = "dragonfly-client-util", version = "1.0.20" }
-dragonfly-client-init = { path = "dragonfly-client-init", version = "1.0.20" }
+dragonfly-client = { path = "dragonfly-client", version = "1.0.21" }
+dragonfly-client-core = { path = "dragonfly-client-core", version = "1.0.21" }
+dragonfly-client-config = { path = "dragonfly-client-config", version = "1.0.21" }
+dragonfly-client-storage = { path = "dragonfly-client-storage", version = "1.0.21" }
+dragonfly-client-backend = { path = "dragonfly-client-backend", version = "1.0.21" }
+dragonfly-client-util = { path = "dragonfly-client-util", version = "1.0.21" }
+dragonfly-client-init = { path = "dragonfly-client-init", version = "1.0.21" }
 dragonfly-api = "=2.1.65"
 thiserror = "2.0"
 futures = "0.3.31"

Cargo.toml

@@ -64,16 +64,17 @@ impl Containerd {
             .unwrap_or(2);
         info!("containerd version: {}", version);
 
-        let plugin_key = if version == 3 {
+        let plugin_id = if version == 3 {
             "io.containerd.cri.v1.images"
         } else {
             "io.containerd.grpc.v1.cri"
         };
+
         // If containerd supports config_path mode and config_path is not empty,
         // add registries to the certs.d directory.
         if let Some(config_path) = containerd_config
             .get("plugins")
-            .and_then(|plugins| plugins.get(plugin_key))
+            .and_then(|plugins| plugins.get(plugin_id))
             .and_then(|cri| cri.get("registry"))
             .and_then(|registry| registry.get("config_path"))
             .and_then(|config_path| config_path.as_str())
@@ -105,11 +106,9 @@ impl Containerd {
         let mut registry_table = Table::new();
         registry_table.set_implicit(true);
         registry_table.insert("config_path", value(config_path));
-        containerd_config["plugins"][plugin_key]
+        containerd_config["plugins"][plugin_id]
             .as_table_mut()
-            .ok_or(Error::Unknown(
-                format!("{} not found", plugin_key),
-            ))?
+            .ok_or(Error::Unknown(format!("{} not found", plugin_id)))?
             .insert("registry", Item::Table(registry_table));
 
         // Override containerd configuration.
@@ -200,7 +199,7 @@ mod tests {
     use tokio::fs;
 
     #[tokio::test]
-    async fn test_containerd_config_with_existing_config_path() {
+    async fn test_containerd_config_with_v2_config_path() {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
         let certs_dir = temp_dir.path().join("certs.d");
@@ -262,7 +261,7 @@ X-Dragonfly-Registry = "https://registry.example.com"
 
         assert_eq!(contents.trim(), expected_contents.trim());
     }
-    
+
     #[tokio::test]
     async fn test_containerd_config_with_v3_config_path() {
         let temp_dir = TempDir::new().unwrap();