feat(consul): use pkgx instead of flox

feat(consul): use pkgx instead of flox feat(consul): use pkgx instead of flox
fluentci-io · Jul 16, 2024 · c481548 · c481548
1 parent 6d52a4e
commit c481548
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/consul.yml b/.github/workflows/consul.yml
@@ -10,7 +10,7 @@ jobs:
   consul-test:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/envconsul.yml b/.github/workflows/envconsul.yml
@@ -10,7 +10,7 @@ jobs:
   envconsul-test:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/consul/src/helpers.rs b/consul/src/helpers.rs
@@ -1,23 +1,10 @@
 use anyhow::Error;
 use fluentci_pdk::dag;
 
-pub fn setup_flox() -> Result<(), Error> {
-    let os = dag().get_os()?;
-    if os == "macos" {
-        dag()
-        .pipeline("setup-flox")?
-        .with_exec(vec![r#"type brew > /dev/null 2> /dev/null || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)""#])?
-        .with_exec(vec!["type flox > /dev/null 2> /dev/null || brew install flox"])?
-        .stdout()?;
-    }
-    Ok(())
-}
-
 pub fn setup() -> Result<String, Error> {
-    setup_flox()?;
     dag()
         .pipeline("setup")?
-        .with_exec(vec!["mkdir", "-p", ".fluentci"])?
+        .with_exec(vec!["mkdir", "-p", ".fluentci/consul"])?
         .stdout()?;
 
     let consul_config = dag().get_env("CONSUL_CONFIG")?;
@@ -30,7 +17,7 @@ pub fn setup() -> Result<String, Error> {
     }
 
     if consul_data_dir.is_empty() {
-        dag().set_envs(vec![("CONSUL_DATA_DIR".into(), "../consul-data".into())])?;
+        dag().set_envs(vec![("CONSUL_DATA_DIR".into(), "../../consul-data".into())])?;
     }
 
     if consul_bind_addr.is_empty() {
@@ -40,18 +27,21 @@ pub fn setup() -> Result<String, Error> {
     if consul_config.is_empty() {
         dag().set_envs(vec![(
             "CONSUL_CONFIG".into(),
-            "../consul-config.json".into(),
+            "../../consul-config.json".into(),
         )])?;
     }
 
     let stdout = dag()
-        .flox()?
-        .with_workdir(".fluentci")?
-        .with_exec(vec![
-            "flox", "install", "consul", "overmind", "tmux", "wget", "gettext"
+        .pkgx()?
+        .with_workdir(".fluentci/consul")?
+        .with_packages(vec![
+           "consul.io",
+            "hashicorp.com/envconsul",
+            "github.com/darthsim/overmind",
+            "github.com/tmux/tmux",
         ])?
-        .with_exec(vec!["[ -f consul-config.json.template ] || flox activate -- wget https://raw.githubusercontent.com/fluentci-io/services/main/consul/consul-config.json.template"])?
-        .with_exec(vec!["[ -f $CONSUL_CONFIG ] || flox activate -- sh -c \"envsubst < consul-config.json.template\" > $CONSUL_CONFIG "])?
+        .with_exec(vec!["[ -f consul-config.json.template ] || pkgx wget https://raw.githubusercontent.com/fluentci-io/services/main/consul/consul-config.json.template"])?
+        .with_exec(vec!["[ -f $CONSUL_CONFIG ] || pkgx envsubst < consul-config.json.template > $CONSUL_CONFIG "])?
         .with_exec(vec![
             "grep -q consul: Procfile || echo -e 'consul: consul agent -config-file=$CONSUL_CONFIG \\n' >> Procfile",
         ])?

diff --git a/consul/src/lib.rs b/consul/src/lib.rs
@@ -10,14 +10,14 @@ pub fn start(_args: String) -> FnResult<String> {
     let port = dag().get_env("CONSUL_HTTP_PORT")?;
 
     let stdout = dag()
-        .flox()?
-        .with_workdir(".fluentci")?
+        .pkgx()?
+        .with_workdir(".fluentci/consul")?
         .with_exec(vec!["overmind", "--version"])?
         .with_exec(vec!["consul", "version"])?
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "consul"])?
         .with_exec(vec![
-            "overmind start -f Procfile --daemonize || flox activate -- overmind restart consul",
+            "overmind start -f Procfile --daemonize || overmind restart consul",
         ])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["overmind", "status"])?
@@ -39,8 +39,8 @@ pub fn stop(args: String) -> FnResult<String> {
     };
 
     let stdout = dag()
-        .flox()?
-        .with_workdir(".fluentci")?
+        .pkgx()?
+        .with_workdir(".fluentci/consul")?
         .with_exec(vec!["overmind", "stop", &args])?
         .stdout()?;
     Ok(stdout)