static linking tests

.cargo/config.toml

@@ -1,3 +1,9 @@
 [build]
 target = "x86_64-unknown-linux-musl"
-rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.x86_64-unknown-linux-musl]
+rustflags = [
+    "-Ctarget-feature=+crt-static", 
+    "-Clink-args=-Istatic/include",
+    "-L", "static/lib",
+]

bin/u_agent/Cargo.toml

@@ -13,7 +13,7 @@ log = "^0.4"
 env_logger = "0.8.3"
 uuid = "0.6.5"
 reqwest = { version = "0.11", features = ["json"] }
-openssl = { version = "0.10.32", features = ["vendored"] }
+openssl = "*"
 u_lib = { version = "*", path = "../../lib/u_lib" }
 
 [[test]]

bin/u_agent/src/lib.rs

@@ -73,7 +73,7 @@ pub async fn run_forever() {
     //daemonize();
     env_logger::init();
     let arg_ip = env::args().nth(1);
-    let instance = ClientHandler::new(arg_ip);
+    let instance = ClientHandler::new(arg_ip.as_deref());
     info!("Connecting to the server");
     loop {
         let job_requests: Vec<AssignedJob> =

bin/u_panel/Cargo.toml

@@ -13,5 +13,5 @@ log = "^0.4"
 env_logger = "0.7.1"
 uuid = "0.6.5"
 reqwest = { version = "0.11", features = ["json"] }
-openssl = { version = "0.10.32", features = ["vendored"] }
+openssl = "*"
 u_lib = { version = "*", path = "../../lib/u_lib" }

bin/u_server/Cargo.toml

@@ -15,6 +15,7 @@ once_cell = "1.7.2"
 hyper = "0.13.10"
 mockall = "0.9.1"
 mockall_double = "0.2"
+openssl = "*"
 
 [dependencies.diesel]
 features = ["postgres", "uuid"]

bin/u_server/src/db.rs

@@ -21,7 +21,7 @@ static DB: OnceCell<Arc<Mutex<UDB>>> = OnceCell::new();
 impl UDB {
     pub fn lock_db() -> MutexGuard<'static, UDB> {
         DB.get_or_init(|| {
-            dotenv().unwrap();
+            dotenv().ok();
             let db_path = env::var("DATABASE_URL").unwrap();
             let conn = PgConnection::establish(&db_path).unwrap();
             let instance = UDB { conn };

bin/u_server/src/main.rs

@@ -1,3 +1,7 @@
+extern crate openssl;
+#[macro_use]
+extern crate diesel;
+
 use u_server::serve;
 
 #[tokio::main]

integration/docker-compose.yml

@@ -2,17 +2,13 @@ version: "2.1"
 
 networks:
   u_net:
-    ipam:
-      config:
-        - subnet: 10.16.0.0/24
 
 services:
 
   u_server:
     image: unki/u_server
     networks:
-      u_net:
+      - u_net
-        ipv4_address: 10.16.0.200
     volumes:
       - ../target/x86_64-unknown-linux-musl/release/u_server:/u_server
       - ./.env:/.env
@@ -29,6 +25,8 @@ services:
     image: postgres:13.3
     networks:
       - u_net
+    volumes:
+      - ../data:/var/lib/postgresql/data
     expose:
       - '5432'
     environment:
@@ -40,7 +38,7 @@ services:
       - u_net
     volumes:
       - ../target/x86_64-unknown-linux-musl/release/u_agent:/u_agent
-    command: /u_agent 10.16.0.200
+    command: /u_agent u_server
     depends_on:
       u_server:
         condition: service_started
@@ -51,7 +49,7 @@ services:
       - u_net
     volumes:
       - ../target/x86_64-unknown-linux-musl/release/u_agent:/u_agent
-    command: /u_agent 10.16.0.200
+    command: /u_agent u_server
     depends_on:
       u_server:
         condition: service_started

integration/utils.py

@@ -8,9 +8,9 @@ class TestsError(Exception):
 
 
 COLORS = {
-    'question': colored('[?]', 'yellow'),
+    'question': colored('[?]', 'magenta'),
     'info': colored('[~]', 'green'),
-    'warning': colored('[!]', 'magenta'),
+    'warning': colored('[!]', 'yellow'),
     'error': colored('[X]', 'red'),
 }
 

lib/u_lib/Cargo.toml

@@ -14,7 +14,7 @@ libc = "^0.2"
 lazy_static = "1.4.0"
 tokio = { version = "1.2.0", features = ["rt-multi-thread", "sync", "macros", "process", "time"] }
 reqwest = { version = "0.11", features = ["json"] }
-openssl = { version = "0.10.32", features = ["vendored"] }
+openssl = "*"
 futures = "0.3.5"
 guess_host_triple = "0.1.2"
 thiserror = "*"

lib/u_lib/src/api.rs

@@ -18,9 +18,9 @@ pub struct ClientHandler {
 }
 
 impl ClientHandler {
-    pub fn new(server: Option<String>) -> Self {
+    pub fn new(server: Option<&str>) -> Self {
         let master_server = server
-            .map(|s| Ipv4Addr::from_str(&s).unwrap())
+            //.map(|s| Ipv4Addr::from_str(&s).unwrap())
             .unwrap_or(MASTER_SERVER);
         Self {
             client: Client::new(),

lib/u_lib/src/config.rs

@@ -1,7 +1,6 @@
-use std::net::Ipv4Addr;
 use uuid::Uuid;
 
-pub const MASTER_SERVER: Ipv4Addr = Ipv4Addr::LOCALHOST; //Ipv4Addr::new(3,9,16,40)
+pub const MASTER_SERVER: &str = "127.0.0.1"; //Ipv4Addr::new(3,9,16,40)
 pub const MASTER_PORT: u16 = 63714;
 
 lazy_static! {

lib/u_lib/src/lib.rs

@@ -20,6 +20,7 @@ pub mod schema_exports {
 #[macro_use]
 extern crate lazy_static;
 
+extern crate openssl;
 #[macro_use]
 extern crate diesel;
 

scripts/cargo_musl.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+source $(dirname $0)/rootdir.sh #set ROOTDIR
+docker run \
+    -v $ROOTDIR:/volume \
+    -v cargo-cache:/root/.cargo/registry \
+    -w /volume \
+    -it \
+    test/musllibs \
+    cargo $@
+