Merge pull request #51 from tinythings/isbm-ansible-integration

Add bridge module for the integration with Ansible

.gitignore

@@ -2,4 +2,5 @@
 docs/_build
 man/*8
 package/
-.tmp/
+.tmp/
+/vendor

libsysinspect/Cargo.toml

@@ -20,8 +20,9 @@ prettytable-rs = "0.10.0"
 rand = "0.8.5"
 regex = "1.10.6"
 rsa = { version = "0.9.6", features = ["pkcs5", "sha1", "sha2"] }
-rustpython = { version = "0.4.0", features = ["freeze-stdlib"] }
+#rustpython = { path = "../../RustPython", features = ["freeze-stdlib"] }
 rustpython-pylib = { version = "0.4.0", features = ["freeze-stdlib"] }
+rustpython = { version = "0.4.0", features = ["freeze-stdlib"] }
 rustpython-vm = { version = "0.4.0", features = ["freeze-stdlib"] }
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"

libsysinspect/src/cfg/mod.rs

@@ -5,15 +5,17 @@ Config reader
 pub mod mmconf;
 
 use crate::SysinspectError;
+use mmconf::MinionConfig;
 use nix::unistd::Uid;
+use once_cell::sync::OnceCell;
 use std::{env, path::PathBuf};
 
 pub const APP_CONF: &str = "sysinspect.conf";
 pub const APP_DOTCONF: &str = ".sysinspect";
 pub const APP_HOME: &str = "/etc/sysinspect";
 
 /// Select app conf
-pub fn select_config(p: Option<&str>) -> Result<PathBuf, SysinspectError> {
+pub fn select_config_path(p: Option<&str>) -> Result<PathBuf, SysinspectError> {
     // Override path from options
     if let Some(ovrp) = p {
         let ovrp = PathBuf::from(ovrp);
@@ -52,3 +54,11 @@ pub fn select_config(p: Option<&str>) -> Result<PathBuf, SysinspectError> {
 
     Err(SysinspectError::ConfigError("No config has been found".to_string()))
 }
+
+/// Minion Confinguration
+static _MINION_CFG: OnceCell<MinionConfig> = OnceCell::new();
+
+/// Returns a copy of initialised traits.
+pub fn get_minion_config(p: Option<&str>) -> Result<MinionConfig, SysinspectError> {
+    Ok(_MINION_CFG.get_or_try_init(|| MinionConfig::new(select_config_path(p)?))?.to_owned())
+}

libsysinspect/src/mdescr/mspec.rs

@@ -1,5 +1,5 @@
 use super::{datapatch, mspecdef::ModelSpec};
-use crate::{cfg::select_config, tmpl::render::ModelTplRender, traits::systraits::SystemTraits, SysinspectError};
+use crate::{cfg::select_config_path, tmpl::render::ModelTplRender, traits::systraits::SystemTraits, SysinspectError};
 use serde_yaml::Value;
 use std::{
     collections::HashMap,
@@ -141,7 +141,7 @@ impl SpecLoader {
         }
 
         // Load app config and merge to the main model
-        base.push(serde_yaml::from_str::<Value>(&fs::read_to_string(select_config(None)?)?)?);
+        base.push(serde_yaml::from_str::<Value>(&fs::read_to_string(select_config_path(None)?)?)?);
 
         let mut base = self.merge_parts(&mut base)?;
         if !iht.is_empty() {

libsysinspect/src/pylang/pylib/pysystem.rs

@@ -7,6 +7,7 @@ use rustpython_vm::pymodule;
 #[pymodule]
 pub mod syscore {
     use crate::{
+        cfg::{get_minion_config, mmconf::MinionConfig},
         traits::{self, systraits::SystemTraits},
         util::dataconv,
     };
@@ -69,6 +70,42 @@ pub mod syscore {
         Ok(MinionTraits::new())
     }
 
+    #[pyattr]
+    #[pyclass(module = "syscore", name = "__AnsibleBridge")]
+    #[derive(Debug, PyPayload)]
+    pub struct AnsibleBridge {
+        cfg: MinionConfig,
+    }
+
+    #[pyclass]
+    impl AnsibleBridge {
+        #[pymethod]
+        pub fn sharelib(&self, _vm: &VirtualMachine) -> PyObjectRef {
+            _vm.ctx.new_str(self.cfg.sharelib_dir().to_string_lossy().to_string()).into()
+        }
+
+        #[pymethod]
+        pub fn root_dir(&self, _vm: &VirtualMachine) -> PyObjectRef {
+            _vm.ctx.new_str(self.cfg.root_dir().to_string_lossy().to_string()).into()
+        }
+
+        #[pymethod]
+        pub fn builtin_path(&self, name: String, _vm: &VirtualMachine) -> PyObjectRef {
+            let p = self.cfg.sharelib_dir().join(format!("lib/ansible/modules/{name}.py"));
+            if p.exists() {
+                return _vm.ctx.new_str(p.to_string_lossy().to_string()).into();
+            }
+
+            _vm.ctx.none()
+        }
+    }
+
+    #[pyfunction]
+    #[allow(non_snake_case)]
+    fn AnsibleBridge() -> PyResult<AnsibleBridge> {
+        Ok(AnsibleBridge { cfg: get_minion_config(None).unwrap() })
+    }
+
     #[derive(Debug)]
     struct Inner {
         retcode: usize,

libsysinspect/src/reactor/receiver.rs

@@ -18,7 +18,7 @@ impl Receiver {
     ///   `eid` - Entity Id
     ///   `response` - ActionResponse object
     pub fn register(&mut self, eid: String, response: ActionResponse) {
-        log::trace!("Registered action response: {:#?}", response);
+        log::debug!("Registered action response: {:#?}", response);
         self.actions.insert(eid, response);
 
         // XXX: And process here as well!

libsysinspect/src/traits/mod.rs

@@ -97,7 +97,10 @@ pub fn matches_traits(qt: Vec<Vec<HashMap<String, Value>>>, traits: SystemTraits
     or_op_c.contains(&true)
 }
 
-/// System traits instance
+/// System traits instance. Traits are system properties and attributes
+/// on which a minion is running.
+///
+/// P.S. These are not Rust traits. :-)
 static _TRAITS: OnceCell<SystemTraits> = OnceCell::new();
 
 /// Returns a copy of initialised traits.

modules/cfg/README.md

@@ -0,0 +1,3 @@
+# Ansible Integration
+
+The `cfg.mgmt` module implements Ansible integration.