chore: refactors post rebase

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

Author: brooksmtownsend

src/commands/mod.rs

@@ -124,7 +124,7 @@ pub struct ScaleActor {
     /// The name of the model/manifest that generated this command
     pub model_name: String,
     /// Additional annotations to attach on this command
-    pub annotations: HashMap<String, String>,
+    pub annotations: BTreeMap<String, String>,
 }
 
 from_impl!(ScaleActor);

src/scaler/spreadscaler/link.rs

@@ -287,7 +287,10 @@ impl<S: ReadStore + Send + Sync, L: LinkSource> LinkScaler<S, L> {
 
 #[cfg(test)]
 mod test {
-    use std::{collections::HashSet, sync::Arc};
+    use std::{
+        collections::{BTreeMap, HashSet},
+        sync::Arc,
+    };
 
     use chrono::Utc;
     use wasmcloud_control_interface::LinkDefinition;
@@ -453,12 +456,12 @@ mod test {
                         ("cloud".to_string(), "fake".to_string()),
                         ("region".to_string(), "us-brooks-1".to_string()),
                     ]),
-                    annotations: HashMap::new(),
+                    annotations: BTreeMap::new(),
                     providers: HashSet::from_iter([ProviderInfo {
                         contract_id: "wasmcloud:httpserver".to_string(),
                         link_name: "default".to_string(),
                         public_key: "VASDASD".to_string(),
-                        annotations: HashMap::from_iter([(
+                        annotations: BTreeMap::from_iter([(
                             APP_SPEC_ANNOTATION.to_string(),
                             "foobar".to_string(),
                         )]),
@@ -521,7 +524,7 @@ mod test {
 
         let commands = link_scaler
             .handle_event(&Event::ActorsStarted(ActorsStarted {
-                annotations: HashMap::from_iter([(
+                annotations: BTreeMap::from_iter([(
                     APP_SPEC_ANNOTATION.to_string(),
                     "foobar".to_string(),
                 )]),

src/scaler/spreadscaler/mod.rs

@@ -1502,7 +1502,7 @@ mod test {
             .await
             .expect("should be able to handle an event");
 
-        let cmds = blobby_spreadscaler
+        let mut cmds = blobby_spreadscaler
             .handle_event(&Event::ActorsStopped(modifying_event))
             .await?;
         assert_eq!(cmds.len(), 2);

src/workers/command.rs

@@ -46,7 +46,7 @@ impl Worker for CommandWorker {
                             .map(|s| s.as_str())
                             .unwrap_or_default(),
                         actor.count as u16,
-                        Some(annotations),
+                        Some(annotations.into_iter().collect()),
                     )
                     .await
             }

tests/command_worker_integration.rs

@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, HashMap};
+use std::collections::BTreeMap;
 
 use futures::StreamExt;
 use serial_test::serial;
@@ -331,7 +331,7 @@ async fn test_annotation_stop() {
             host_id: host_id.clone(),
             count: 2,
             model_name: "fake".into(),
-            annotations: HashMap::from_iter([("fake".to_string(), "wake".to_string())]),
+            annotations: BTreeMap::from_iter([("fake".to_string(), "wake".to_string())]),
         })
         .await;
 
@@ -385,7 +385,7 @@ async fn test_annotation_stop() {
             count: 0,
             host_id: host_id.clone(),
             model_name: "fake".into(),
-            annotations: HashMap::from_iter([("fake".to_string(), "wake".to_string())]),
+            annotations: BTreeMap::from_iter([("fake".to_string(), "wake".to_string())]),
         })
         .await;