Merge pull request #24 from fluentci-io/feat/with-env-variable

feat: add withEnvVariable query

.github/workflows/ci.yml

@@ -10,7 +10,9 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          set-safe-directory: false
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         with:

README.md

@@ -386,3 +386,5 @@ FluentCI Engine supports OpenTelemetry tracing. To enable it, set the `OTEL_EXPO
 ## 📑 Logging
 
 FluentCI Engine supports sending logs to [Baselime](https://baselime.io). To enable it, set the `BASELIME_API_KEY` environment variable to the desired API key.
+
+![baselime](./.github/assets/baselime.png)

crates/cli/Cargo.toml

@@ -8,18 +8,18 @@ license = "MPL-2.0"
 name = "fluentci-engine"
 readme = "../../README.md"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.3.0"
+version = "0.3.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.81"
 clap = "3.2.20"
 extism = "1.2.0"
-fluentci-core = {path = "../core", version = "0.2.0"}
+fluentci-core = {path = "../core", version = "0.2.1"}
 fluentci-ext = {path = "../ext", version = "0.2.0"}
-fluentci-server = {path = "../server", version = "0.2.0"}
-fluentci-shared = {path = "../shared", version = "0.1.8"}
+fluentci-server = {path = "../server", version = "0.2.1"}
+fluentci-shared = {path = "../shared", version = "0.1.9"}
 get-port = "4.0.0"
 md5 = "0.7.0"
 regex = "1.10.3"

crates/common/Cargo.toml

@@ -7,14 +7,14 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-common"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.1.7"
+version = "0.1.8"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.81"
 dirs = "5.0.1"
-fluentci-core = {path = "../core", version = "0.2.0"}
+fluentci-core = {path = "../core", version = "0.2.1"}
 fluentci-ext = {path = "../ext", version = "0.2.0"}
 fluentci-types = {path = "../types", version = "0.1.6"}
 regex = "1.10.4"

crates/common/src/common.rs

@@ -324,3 +324,9 @@ pub fn with_service(graph: Arc<Mutex<Graph>>, service_id: String) -> Result<(),
         None => Err(Error::msg("Service not found")),
     }
 }
+
+pub fn with_env_variable(graph: Arc<Mutex<Graph>>, key: &str, value: &str) -> Result<(), Error> {
+    let mut graph = graph.lock().unwrap();
+    graph.execute(GraphCommand::AddEnvVariable(key.into(), value.into()));
+    Ok(())
+}

crates/core/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-core"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.2.0"
+version = "0.2.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/core/src/deps.rs

@@ -5,7 +5,7 @@ use opentelemetry::{
     Context, KeyValue,
 };
 use owo_colors::OwoColorize;
-use std::env::current_dir;
+use std::env::{self, current_dir};
 use std::sync::mpsc::{self, Sender};
 use std::sync::Arc;
 use std::{path::Path, thread};
@@ -63,6 +63,7 @@ pub enum GraphCommand {
         Vec<String>,
         Arc<Box<dyn Extension + Send + Sync>>,
     ),
+    AddEnvVariable(String, String),
     EnableService(String),
     AddEdge(usize, usize),
     Execute(Output),
@@ -227,6 +228,9 @@ impl Graph {
             GraphCommand::AddEdge(from, to) => {
                 self.edges.push(Edge { from, to });
             }
+            GraphCommand::AddEnvVariable(key, value) => {
+                env::set_var(key, value);
+            }
             GraphCommand::Execute(Output::Stdout) => {
                 self.execute_graph(Output::Stdout);
             }
@@ -241,6 +245,9 @@ impl Graph {
     }
 
     pub fn execute_services(&mut self, ctx: &Context) -> Result<(), Error> {
+        if self.enabled_services.is_empty() {
+            return Ok(());
+        }
         let tracer_provider = global::tracer_provider();
         let tracer = tracer_provider.versioned_tracer(
             "fluentci-core",

crates/core/src/lib.rs

@@ -124,6 +124,7 @@ pub fn set_git_repo_metadata() -> Result<(), Error> {
     let child = Command::new("sh")
         .arg("-c")
         .arg("git log -1 --pretty=%h")
+        .stdout(std::process::Stdio::piped())
         .spawn()?;
     let output = child.wait_with_output()?;
     let commit_hash = String::from_utf8(output.stdout)?;

crates/graphql/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-graphql"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.2.0"
+version = "0.2.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,8 +16,8 @@ anyhow = "1.0.80"
 async-graphql = "7.0.2"
 async-graphql-actix-web = "7.0.2"
 dirs = "5.0.1"
-fluentci-common = {path = "../common", version = "0.1.7"}
-fluentci-core = {path = "../core", version = "0.2.0"}
+fluentci-common = {path = "../common", version = "0.1.8"}
+fluentci-core = {path = "../core", version = "0.2.1"}
 fluentci-ext = {path = "../ext", version = "0.2.0"}
 fluentci-types = {path = "../types", version = "0.1.6"}
 regex = "1.10.3"

crates/graphql/src/schema/objects/devbox.rs

@@ -84,6 +84,17 @@ impl Devbox {
         let service = common::as_service(graph.clone(), name)?;
         Ok(service.into())
     }
+
+    async fn with_env_variable(
+        &self,
+        ctx: &Context<'_>,
+        name: String,
+        value: String,
+    ) -> Result<&Devbox, Error> {
+        let graph = ctx.data::<Arc<Mutex<Graph>>>().unwrap();
+        common::with_env_variable(graph.clone(), &name, &value)?;
+        Ok(self)
+    }
 }
 
 impl From<types::Devbox> for Devbox {

crates/graphql/src/schema/objects/devenv.rs

@@ -84,6 +84,17 @@ impl Devenv {
         let service = common::as_service(graph.clone(), name)?;
         Ok(service.into())
     }
+
+    async fn with_env_variable(
+        &self,
+        ctx: &Context<'_>,
+        name: String,
+        value: String,
+    ) -> Result<&Devenv, Error> {
+        let graph = ctx.data::<Arc<Mutex<Graph>>>().unwrap();
+        common::with_env_variable(graph.clone(), &name, &value)?;
+        Ok(self)
+    }
 }
 
 impl From<types::Devenv> for Devenv {

crates/graphql/src/schema/objects/directory.rs

@@ -186,6 +186,17 @@ impl Directory {
         let service = common::as_service(graph.clone(), name)?;
         Ok(service.into())
     }
+
+    async fn with_env_variable(
+        &self,
+        ctx: &Context<'_>,
+        name: String,
+        value: String,
+    ) -> Result<&Directory, Error> {
+        let graph = ctx.data::<Arc<Mutex<Graph>>>().unwrap();
+        common::with_env_variable(graph.clone(), &name, &value)?;
+        Ok(self)
+    }
 }
 
 impl From<types::Directory> for Directory {

crates/graphql/src/schema/objects/envhub.rs

@@ -112,6 +112,17 @@ impl Envhub {
         let service = common::as_service(graph.clone(), name)?;
         Ok(service.into())
     }
+
+    async fn with_env_variable(
+        &self,
+        ctx: &Context<'_>,
+        name: String,
+        value: String,
+    ) -> Result<&Envhub, Error> {
+        let graph = ctx.data::<Arc<Mutex<Graph>>>().unwrap();
+        common::with_env_variable(graph.clone(), &name, &value)?;
+        Ok(self)
+    }
 }
 
 impl From<types::Envhub> for Envhub {