chore: Bumps versions for patch release

thomastaylor312 · thomastaylor312 · commit 2113aa3781c4 · 2025-01-30T12:59:42.000-05:00
I also did a little housekeeping here to fix a bunch of clippy lints and
updated the flake inputs

Signed-off-by: Taylor Thomas &lt;taylor@cosmonic.com&gt;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        nats_version: [2.10.7]
+        nats_version: [2.10.22]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -39,8 +39,11 @@ jobs:
             echo 'Wadm JSON Schema is out of date. Please run `cargo run --bin wadm-schema` and commit the changes.'
             exit 1
           fi
-      - name: Install wash
-        uses: wasmCloud/common-actions/install-wash@bc9f2b3966835575aa6f70faafd9efb8e24992c4 # main
+      
+      - name: install wash
+        uses: taiki-e/install-action@afbe5c171504ec183ad2e090b35cac157c65592e # v2.47.30
+        with:
+          tool: wash@0.38.0
 
       # GH Actions doesn't currently support passing args to service containers and there is no way
       # to use an environment variable to turn on jetstream for nats, so we manually start it here
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/wasmcloud/wadm"
 default-run = "wadm"
 
 [workspace.package]
-version = "0.20.0"
+version = "0.20.1"
 
 [features]
 default = []
@@ -83,9 +83,9 @@ tracing-subscriber = { version = "0.3.7", features = ["env-filter", "json"] }
 ulid = { version = "1", features = ["serde"] }
 utoipa = "5"
 uuid = "1"
-wadm = { version = "0.20.0", path = "./crates/wadm"}
-wadm-client = { version = "0.8.0", path = "./crates/wadm-client" }
-wadm-types = { version = "0.8.0", path = "./crates/wadm-types" }
+wadm = { version = "0.20.1", path = "./crates/wadm" }
+wadm-client = { version = "0.8.1", path = "./crates/wadm-client" }
+wadm-types = { version = "0.8.1", path = "./crates/wadm-types" }
 wasmcloud-control-interface = { version = "2.3.0" }
 wasmcloud-secrets-types = "0.5.0"
 wit-bindgen-wrpc = { version = "0.9", default-features = false }
diff --git a/crates/wadm-client/Cargo.toml b/crates/wadm-client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wadm-client"
 description = "A client library for interacting with the wadm API"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 authors = ["wasmCloud Team"]
 keywords = ["webassembly", "wasmcloud", "wadm"]
diff --git a/crates/wadm-types/Cargo.toml b/crates/wadm-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wadm-types"
 description = "Types and validators for the wadm API"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 authors = ["wasmCloud Team"]
 keywords = ["webassembly", "wasmcloud", "wadm"]
diff --git a/crates/wadm-types/src/validation.rs b/crates/wadm-types/src/validation.rs
@@ -759,13 +759,13 @@ fn get_deprecated_configs(component: &serde_yaml::Value) -> Vec<ValidationFailur
                     }
                 }
                 if let Some(trait_properties) = trait_.get("properties") {
-                    if let Some(_) = trait_properties.get("source_config") {
+                    if trait_properties.get("source_config").is_some() {
                         failures.push(ValidationFailure {
                             level: ValidationFailureLevel::Warning,
                             msg: "one of the components' link trait contains a source_config key, please use source:config: rather".to_string(),
                         });
                     }
-                    if let Some(_) = trait_properties.get("target_config") {
+                    if trait_properties.get("target_config").is_some() {
                         failures.push(ValidationFailure {
                             level: ValidationFailureLevel::Warning,
                             msg: "one of the components' link trait contains a target_config key, please use target:config: rather".to_string(),
diff --git a/crates/wadm/src/lib.rs b/crates/wadm/src/lib.rs
@@ -388,7 +388,6 @@ pub async fn start_wadm(config: WadmConfig) -> Result<JoinSet<Result<()>>> {
                         continue;
                     }
                 };
-                let svc = svc.clone();
                 if let Err(err) = srv.serve_connection(TokioIo::new(stream), svc).await {
                     tracing::error!(?err, "failed to serve HTTP administration connection");
                 }
diff --git a/crates/wadm/src/scaler/daemonscaler/provider.rs b/crates/wadm/src/scaler/daemonscaler/provider.rs
@@ -696,7 +696,7 @@ mod test {
             .await?;
 
         spreadscaler
-            .handle_event(&&Event::ProviderHealthCheckPassed(
+            .handle_event(&Event::ProviderHealthCheckPassed(
                 ProviderHealthCheckPassed {
                     data: ProviderHealthCheckInfo {
                         provider_id: provider_id.to_string(),
diff --git a/crates/wadm/src/scaler/spreadscaler/provider.rs b/crates/wadm/src/scaler/spreadscaler/provider.rs
@@ -1397,7 +1397,7 @@ mod test {
             .await?;
 
         spreadscaler
-            .handle_event(&&Event::ProviderHealthCheckPassed(
+            .handle_event(&Event::ProviderHealthCheckPassed(
                 ProviderHealthCheckPassed {
                     data: ProviderHealthCheckInfo {
                         provider_id: provider_id.to_string(),
diff --git a/crates/wadm/src/workers/event.rs b/crates/wadm/src/workers/event.rs
@@ -1507,16 +1507,8 @@ mod test {
             2,
             "Should still have 2 components in state"
         );
-        assert_component(
-            &components,
-            &component_1_id,
-            &[(host1_id, 2), (host2_id, 2)],
-        );
-        assert_component(
-            &components,
-            &component_2_id,
-            &[(host1_id, 2), (host2_id, 2)],
-        );
+        assert_component(&components, component_1_id, &[(host1_id, 2), (host2_id, 2)]);
+        assert_component(&components, component_2_id, &[(host1_id, 2), (host2_id, 2)]);
 
         /***********************************************************/
         /************** Component Scale Down Tests *****************/
@@ -1543,12 +1535,8 @@ mod test {
             2,
             "Should still have 2 components in state"
         );
-        assert_component(&components, &component_1_id, &[(host2_id, 2)]);
-        assert_component(
-            &components,
-            &component_2_id,
-            &[(host1_id, 2), (host2_id, 2)],
-        );
+        assert_component(&components, component_1_id, &[(host2_id, 2)]);
+        assert_component(&components, component_2_id, &[(host1_id, 2), (host2_id, 2)]);
 
         let host = store
             .get::<Host>(lattice_id, host2_id)
@@ -1572,11 +1560,7 @@ mod test {
         let components = store.list::<Component>(lattice_id).await.unwrap();
         assert_eq!(components.len(), 1, "Should only have 1 component in state");
         // Double check the the old one is still ok
-        assert_component(
-            &components,
-            &component_2_id,
-            &[(host1_id, 2), (host2_id, 2)],
-        );
+        assert_component(&components, component_2_id, &[(host1_id, 2), (host2_id, 2)]);
 
         /***********************************************************/
         /******************* Provider Stop Tests *******************/
@@ -1735,11 +1719,7 @@ mod test {
         // Double check providers and components are the same
         let components = store.list::<Component>(lattice_id).await.unwrap();
         assert_eq!(components.len(), 1, "Should only have 1 component in state");
-        assert_component(
-            &components,
-            &component_2_id,
-            &[(host1_id, 2), (host2_id, 2)],
-        );
+        assert_component(&components, component_2_id, &[(host1_id, 2), (host2_id, 2)]);
 
         let providers = store.list::<Provider>(lattice_id).await.unwrap();
         assert_eq!(providers.len(), 2, "Should still have 2 providers in state");
@@ -1774,7 +1754,7 @@ mod test {
         // Double check providers and components are the same
         let components = store.list::<Component>(lattice_id).await.unwrap();
         assert_eq!(components.len(), 1, "Should only have 1 component in state");
-        assert_component(&components, &component_2_id, &[(host2_id, 2)]);
+        assert_component(&components, component_2_id, &[(host2_id, 2)]);
 
         let providers = store.list::<Provider>(lattice_id).await.unwrap();
         assert_eq!(providers.len(), 1, "Should now have 1 provider in state");
@@ -1857,7 +1837,7 @@ mod test {
                 ])
                 .host_id(host_id.into())
                 .providers(vec![ProviderDescription::builder()
-                    .id(&provider_id)
+                    .id(provider_id)
                     .revision(0)
                     .build()
                     .expect("failed to build provider description")])
@@ -1893,7 +1873,7 @@ mod test {
                     labels: HashMap::default(),
                     issuer: "".to_string(),
                     providers: vec![ProviderDescription::builder()
-                        .id(&provider_id)
+                        .id(provider_id)
                         .revision(0)
                         .build()
                         .expect("failed to build provider description")],
diff --git a/flake.lock b/flake.lock
diff --git a/src/main.rs b/src/main.rs
@@ -14,9 +14,7 @@ async fn main() -> anyhow::Result<()> {
         args.tracing_endpoint.clone(),
     );
 
-    let mut wadm = start_wadm(args.into())
-        .await
-        .context("failed to run wadm")?;
+    let mut wadm = start_wadm(args).await.context("failed to run wadm")?;
     tokio::select! {
         res = wadm.join_next() => {
             match res {
diff --git a/tests/event_consumer_integration.rs b/tests/event_consumer_integration.rs
@@ -186,6 +186,8 @@ async fn test_event_stream() -> Result<()> {
         HELLO_COMPONENT_ID,
         "wasi",
         "http",
+        "--link-name",
+        "default",
         "--ctl-port",
         &ctl_port,
     ])
diff --git a/tests/validation.rs b/tests/validation.rs
@@ -133,7 +133,7 @@ async fn validate_link_config_names() -> Result<()> {
                     .iter()
                     .all(|f| f.level == ValidationFailureLevel::Error)
                 && failures.len() == expected_errors,
-            "expected {} errors because manifest contains {} duplicated link config names, instead {} errors were found", expected_errors, expected_errors, failures.len().to_string()
+            "expected {} errors because manifest contains {} duplicated link config names, instead {} errors were found", expected_errors, expected_errors, failures.len()
         );
     assert!(
         !failures.valid(),

Original file line number	Diff line number	Diff line change
`@@ -759,13 +759,13 @@ fn get_deprecated_configs(component: &serde_yaml::Value) -> Vec<ValidationFailur`
`759`	`759`	`}`
`760`	`760`	`}`
`761`	`761`	`if let Some(trait_properties) = trait_.get("properties") {`
`762`		`- if let Some(_) = trait_properties.get("source_config") {`
	`762`	`+ if trait_properties.get("source_config").is_some() {`
`763`	`763`	`failures.push(ValidationFailure {`
`764`	`764`	`level: ValidationFailureLevel::Warning,`
`765`	`765`	`msg: "one of the components' link trait contains a source_config key, please use source:config: rather".to_string(),`
`766`	`766`	`});`
`767`	`767`	`}`
`768`		`- if let Some(_) = trait_properties.get("target_config") {`
	`768`	`+ if trait_properties.get("target_config").is_some() {`
`769`	`769`	`failures.push(ValidationFailure {`
`770`	`770`	`level: ValidationFailureLevel::Warning,`
`771`	`771`	`msg: "one of the components' link trait contains a target_config key, please use target:config: rather".to_string(),`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,6 @@ pub async fn start_wadm(config: WadmConfig) -> Result<JoinSet<Result<()>>> {`
`388`	`388`	`continue;`
`389`	`389`	`}`
`390`	`390`	`};`
`391`		`- let svc = svc.clone();`
`392`	`391`	`if let Err(err) = srv.serve_connection(TokioIo::new(stream), svc).await {`
`393`	`392`	`tracing::error!(?err, "failed to serve HTTP administration connection");`
`394`	`393`	`}`