Support proto v0.42 (#4)

Author: konomae

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "zig_tool"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 license = "MIT"
 publish = false
@@ -9,14 +9,14 @@ publish = false
 crate-type = ['cdylib']
 
 [dependencies]
-extism-pdk = "1.2.1"
-proto_pdk = "0.23.0"
-serde = "1.0.208"
+extism-pdk = "1.3.0"
+proto_pdk = "0.25.2"
+serde = "1.0.214"
 
 [dev-dependencies]
-proto_pdk_test_utils = "0.27.0"
-starbase_sandbox = "0.7.2"
-tokio = { version = "1.39.3", features = ["full"] }
+proto_pdk_test_utils = "0.30.3"
+starbase_sandbox = "0.7.4"
+tokio = { version = "1.41.0", features = ["full"] }
 
 [features]
 default = ["wasm"]

Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
 profile = "default"
-channel = "1.80.0"
+channel = "1.82.0"

rust-toolchain.toml

@@ -1,16 +1,17 @@
 use crate::zig_dist::ZigDist;
 use extism_pdk::*;
 use proto_pdk::*;
+use std::collections::HashMap;
 
 static NAME: &str = "Zig";
-static BIN: &str = "zig";
 
 #[plugin_fn]
 pub fn register_tool(Json(_): Json<ToolMetadataInput>) -> FnResult<Json<ToolMetadataOutput>> {
     Ok(Json(ToolMetadataOutput {
         name: NAME.into(),
         type_of: PluginType::Language,
-        plugin_version: Some(env!("CARGO_PKG_VERSION").into()),
+        minimum_proto_version: Some(Version::new(0, 42, 0)),
+        plugin_version: Version::parse(env!("CARGO_PKG_VERSION")).ok(),
         ..ToolMetadataOutput::default()
     }))
 }
@@ -85,7 +86,10 @@ pub fn locate_executables(
     let env = get_host_environment()?;
 
     Ok(Json(LocateExecutablesOutput {
-        primary: Some(ExecutableConfig::new(env.os.get_file_name(BIN, "exe"))),
+        exes: HashMap::from_iter([(
+            "zig".into(),
+            ExecutableConfig::new_primary(env.os.get_exe_name("zig")),
+        )]),
         ..LocateExecutablesOutput::default()
     }))
 }

src/proto.rs

@@ -306,7 +306,8 @@ async fn locates_unix_bin() {
                 },
             })
             .await
-            .primary
+            .exes
+            .get("zig")
             .unwrap()
             .exe_path,
         Some("zig".into())
@@ -331,7 +332,8 @@ async fn locates_windows_bin() {
                 },
             })
             .await
-            .primary
+            .exes
+            .get("zig")
             .unwrap()
             .exe_path,
         Some("zig.exe".into())

tests/download_test.rs

@@ -8,5 +8,8 @@ async fn registers_metadata() {
     let metadata = plugin.register_tool(ToolMetadataInput::default()).await;
 
     assert_eq!(metadata.name, "Zig");
-    assert_eq!(metadata.plugin_version.unwrap(), env!("CARGO_PKG_VERSION"));
+    assert_eq!(
+        metadata.plugin_version.unwrap().to_string(),
+        env!("CARGO_PKG_VERSION")
+    );
 }

tests/metadata_test.rs

@@ -0,0 +1,4 @@
+use proto_pdk_test_utils::*;
+
+#[cfg(not(windows))]
+generate_shims_test!("zig-test", ["zig"]);

tests/shims_test.rs

@@ -0,0 +1,8 @@
+---
+source: tests/shims_test.rs
+expression: "std :: fs ::\nread_to_string(sandbox.path().join(\".proto/shims/registry.json\")).unwrap()"
+snapshot_kind: text
+---
+{
+  "zig": {}
+}