style: reformat code

Author: onnovalkering

brane-bvm/src/vm.rs

@@ -294,8 +294,6 @@ where
     ///
     async fn run(&mut self) -> Option<Slot> {
         while let Some(instruction) = self.next() {
-            debug!("{:?}", instruction);
-
             match *instruction {
                 OP_ADD => self.op_add(),
                 OP_AND => self.op_and(),
@@ -348,6 +346,7 @@ where
                 }
             }
 
+            // INVESTIGATE: this appears to cause a deadlock (?).
             // debug!("Sending stack to client.");
             // self.executor.debug(format!("{}", self.stack)).await.unwrap();
             // debug!("Sent stack to client.");

brane-cfg/src/infrastructure.rs

@@ -53,10 +53,21 @@ pub enum Location {
 }
 
 impl Location {
-    pub fn get_address(self) -> String {
+    pub fn get_address(&self) -> String {
         match self {
-            Location::Kube { address, .. } | Location::Vm { address, .. } | Location::Slurm { address, .. } => address,
-            Location::Local { address, .. } => address.unwrap_or_else(|| String::from("127.0.0.1")),
+            Location::Kube { address, .. } | Location::Vm { address, .. } | Location::Slurm { address, .. } => {
+                address.clone()
+            }
+            Location::Local { address, .. } => address.clone().unwrap_or_else(|| String::from("127.0.0.1")),
+        }
+    }
+
+    pub fn get_registry(&self) -> String {
+        match self {
+            Location::Kube { registry, .. }
+            | Location::Vm { registry, .. }
+            | Location::Slurm { registry, .. }
+            | Location::Local { registry, .. } => registry.clone(),
         }
     }
 }

brane-drv/src/executor.rs

@@ -289,7 +289,7 @@ impl Future for WaitUntil {
         let state = self.states.get(&self.correlation_id);
         if let Some(state) = state {
             let state = state.value();
-            
+
             if state >= &self.at_least {
                 return Poll::Ready(());
             }

brane-dsl/src/generator/generator.rs

@@ -304,7 +304,7 @@ pub fn stmt_to_opcodes(
         // TODO: merge with block statement?
         Stmt::On { location, block } => {
             // Create a new scope (shadow).
-            let scope = scope + 1;
+            // let scope = scope + 1;
 
             expr_to_opcodes(location, chunk, locals, scope);
             chunk.write(OP_LOC_PUSH);

brane-job/src/cmd_create.rs

@@ -38,7 +38,7 @@ const BRANE_MOUNT_DFS: &str = "BRANE_MOUNT_DFS";
 ///
 pub async fn handle(
     key: &str,
-    command: Command,
+    mut command: Command,
     infra: Infrastructure,
     secrets: Secrets,
     xenon_endpoint: String,
@@ -55,6 +55,8 @@ pub async fn handle(
     let location_id = command.location.clone().unwrap();
     let location = infra.get_location_metadata(&location_id).with_context(context)?;
 
+    command.image = Some(format!("{}/library/{}", location.get_registry(), &image));
+
     // Generate job identifier.
     let job_id = format!("{}-{}", correlation_id, get_random_identifier());
 

brane-log/src/main.rs

@@ -33,7 +33,7 @@ struct Opts {
     #[clap(short, long, env = "DEBUG", takes_value = false)]
     debug: bool,
     /// Topic to receive events from
-    #[clap(short, long = "evt-topics", env = "EVENT_TOPIC", multiple = true)]
+    #[clap(short, long = "evt-topics", env = "EVENT_TOPIC", multiple_values = true)]
     event_topics: Vec<String>,
     /// Consumer group id
     #[clap(short, long, default_value = "brane-log", env = "GROUP_ID")]