Update test plugin.

moonrepo · Oct 26, 2023 · b1c4da0 · b1c4da0
1 parent 82be6c7
commit b1c4da0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 27 deletions.
diff --git a/crates/pdk-api/src/lib.rs b/crates/pdk-api/src/lib.rs
@@ -10,4 +10,5 @@ pub use hooks::*;
 pub use host::*;
 pub use host_funcs::*;
 pub use system_env::{DependencyConfig, DependencyName, SystemDependency, SystemPackageManager};
+pub use version_spec::*;
 pub use warpgate_api::*;
diff --git a/crates/version-spec/src/lib.rs b/crates/version-spec/src/lib.rs
@@ -25,7 +25,7 @@ pub fn is_alias_name<T: AsRef<str>>(value: T) -> bool {
     })
 }
 
-pub static CLEAN_VERSION: Lazy<Regex> = Lazy::new(|| Regex::new(r"([><]=?)\s+(\d)").unwrap());
+static CLEAN_VERSION: Lazy<Regex> = Lazy::new(|| Regex::new(r"([><]=?)\s+(\d)").unwrap());
 
 pub fn clean_version_string<T: AsRef<str>>(value: T) -> String {
     let value = value.as_ref().trim().replace(".*", "");

diff --git a/plugins/Cargo.lock b/plugins/Cargo.lock
diff --git a/plugins/wasm-test/src/lib.rs b/plugins/wasm-test/src/lib.rs
@@ -44,10 +44,10 @@ pub fn parse_version_file(
 
     if input.file == ".proto-wasm-version" {
         if input.content.starts_with("version=") {
-            version = Some(input.content[8..].into());
+            version = Some(UnresolvedVersionSpec::parse(&input.content[8..])?);
         }
     } else {
-        version = Some(input.content);
+        version = Some(UnresolvedVersionSpec::parse(input.content)?);
     }
 
     Ok(Json(ParseVersionFileOutput { version }))
@@ -148,8 +148,10 @@ pub fn resolve_version(
 ) -> FnResult<Json<ResolveVersionOutput>> {
     let mut output = ResolveVersionOutput::default();
 
-    if input.initial == "node" {
-        output.candidate = Some("latest".into());
+    if let UnresolvedVersionSpec::Alias(alias) = &input.initial {
+        if alias == "node" {
+            output.candidate = Some(UnresolvedVersionSpec::Alias("latest".into()));
+        }
     }
 
     Ok(Json(output))