reworked the source generation

Author: sciabarracom

example/hello/.gitignore

@@ -0,0 +1,45 @@
+
+# Created by https://www.gitignore.io/api/osx,rust
+# Edit at https://www.gitignore.io/?templates=osx,rust
+
+### OSX ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Rust ###
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# End of https://www.gitignore.io/api/osx,rust

example/hello/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "actions"
+version = "0.1.0"
+authors = ["Roberto Diaz <roberto@theagilemonkeys.com>"]
+
+[dependencies]
+serde_json = "1.0"
+

example/hello/src/lib.rs

@@ -0,0 +1,9 @@
+extern crate serde_json;
+
+use std::collections::HashMap;
+use serde_json::Value;
+
+pub fn main(mut input_data: HashMap<String, Value>) -> HashMap<String, Value> {
+    input_data.insert("hello".to_string(),Value::String("world".to_string()));
+    input_data
+}

rust1.32/Dockerfile

@@ -19,7 +19,8 @@ FROM rust:1.32
 COPY --from=builder /bin/proxy /bin/proxy
 RUN mkdir -p /action 
 ADD compile /bin/compile
-ADD compile.launcher.rs /bin/compile.launcher.rs
+ADD src /usr/src
+RUN cd /usr/src ; cargo build 
 ENV OW_COMPILER=/bin/compile
 WORKDIR /action
 ENTRYPOINT ["/bin/proxy"]

rust1.32/compile

@@ -21,7 +21,8 @@
 from __future__ import print_function
 import os, sys, codecs, subprocess
 from os.path import abspath, exists, dirname
-import tempfile
+import time
+import shutil
 
 ## utils 
 # write a file creating intermediate directories
@@ -47,59 +48,39 @@ version = "0.1.0"
 serde_json = "1.0"
 """
 
-cargo_actionloop = """[package]
-name = "action_loop"
-version = "0.1.0"
-authors = ["Roberto Diaz <roberto@theagilemonkeys.com>"]
-
-[dependencies]
-serde_json = "1.0"
-libc = "0.2.49"
-actions = { path = "../actions" }
-"""
-
-cargo_workspace = """
-[workspace]
-
-members = [
-"action_loop",
-"actions",
-]
-"""
-
-def build():
+def build(tgt_dir):
     pass
 
-def sources(main, src_dir, tgt_dir, launcher):
-    src_file = abspath("%s/exec" % src_dir)
-       
+def sources(main, src_dir):
+    # move away the action dir and replace with the new
+    tmpname = str(int(time.time()))
+    shutil.move("/usr/src/actions", "/usr/src/src%s" % tmpname)
+    shutil.move(src_dir, "/usr/src/actions")
+
     # move exec in the right place
+    src_file = "/usr/src/actions/exec"
     if exists(src_file):
-        os.makedirs(src_dir+"/src", mode=0o755, exist_ok=True)
-        copy_replace(src_file, src_dir+"/src/exec__.rs")
+        os.makedirs("/usr/src/actions/src", mode=0o755, exist_ok=True)
+        copy_replace(src_file, "/usr/src/actions/src/lib.rs")
 
     # add a cargo.toml if needed
-    cargo_action_file = src_dir+"/Cargo.toml"
+    cargo_action_file = "/usr/src/actions/Cargo.toml"
     if not exists(cargo_action_file):
         write_file(cargo_action_file, cargo_action)
 
     # write the boilerplate in a temp dir
-    os.makedirs("/tmp/src", mode=0o755, exist_ok=True)
-    tmp_dir = tempfile.mkdtemp(prefix='/tmp/src/')
-    copy_replace(launcher, tmp_dir+"/action_loop/src/main.rs",
+    launcher = "/usr/src/action_loop/tmp%s" % tmpname
+    shutil.move("/usr/src/action_loop/src/main.rs", launcher)
+    copy_replace(launcher, "/usr/src/action_loop/src/main.rs",
           "use actions::main as actionMain;",
           "use actions::%s as actionMain;" % main )
-    write_file(tmp_dir+"/action_loop/Cargo.toml", cargo_actionloop)
-    write_file(tmp_dir+"/Cargo.toml", cargo_workspace)
-    os.rename(src_dir, tmp_dir+"/actions")
-    return tmp_dir
 
 if __name__ == '__main__':
     if len(sys.argv) < 4:
         sys.stdout.write("usage: <main-function> <source-dir> <target-dir>\n")
         sys.stdout.flush()
         sys.exit(1)
-    dir = sources(sys.argv[1], abspath(sys.argv[2]), abspath(sys.argv[3]), abspath(sys.argv[0]+".launcher.rs"))
-    print(dir)
+    sources(sys.argv[1], abspath(sys.argv[2]))
+    build(abspath(sys.argv[3]))
     sys.stdout.flush()
     sys.stderr.flush()

rust1.32/src/Cargo.lock

@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+"action_loop",
+"actions",
+]

rust1.32/src/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "action_loop"
+version = "0.1.0"
+authors = ["Roberto Diaz <roberto@theagilemonkeys.com>"]
+
+[dependencies]
+serde_json = "1.0"
+libc = "0.2.49"
+actions = { path = "../actions" }

rust1.32/src/action_loop/Cargo.toml

@@ -11,6 +11,7 @@ use serde_json::{Value, Error};
 use actions::main as actionMain;
 
 fn main() {
+    let mut fd3 = unsafe { File::from_raw_fd(3)};
     loop {
         let mut buffer = String::new();
         io::stdin().read_line(&mut buffer).unwrap();
@@ -23,19 +24,27 @@ fn main() {
                         let mut unparsed_payload:Result<HashMap<String,Value>,Error> = serde_json::from_value(val);
                         match unparsed_payload {
                             Ok(value) => payload = value,
-                            Err(_) => eprintln!("Error parsing value json")
+                            Err(err) => {
+                                eprintln!("Error parsing value json: {}", err);
+                                continue
+                            }
                         }
                     } else {
                         env::set_var(format!("__OW_{}", key.to_uppercase()), val.to_string());
                     }
                 }
             }
-            Err(e) => eprintln!("Error: {}", e)
+            Err(e) =>{
+                eprintln!("Error: {}", e);
+                continue
+            }
+        }
+        
+        match serde_json::to_string(&actionMain(payload)){
+            Ok(result) => { write!(&mut fd3, "{}\n", result).expect("Error writting on fd3");}
+            Err(err) => {  eprintln!("Error parsing resul value json: {}", err);}
         }
-        let action_results = actionMain(payload);
-        let mut fd3 = unsafe { File::from_raw_fd(3) };
-        write!(&mut fd3, "{}", action_results);
-        stdout().flush();
-        stderr().flush();
+        stdout().flush().expect("Error flushing stdout");
+        stderr().flush().expect("Error flushing stderr");
     }
 }

rust1.32/compile.launcher.rs renamed to rust1.32/src/action_loop/src/main.rs

@@ -0,0 +1,3 @@
+/target
+**/*.rs.bk
+Cargo.lock