Compare commits
1 Commits
renovate/a
...
257cb38cd5
| Author | SHA1 | Date | |
|---|---|---|---|
| 257cb38cd5 |
2
.env
2
.env
@@ -3,5 +3,3 @@ FOREST_S3_BUCKET=forest
|
|||||||
FOREST_S3_REGION=eu-west-1
|
FOREST_S3_REGION=eu-west-1
|
||||||
FOREST_S3_USER=forestadmin
|
FOREST_S3_USER=forestadmin
|
||||||
FOREST_S3_PASSWORD=forestadmin
|
FOREST_S3_PASSWORD=forestadmin
|
||||||
|
|
||||||
FOREST_LOG_LEVEL=forest=trace
|
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
name: Build Forest
|
|
||||||
|
|
||||||
on:
|
|
||||||
- push
|
|
||||||
- pull_request
|
|
||||||
|
|
||||||
env:
|
|
||||||
CARGO_TERM_COLOR: always
|
|
||||||
RUST_BACKTRACE: 1
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
env:
|
|
||||||
RUSTFLAGS: -D warnings
|
|
||||||
timeout_minutes: 30
|
|
||||||
steps:
|
|
||||||
|
|
||||||
- name: Build application
|
|
||||||
uses: rustlang/rust:nightly
|
|
||||||
run:
|
|
||||||
- export SQLX_OFFLINE=true
|
|
||||||
- cargo build --release
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
uses: rustlang/rust:nightly
|
|
||||||
run:
|
|
||||||
- cargo test
|
|
||||||
|
|
||||||
- name: Check code formatting
|
|
||||||
uses: rustlang/rust:nightly
|
|
||||||
run:
|
|
||||||
- cargo fmt -- --check
|
|
||||||
continue_on_error: true
|
|
||||||
|
|
||||||
- name: Run clippy lints
|
|
||||||
uses: rustlang/rust:nightly
|
|
||||||
run:
|
|
||||||
- rustup component add clippy
|
|
||||||
- cargo clippy -- -D warnings
|
|
||||||
continue_on_error: true
|
|
||||||
|
|
||||||
336
Cargo.lock
generated
336
Cargo.lock
generated
@@ -17,15 +17,6 @@ version = "2.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
|
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "aho-corasick"
|
|
||||||
version = "1.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anstream"
|
name = "anstream"
|
||||||
version = "0.6.18"
|
version = "0.6.18"
|
||||||
@@ -78,9 +69,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anyhow"
|
name = "anyhow"
|
||||||
version = "1.0.98"
|
version = "1.0.96"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
@@ -124,12 +115,6 @@ dependencies = [
|
|||||||
"generic-array",
|
"generic-array",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bumpalo"
|
|
||||||
version = "3.19.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.10.0"
|
version = "1.10.0"
|
||||||
@@ -144,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap"
|
name = "clap"
|
||||||
version = "4.5.41"
|
version = "4.5.31"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
|
checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap_builder",
|
"clap_builder",
|
||||||
"clap_derive",
|
"clap_derive",
|
||||||
@@ -154,9 +139,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap_builder"
|
name = "clap_builder"
|
||||||
version = "4.5.41"
|
version = "4.5.31"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
|
checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anstream",
|
"anstream",
|
||||||
"anstyle",
|
"anstyle",
|
||||||
@@ -166,9 +151,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap_derive"
|
name = "clap_derive"
|
||||||
version = "4.5.41"
|
version = "4.5.28"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
|
checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -218,6 +203,15 @@ dependencies = [
|
|||||||
"typenum",
|
"typenum",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "deranged"
|
||||||
|
version = "0.3.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
|
||||||
|
dependencies = [
|
||||||
|
"powerfmt",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "digest"
|
name = "digest"
|
||||||
version = "0.10.7"
|
version = "0.10.7"
|
||||||
@@ -465,17 +459,6 @@ dependencies = [
|
|||||||
"icu_properties",
|
"icu_properties",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "io-uring"
|
|
||||||
version = "0.7.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is_terminal_polyfill"
|
name = "is_terminal_polyfill"
|
||||||
version = "1.70.1"
|
version = "1.70.1"
|
||||||
@@ -488,40 +471,6 @@ version = "1.0.14"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
|
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "jiff"
|
|
||||||
version = "0.2.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
|
|
||||||
dependencies = [
|
|
||||||
"jiff-static",
|
|
||||||
"log",
|
|
||||||
"portable-atomic",
|
|
||||||
"portable-atomic-util",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "jiff-static"
|
|
||||||
version = "0.2.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "js-sys"
|
|
||||||
version = "0.3.77"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
|
|
||||||
dependencies = [
|
|
||||||
"once_cell",
|
|
||||||
"wasm-bindgen",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kdl"
|
name = "kdl"
|
||||||
version = "6.3.4"
|
version = "6.3.4"
|
||||||
@@ -542,15 +491,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.170"
|
version = "0.2.169"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
|
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "litemap"
|
name = "litemap"
|
||||||
version = "0.7.5"
|
version = "0.7.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
|
checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lock_api"
|
name = "lock_api"
|
||||||
@@ -564,18 +513,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.26"
|
version = "0.4.25"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
|
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "matchers"
|
|
||||||
version = "0.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
|
|
||||||
dependencies = [
|
|
||||||
"regex-automata 0.1.10",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "md-5"
|
name = "md-5"
|
||||||
@@ -618,18 +558,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "minijinja"
|
name = "minijinja"
|
||||||
version = "2.11.0"
|
version = "2.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4e60ac08614cc09062820e51d5d94c2fce16b94ea4e5003bb81b99a95f84e876"
|
checksum = "cff7b8df5e85e30b87c2b0b3f58ba3a87b68e133738bf512a7713769326dbca9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.8.5"
|
version = "0.8.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
|
checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"adler2",
|
"adler2",
|
||||||
]
|
]
|
||||||
@@ -688,6 +628,12 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-conv"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-integer"
|
name = "num-integer"
|
||||||
version = "0.1.46"
|
version = "0.1.46"
|
||||||
@@ -785,19 +731,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
|
checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portable-atomic"
|
name = "powerfmt"
|
||||||
version = "1.11.1"
|
version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
|
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "portable-atomic-util"
|
|
||||||
version = "0.2.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
|
|
||||||
dependencies = [
|
|
||||||
"portable-atomic",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
@@ -810,9 +747,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.38.0"
|
version = "0.37.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b"
|
checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -829,84 +766,34 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
version = "0.5.9"
|
version = "0.5.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
|
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex"
|
|
||||||
version = "1.11.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
|
|
||||||
dependencies = [
|
|
||||||
"aho-corasick",
|
|
||||||
"memchr",
|
|
||||||
"regex-automata 0.4.9",
|
|
||||||
"regex-syntax 0.8.5",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-automata"
|
|
||||||
version = "0.1.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
|
||||||
dependencies = [
|
|
||||||
"regex-syntax 0.6.29",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-automata"
|
|
||||||
version = "0.4.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
|
|
||||||
dependencies = [
|
|
||||||
"aho-corasick",
|
|
||||||
"memchr",
|
|
||||||
"regex-syntax 0.8.5",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-syntax"
|
|
||||||
version = "0.6.29"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-syntax"
|
|
||||||
version = "0.8.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc-demangle"
|
name = "rustc-demangle"
|
||||||
version = "0.1.24"
|
version = "0.1.24"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustversion"
|
|
||||||
version = "1.0.21"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rusty-s3"
|
name = "rusty-s3"
|
||||||
version = "0.8.0"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2c27352e274b4aa598516962209bc0bae27efbb2d88d60995ad7f9862b020b0d"
|
checksum = "8f51a5a6b15f25d3e10c068039ee13befb6110fcb36c2b26317bcbdc23484d96"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"hmac",
|
"hmac",
|
||||||
"jiff",
|
|
||||||
"md-5",
|
"md-5",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"quick-xml",
|
"quick-xml",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2",
|
"sha2",
|
||||||
|
"time",
|
||||||
"url",
|
"url",
|
||||||
"zeroize",
|
"zeroize",
|
||||||
]
|
]
|
||||||
@@ -934,18 +821,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.219"
|
version = "1.0.217"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
|
checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.219"
|
version = "1.0.217"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
|
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -954,9 +841,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.141"
|
version = "1.0.138"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
|
checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
"itoa",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -993,12 +880,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "slab"
|
|
||||||
version = "0.4.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smallvec"
|
name = "smallvec"
|
||||||
version = "1.14.0"
|
version = "1.14.0"
|
||||||
@@ -1085,6 +966,37 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "time"
|
||||||
|
version = "0.3.37"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
|
||||||
|
dependencies = [
|
||||||
|
"deranged",
|
||||||
|
"itoa",
|
||||||
|
"num-conv",
|
||||||
|
"powerfmt",
|
||||||
|
"serde",
|
||||||
|
"time-core",
|
||||||
|
"time-macros",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "time-core"
|
||||||
|
version = "0.1.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "time-macros"
|
||||||
|
version = "0.2.19"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
|
||||||
|
dependencies = [
|
||||||
|
"num-conv",
|
||||||
|
"time-core",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinystr"
|
name = "tinystr"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@@ -1097,19 +1009,17 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "1.46.1"
|
version = "1.43.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
|
checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"backtrace",
|
"backtrace",
|
||||||
"bytes",
|
"bytes",
|
||||||
"io-uring",
|
|
||||||
"libc",
|
"libc",
|
||||||
"mio",
|
"mio",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"signal-hook-registry",
|
"signal-hook-registry",
|
||||||
"slab",
|
|
||||||
"socket2",
|
"socket2",
|
||||||
"tokio-macros",
|
"tokio-macros",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
@@ -1176,14 +1086,10 @@ version = "0.3.19"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
|
checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"matchers",
|
|
||||||
"nu-ansi-term",
|
"nu-ansi-term",
|
||||||
"once_cell",
|
|
||||||
"regex",
|
|
||||||
"sharded-slab",
|
"sharded-slab",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"thread_local",
|
"thread_local",
|
||||||
"tracing",
|
|
||||||
"tracing-core",
|
"tracing-core",
|
||||||
"tracing-log",
|
"tracing-log",
|
||||||
]
|
]
|
||||||
@@ -1196,9 +1102,9 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.17"
|
version = "1.0.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
|
checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-width"
|
name = "unicode-width"
|
||||||
@@ -1237,13 +1143,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uuid"
|
name = "uuid"
|
||||||
version = "1.17.0"
|
version = "1.14.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
|
checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom",
|
"getrandom",
|
||||||
"js-sys",
|
|
||||||
"wasm-bindgen",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1283,64 +1187,6 @@ dependencies = [
|
|||||||
"wit-bindgen-rt",
|
"wit-bindgen-rt",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen"
|
|
||||||
version = "0.2.100"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"once_cell",
|
|
||||||
"rustversion",
|
|
||||||
"wasm-bindgen-macro",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-backend"
|
|
||||||
version = "0.2.100"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
|
|
||||||
dependencies = [
|
|
||||||
"bumpalo",
|
|
||||||
"log",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
"wasm-bindgen-shared",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-macro"
|
|
||||||
version = "0.2.100"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
|
|
||||||
dependencies = [
|
|
||||||
"quote",
|
|
||||||
"wasm-bindgen-macro-support",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-macro-support"
|
|
||||||
version = "0.2.100"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
"wasm-bindgen-backend",
|
|
||||||
"wasm-bindgen-shared",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-shared"
|
|
||||||
version = "0.2.100"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.3.9"
|
version = "0.3.9"
|
||||||
@@ -1363,7 +1209,7 @@ version = "0.1.9"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
|
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1516,18 +1362,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerofrom"
|
name = "zerofrom"
|
||||||
version = "0.1.6"
|
version = "0.1.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
|
checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"zerofrom-derive",
|
"zerofrom-derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerofrom-derive"
|
name = "zerofrom-derive"
|
||||||
version = "0.1.6"
|
version = "0.1.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
|
checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ resolver = "2"
|
|||||||
anyhow = { version = "1" }
|
anyhow = { version = "1" }
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
tracing = { version = "0.1", features = ["log"] }
|
tracing = { version = "0.1", features = ["log"] }
|
||||||
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.18" }
|
||||||
clap = { version = "4", features = ["derive", "env", "cargo", "string"] }
|
clap = { version = "4", features = ["derive", "env"] }
|
||||||
dotenvy = { version = "0.15" }
|
dotenvy = { version = "0.15" }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
uuid = { version = "1.7", features = ["v4"] }
|
uuid = { version = "1.7", features = ["v4"] }
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "forest"
|
name = "forest"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
@@ -13,11 +13,11 @@ dotenvy.workspace = true
|
|||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
uuid.workspace = true
|
uuid.workspace = true
|
||||||
|
|
||||||
rusty-s3 = "0.8"
|
rusty-s3 = "0.7.0"
|
||||||
url = "2.5"
|
url = "2.5.4"
|
||||||
kdl = "6.3"
|
kdl = "6.3.3"
|
||||||
walkdir = "2.5"
|
walkdir = "2.5.0"
|
||||||
minijinja = "2.7"
|
minijinja = "2.7.0"
|
||||||
glob = "0.3"
|
glob = "0.3.2"
|
||||||
serde_json = "1"
|
serde_json = "1.0.138"
|
||||||
colored_json = "5"
|
colored_json = "5.0.0"
|
||||||
|
|||||||
@@ -1,26 +1,39 @@
|
|||||||
use std::{net::SocketAddr, path::PathBuf};
|
use std::{net::SocketAddr, path::PathBuf};
|
||||||
|
|
||||||
use anyhow::Context as AnyContext;
|
use clap::{Parser, Subcommand};
|
||||||
use clap::{FromArgMatches, Parser, Subcommand, crate_authors, crate_description, crate_version};
|
|
||||||
use colored_json::ToColoredJson;
|
use colored_json::ToColoredJson;
|
||||||
use kdl::KdlDocument;
|
use kdl::KdlDocument;
|
||||||
use rusty_s3::{Bucket, Credentials, S3Action};
|
use rusty_s3::{Bucket, Credentials, S3Action};
|
||||||
|
use tokio::io::AsyncWriteExt;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
model::{Context, ForestFile, Plan, Project, WorkspaceProject},
|
model::{Context, Plan, Project, TemplateType},
|
||||||
plan_reconciler::PlanReconciler,
|
plan_reconciler::PlanReconciler,
|
||||||
state::SharedState,
|
state::SharedState,
|
||||||
};
|
};
|
||||||
|
|
||||||
mod run;
|
#[derive(Parser)]
|
||||||
mod template;
|
#[command(author, version, about, long_about = None, subcommand_required = true)]
|
||||||
|
struct Command {
|
||||||
|
#[command(subcommand)]
|
||||||
|
command: Option<Commands>,
|
||||||
|
|
||||||
|
#[arg(
|
||||||
|
env = "FOREST_PROJECT_PATH",
|
||||||
|
long = "project-path",
|
||||||
|
default_value = "."
|
||||||
|
)]
|
||||||
|
project_path: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Subcommand)]
|
#[derive(Subcommand)]
|
||||||
enum Commands {
|
enum Commands {
|
||||||
Init {},
|
Init {},
|
||||||
Template(template::Template),
|
|
||||||
|
Template {},
|
||||||
|
|
||||||
Info {},
|
Info {},
|
||||||
Clean {},
|
|
||||||
Serve {
|
Serve {
|
||||||
#[arg(env = "FOREST_HOST", long, default_value = "127.0.0.1:3000")]
|
#[arg(env = "FOREST_HOST", long, default_value = "127.0.0.1:3000")]
|
||||||
host: SocketAddr,
|
host: SocketAddr,
|
||||||
@@ -42,34 +55,10 @@ enum Commands {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_root(include_run: bool) -> clap::Command {
|
|
||||||
let mut root_cmd = clap::Command::new("forest")
|
|
||||||
.subcommand_required(true)
|
|
||||||
.author(crate_authors!())
|
|
||||||
.version(crate_version!())
|
|
||||||
.about(crate_description!())
|
|
||||||
.ignore_errors(include_run)
|
|
||||||
.arg(
|
|
||||||
clap::Arg::new("project_path")
|
|
||||||
.long("project-path")
|
|
||||||
.env("FOREST_PROJECT_PATH")
|
|
||||||
.default_value("."),
|
|
||||||
);
|
|
||||||
|
|
||||||
if include_run {
|
|
||||||
root_cmd = root_cmd.subcommand(clap::Command::new("run").allow_external_subcommands(true))
|
|
||||||
}
|
|
||||||
Commands::augment_subcommands(root_cmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn execute() -> anyhow::Result<()> {
|
pub async fn execute() -> anyhow::Result<()> {
|
||||||
let matches = get_root(true).get_matches();
|
let cli = Command::parse();
|
||||||
let project_path = PathBuf::from(
|
|
||||||
&matches
|
let project_path = &cli.project_path.canonicalize()?;
|
||||||
.get_one::<String>("project_path")
|
|
||||||
.expect("project path always to be set"),
|
|
||||||
)
|
|
||||||
.canonicalize()?;
|
|
||||||
let project_file_path = project_path.join("forest.kdl");
|
let project_file_path = project_path.join("forest.kdl");
|
||||||
if !project_file_path.exists() {
|
if !project_file_path.exists() {
|
||||||
anyhow::bail!(
|
anyhow::bail!(
|
||||||
@@ -79,262 +68,154 @@ pub async fn execute() -> anyhow::Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let project_file = tokio::fs::read_to_string(&project_file_path).await?;
|
let project_file = tokio::fs::read_to_string(&project_file_path).await?;
|
||||||
let doc: KdlDocument = project_file.parse()?;
|
let project_doc: KdlDocument = project_file.parse()?;
|
||||||
let project: ForestFile = doc.try_into()?;
|
|
||||||
|
|
||||||
match project {
|
let project: Project = project_doc.try_into()?;
|
||||||
ForestFile::Workspace(workspace) => {
|
tracing::trace!("found a project name: {}", project.name);
|
||||||
tracing::trace!("running as workspace");
|
|
||||||
|
|
||||||
// 1. For each member load the project
|
let plan = if let Some(plan_file_path) = PlanReconciler::new()
|
||||||
|
.reconcile(&project, project_path)
|
||||||
|
.await?
|
||||||
|
{
|
||||||
|
let plan_file = tokio::fs::read_to_string(&plan_file_path).await?;
|
||||||
|
let plan_doc: KdlDocument = plan_file.parse()?;
|
||||||
|
|
||||||
let mut workspace_members = Vec::new();
|
let plan: Plan = plan_doc.try_into()?;
|
||||||
|
tracing::trace!("found a plan name: {}", project.name);
|
||||||
|
|
||||||
for member in workspace.members {
|
Some(plan)
|
||||||
let workspace_member_path = project_path.join(&member.path);
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let project_file_path = workspace_member_path.join("forest.kdl");
|
let context = Context { project, plan };
|
||||||
if !project_file_path.exists() {
|
|
||||||
anyhow::bail!(
|
|
||||||
"no 'forest.kdl' file was found at: {}",
|
|
||||||
workspace_member_path.display().to_string()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let project_file = tokio::fs::read_to_string(&project_file_path).await?;
|
match cli.command.unwrap() {
|
||||||
let doc: KdlDocument = project_file.parse()?;
|
Commands::Init {} => {
|
||||||
let project: WorkspaceProject = doc.try_into().context(format!(
|
tracing::info!("initializing project");
|
||||||
"workspace member: {} failed to parse",
|
tracing::trace!("found context: {:?}", context);
|
||||||
&member.path
|
}
|
||||||
))?;
|
|
||||||
|
|
||||||
workspace_members.push((workspace_member_path, project));
|
Commands::Info {} => {
|
||||||
}
|
let output = serde_json::to_string_pretty(&context)?;
|
||||||
|
println!("{}", output.to_colored_json_auto().unwrap_or(output));
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: 1a (optional). Resolve dependencies
|
Commands::Template {} => {
|
||||||
// 2. Reconcile plans
|
tracing::info!("templating");
|
||||||
|
|
||||||
let mut member_contexts = Vec::new();
|
let Some(template) = context.project.templates else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
|
||||||
for (member_path, member) in &workspace_members {
|
match template.ty {
|
||||||
match member {
|
TemplateType::Jinja2 => {
|
||||||
WorkspaceProject::Plan(_plan) => {
|
for entry in glob::glob(&format!(
|
||||||
tracing::warn!("skipping reconcile for plans for now")
|
"{}/{}",
|
||||||
}
|
project_path.display().to_string().trim_end_matches("/"),
|
||||||
WorkspaceProject::Project(project) => {
|
template.path.trim_start_matches("./"),
|
||||||
let plan = if let Some(plan_file_path) = PlanReconciler::new()
|
))
|
||||||
.reconcile(
|
.map_err(|e| anyhow::anyhow!("failed to read glob pattern: {}", e))?
|
||||||
project,
|
{
|
||||||
member_path,
|
let entry =
|
||||||
Some(workspace_members.as_ref()),
|
entry.map_err(|e| anyhow::anyhow!("failed to read path: {}", e))?;
|
||||||
Some(&project_path),
|
let entry_name = entry.display().to_string();
|
||||||
)
|
|
||||||
.await?
|
|
||||||
{
|
|
||||||
let plan_file = tokio::fs::read_to_string(&plan_file_path)
|
|
||||||
.await
|
|
||||||
.context(format!(
|
|
||||||
"failed to read file at: {}",
|
|
||||||
project_path.to_string_lossy()
|
|
||||||
))?;
|
|
||||||
let plan_doc: KdlDocument = plan_file.parse()?;
|
|
||||||
|
|
||||||
let plan: Plan = plan_doc.try_into()?;
|
let entry_rel = if entry.is_absolute() {
|
||||||
tracing::trace!("found a plan name: {}", project.name);
|
entry.strip_prefix(project_path).map(|e| e.to_path_buf())
|
||||||
|
|
||||||
Some(plan)
|
|
||||||
} else {
|
} else {
|
||||||
None
|
Ok(entry.clone())
|
||||||
};
|
};
|
||||||
|
|
||||||
let context = Context {
|
let rel_file_path = entry_rel
|
||||||
project: project.clone(),
|
.map(|p| {
|
||||||
plan,
|
if p.file_name()
|
||||||
};
|
.map(|f| f.to_string_lossy().ends_with(".jinja2"))
|
||||||
member_contexts.push((member_path, context));
|
.unwrap_or(false)
|
||||||
}
|
{
|
||||||
}
|
p.with_file_name(
|
||||||
}
|
p.file_stem().expect("to be able to find a filename"),
|
||||||
|
)
|
||||||
tracing::debug!("run is called, building extra commands, rerunning the parser");
|
} else {
|
||||||
let mut run_cmd = clap::Command::new("run").subcommand_required(true);
|
p.to_path_buf()
|
||||||
|
|
||||||
// 3. Provide context and aggregated commands for projects
|
|
||||||
for (_, context) in &member_contexts {
|
|
||||||
let commands = run::Run::augment_workspace_command(context, &context.project.name);
|
|
||||||
run_cmd = run_cmd.subcommands(commands);
|
|
||||||
}
|
|
||||||
|
|
||||||
run_cmd =
|
|
||||||
run_cmd.subcommand(clap::Command::new("all").allow_external_subcommands(true));
|
|
||||||
|
|
||||||
let mut root = get_root(false).subcommand(run_cmd);
|
|
||||||
let matches = root.get_matches_mut();
|
|
||||||
|
|
||||||
if matches.subcommand().is_none() {
|
|
||||||
root.print_help()?;
|
|
||||||
anyhow::bail!("failed to find command");
|
|
||||||
}
|
|
||||||
|
|
||||||
match matches
|
|
||||||
.subcommand()
|
|
||||||
.expect("forest requires a command to be passed")
|
|
||||||
{
|
|
||||||
("run", args) => {
|
|
||||||
let (run_args, args) = args.subcommand().expect("run must have subcommands");
|
|
||||||
|
|
||||||
match run_args {
|
|
||||||
"all" => {
|
|
||||||
let (all_cmd, _args) = args
|
|
||||||
.subcommand()
|
|
||||||
.expect("to be able to get a subcommand (todo: might not work)");
|
|
||||||
|
|
||||||
for (member_path, context) in member_contexts {
|
|
||||||
run::Run::execute_command_if_exists(all_cmd, member_path, &context)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
let (project_name, command) = run_args
|
|
||||||
.split_once("::")
|
|
||||||
.expect("commands to always be pairs for workspaces");
|
|
||||||
|
|
||||||
let mut found_context = false;
|
|
||||||
for (member_path, context) in &member_contexts {
|
|
||||||
if project_name == context.project.name {
|
|
||||||
run::Run::execute_command(command, member_path, context)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
found_context = true;
|
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
|
.map_err(|e| {
|
||||||
|
anyhow::anyhow!(
|
||||||
|
"failed to find relative file: {}, project: {}, file: {}",
|
||||||
|
e,
|
||||||
|
project_path.display(),
|
||||||
|
entry_name
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
|
||||||
if !found_context {
|
let output_file_path = project_path
|
||||||
anyhow::bail!("no matching context was found")
|
.join(".forest/temp")
|
||||||
}
|
.join(&template.output)
|
||||||
|
.join(rel_file_path);
|
||||||
|
|
||||||
|
let contents = tokio::fs::read_to_string(&entry).await.map_err(|e| {
|
||||||
|
anyhow::anyhow!(
|
||||||
|
"failed to read template: {}, err: {}",
|
||||||
|
entry.display(),
|
||||||
|
e
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let mut env = minijinja::Environment::new();
|
||||||
|
env.add_template(&entry_name, &contents)?;
|
||||||
|
let tmpl = env.get_template(&entry_name)?;
|
||||||
|
|
||||||
|
let output = tmpl
|
||||||
|
.render(minijinja::context! {})
|
||||||
|
.map_err(|e| anyhow::anyhow!("failed to render template: {}", e))?;
|
||||||
|
|
||||||
|
tracing::info!("rendered template: {}", output);
|
||||||
|
|
||||||
|
if let Some(parent) = output_file_path.parent() {
|
||||||
|
tokio::fs::create_dir_all(parent).await.map_err(|e| {
|
||||||
|
anyhow::anyhow!(
|
||||||
|
"failed to create directory (path: {}) for output: {}",
|
||||||
|
parent.display(),
|
||||||
|
e
|
||||||
|
)
|
||||||
|
})?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let mut output_file = tokio::fs::File::create(&output_file_path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
anyhow::anyhow!(
|
||||||
|
"failed to create file: {}, error: {}",
|
||||||
|
output_file_path.display(),
|
||||||
|
e
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
output_file.write_all(output.as_bytes()).await?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => match Commands::from_arg_matches(&matches).unwrap() {
|
|
||||||
Commands::Init {} => {
|
|
||||||
tracing::info!("initializing project");
|
|
||||||
}
|
|
||||||
Commands::Info {} => {
|
|
||||||
let output = serde_json::to_string_pretty(&member_contexts)?;
|
|
||||||
println!("{}", output.to_colored_json_auto().unwrap_or(output));
|
|
||||||
}
|
|
||||||
Commands::Template(template) => {
|
|
||||||
//template.execute(&project_path, &context).await?;
|
|
||||||
}
|
|
||||||
Commands::Serve {
|
|
||||||
s3_endpoint,
|
|
||||||
s3_bucket,
|
|
||||||
s3_region,
|
|
||||||
s3_user,
|
|
||||||
s3_password,
|
|
||||||
..
|
|
||||||
} => {
|
|
||||||
tracing::info!("Starting server");
|
|
||||||
let creds = Credentials::new(s3_user, s3_password);
|
|
||||||
let bucket = Bucket::new(
|
|
||||||
url::Url::parse(&s3_endpoint)?,
|
|
||||||
rusty_s3::UrlStyle::Path,
|
|
||||||
s3_bucket,
|
|
||||||
s3_region,
|
|
||||||
)?;
|
|
||||||
let put_object = bucket.put_object(Some(&creds), "some-object");
|
|
||||||
let _url = put_object.sign(std::time::Duration::from_secs(30));
|
|
||||||
let _state = SharedState::new().await?;
|
|
||||||
}
|
|
||||||
Commands::Clean {} => {
|
|
||||||
todo!();
|
|
||||||
// let forest_path = project_path.join(".forest");
|
|
||||||
// if forest_path.exists() {
|
|
||||||
// tokio::fs::remove_dir_all(forest_path).await?;
|
|
||||||
// tracing::info!("removed .forest");
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ForestFile::Project(project) => {
|
|
||||||
tracing::trace!("found a project name: {}", project.name);
|
|
||||||
|
|
||||||
let plan = if let Some(plan_file_path) = PlanReconciler::new()
|
Commands::Serve {
|
||||||
.reconcile(&project, &project_path, None, None)
|
host,
|
||||||
.await?
|
s3_endpoint,
|
||||||
{
|
s3_bucket,
|
||||||
let plan_file = tokio::fs::read_to_string(&plan_file_path).await?;
|
s3_region,
|
||||||
let plan_doc: KdlDocument = plan_file.parse()?;
|
s3_user,
|
||||||
|
s3_password,
|
||||||
let plan: Plan = plan_doc.try_into()?;
|
} => {
|
||||||
tracing::trace!("found a plan name: {}", project.name);
|
tracing::info!("Starting server");
|
||||||
|
let creds = Credentials::new(s3_user, s3_password);
|
||||||
Some(plan)
|
let bucket = Bucket::new(
|
||||||
} else {
|
url::Url::parse(&s3_endpoint)?,
|
||||||
None
|
rusty_s3::UrlStyle::Path,
|
||||||
};
|
s3_bucket,
|
||||||
|
s3_region,
|
||||||
let context = Context { project, plan };
|
)?;
|
||||||
|
let put_object = bucket.put_object(Some(&creds), "some-object");
|
||||||
let matches = if matches.subcommand_matches("run").is_some() {
|
let _url = put_object.sign(std::time::Duration::from_secs(30));
|
||||||
tracing::debug!("run is called, building extra commands, rerunning the parser");
|
let _state = SharedState::new().await?;
|
||||||
let root = get_root(false);
|
|
||||||
|
|
||||||
let run_cmd = run::Run::augment_command(&context);
|
|
||||||
root.subcommand(run_cmd).get_matches()
|
|
||||||
} else {
|
|
||||||
matches
|
|
||||||
};
|
|
||||||
|
|
||||||
match matches
|
|
||||||
.subcommand()
|
|
||||||
.expect("forest requires a command to be passed")
|
|
||||||
{
|
|
||||||
("run", args) => {
|
|
||||||
run::Run::execute(args, &project_path, &context).await?;
|
|
||||||
}
|
|
||||||
_ => match Commands::from_arg_matches(&matches).unwrap() {
|
|
||||||
Commands::Init {} => {
|
|
||||||
tracing::info!("initializing project");
|
|
||||||
tracing::trace!("found context: {:?}", context);
|
|
||||||
}
|
|
||||||
Commands::Info {} => {
|
|
||||||
let output = serde_json::to_string_pretty(&context)?;
|
|
||||||
println!("{}", output.to_colored_json_auto().unwrap_or(output));
|
|
||||||
}
|
|
||||||
Commands::Template(template) => {
|
|
||||||
template.execute(&project_path, &context).await?;
|
|
||||||
}
|
|
||||||
Commands::Serve {
|
|
||||||
s3_endpoint,
|
|
||||||
s3_bucket,
|
|
||||||
s3_region,
|
|
||||||
s3_user,
|
|
||||||
s3_password,
|
|
||||||
..
|
|
||||||
} => {
|
|
||||||
tracing::info!("Starting server");
|
|
||||||
let creds = Credentials::new(s3_user, s3_password);
|
|
||||||
let bucket = Bucket::new(
|
|
||||||
url::Url::parse(&s3_endpoint)?,
|
|
||||||
rusty_s3::UrlStyle::Path,
|
|
||||||
s3_bucket,
|
|
||||||
s3_region,
|
|
||||||
)?;
|
|
||||||
let put_object = bucket.put_object(Some(&creds), "some-object");
|
|
||||||
let _url = put_object.sign(std::time::Duration::from_secs(30));
|
|
||||||
let _state = SharedState::new().await?;
|
|
||||||
}
|
|
||||||
Commands::Clean {} => {
|
|
||||||
let forest_path = project_path.join(".forest");
|
|
||||||
if forest_path.exists() {
|
|
||||||
tokio::fs::remove_dir_all(forest_path).await?;
|
|
||||||
tracing::info!("removed .forest");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,166 +0,0 @@
|
|||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use crate::{model::Context, script::ScriptExecutor};
|
|
||||||
|
|
||||||
// Run is a bit special in that because the arguments dynamically render, we need to do some special magic in
|
|
||||||
// clap to avoid having to do hacks to register clap subcommands midcommand. As such instead, we opt to simply
|
|
||||||
// create a new sub command that encapsulates all the run complexities
|
|
||||||
pub struct Run {}
|
|
||||||
impl Run {
|
|
||||||
pub fn augment_command(ctx: &Context) -> clap::Command {
|
|
||||||
let mut run_cmd = clap::Command::new("run")
|
|
||||||
.subcommand_required(true)
|
|
||||||
.about("runs any kind of script from either the project or plan");
|
|
||||||
|
|
||||||
if let Some(scripts) = &ctx.project.scripts {
|
|
||||||
for name in scripts.items.keys() {
|
|
||||||
let cmd = clap::Command::new(name.to_string());
|
|
||||||
run_cmd = run_cmd.subcommand(cmd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(plan) = &ctx.plan {
|
|
||||||
if let Some(scripts) = &plan.scripts {
|
|
||||||
let existing_cmds = run_cmd
|
|
||||||
.get_subcommands()
|
|
||||||
.map(|s| s.get_name().to_string())
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
for name in scripts.items.keys() {
|
|
||||||
if existing_cmds.contains(name) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
let cmd = clap::Command::new(name.to_string());
|
|
||||||
run_cmd = run_cmd.subcommand(cmd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
run_cmd
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn augment_workspace_command(ctx: &Context, prefix: &str) -> Vec<clap::Command> {
|
|
||||||
let mut commands = Vec::new();
|
|
||||||
if let Some(scripts) = &ctx.project.scripts {
|
|
||||||
for name in scripts.items.keys() {
|
|
||||||
let cmd = clap::Command::new(format!("{prefix}::{name}"));
|
|
||||||
commands.push(cmd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(plan) = &ctx.plan {
|
|
||||||
if let Some(scripts) = &plan.scripts {
|
|
||||||
let existing_cmds = commands
|
|
||||||
.iter()
|
|
||||||
.map(|s| format!("{prefix}::{}", s.get_name()))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
for name in scripts.items.keys() {
|
|
||||||
if existing_cmds.contains(name) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
let cmd = clap::Command::new(format!("{prefix}::{name}"));
|
|
||||||
commands.push(cmd)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
commands
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn execute(
|
|
||||||
args: &clap::ArgMatches,
|
|
||||||
project_path: &Path,
|
|
||||||
ctx: &Context,
|
|
||||||
) -> anyhow::Result<()> {
|
|
||||||
let Some((name, args)) = args.subcommand() else {
|
|
||||||
anyhow::bail!("failed to find a matching run command")
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(scripts_ctx) = &ctx.project.scripts {
|
|
||||||
if let Some(script_ctx) = scripts_ctx.items.get(name) {
|
|
||||||
ScriptExecutor::new(project_path.into(), ctx.clone())
|
|
||||||
.run(script_ctx, name)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(plan) = &ctx.plan {
|
|
||||||
if let Some(scripts_ctx) = &plan.scripts {
|
|
||||||
if let Some(script_ctx) = scripts_ctx.items.get(name) {
|
|
||||||
ScriptExecutor::new(project_path.into(), ctx.clone())
|
|
||||||
.run(script_ctx, name)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
anyhow::bail!("no scripts were found for command: {}", name)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn execute_command(
|
|
||||||
command: &str,
|
|
||||||
project_path: &Path,
|
|
||||||
ctx: &Context,
|
|
||||||
) -> anyhow::Result<()> {
|
|
||||||
if let Some(scripts_ctx) = &ctx.project.scripts {
|
|
||||||
if let Some(script_ctx) = scripts_ctx.items.get(command) {
|
|
||||||
ScriptExecutor::new(project_path.into(), ctx.clone())
|
|
||||||
.run(script_ctx, command)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(plan) = &ctx.plan {
|
|
||||||
if let Some(scripts_ctx) = &plan.scripts {
|
|
||||||
if let Some(script_ctx) = scripts_ctx.items.get(command) {
|
|
||||||
ScriptExecutor::new(project_path.into(), ctx.clone())
|
|
||||||
.run(script_ctx, command)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
anyhow::bail!("no scripts were found for command: {}", command)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn execute_command_if_exists(
|
|
||||||
command: &str,
|
|
||||||
project_path: &Path,
|
|
||||||
ctx: &Context,
|
|
||||||
) -> anyhow::Result<()> {
|
|
||||||
if let Some(scripts_ctx) = &ctx.project.scripts {
|
|
||||||
if let Some(script_ctx) = scripts_ctx.items.get(command) {
|
|
||||||
ScriptExecutor::new(project_path.into(), ctx.clone())
|
|
||||||
.run(script_ctx, command)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(plan) = &ctx.plan {
|
|
||||||
if let Some(scripts_ctx) = &plan.scripts {
|
|
||||||
if let Some(script_ctx) = scripts_ctx.items.get(command) {
|
|
||||||
ScriptExecutor::new(project_path.into(), ctx.clone())
|
|
||||||
.run(script_ctx, command)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,206 +0,0 @@
|
|||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use tokio::io::AsyncWriteExt;
|
|
||||||
|
|
||||||
use crate::model::{Context, TemplateType};
|
|
||||||
|
|
||||||
#[derive(clap::Parser)]
|
|
||||||
pub struct Template {}
|
|
||||||
|
|
||||||
impl Template {
|
|
||||||
pub async fn execute(self, project_path: &Path, context: &Context) -> anyhow::Result<()> {
|
|
||||||
tracing::info!("templating");
|
|
||||||
|
|
||||||
self.execute_plan(project_path, context).await?;
|
|
||||||
self.execute_project(project_path, context).await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn execute_plan(&self, project_path: &Path, context: &Context) -> anyhow::Result<()> {
|
|
||||||
let plan_path = &project_path.join(".forest").join("plan");
|
|
||||||
|
|
||||||
let Some(Some(template)) = &context.plan.as_ref().map(|p| &p.templates) else {
|
|
||||||
return Ok(());
|
|
||||||
};
|
|
||||||
|
|
||||||
match template.ty {
|
|
||||||
TemplateType::Jinja2 => {
|
|
||||||
for entry in glob::glob(&format!(
|
|
||||||
"{}/{}",
|
|
||||||
plan_path.display().to_string().trim_end_matches("/"),
|
|
||||||
template.path.trim_start_matches("./"),
|
|
||||||
))
|
|
||||||
.map_err(|e| anyhow::anyhow!("failed to read glob pattern: {}", e))?
|
|
||||||
{
|
|
||||||
let entry = entry.map_err(|e| anyhow::anyhow!("failed to read path: {}", e))?;
|
|
||||||
let entry_name = entry.display().to_string();
|
|
||||||
|
|
||||||
let entry_rel = if entry.is_absolute() {
|
|
||||||
entry.strip_prefix(plan_path).map(|e| e.to_path_buf())
|
|
||||||
} else {
|
|
||||||
Ok(entry.clone())
|
|
||||||
};
|
|
||||||
|
|
||||||
let rel_file_path = entry_rel
|
|
||||||
.map(|p| {
|
|
||||||
if p.file_name()
|
|
||||||
.map(|f| f.to_string_lossy().ends_with(".jinja2"))
|
|
||||||
.unwrap_or(false)
|
|
||||||
{
|
|
||||||
p.with_file_name(
|
|
||||||
p.file_stem().expect("to be able to find a filename"),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
p.to_path_buf()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.map_err(|e| {
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"failed to find relative file: {}, project: {}, file: {}",
|
|
||||||
e,
|
|
||||||
plan_path.display(),
|
|
||||||
entry_name
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let output_file_path = project_path
|
|
||||||
.join(".forest/temp")
|
|
||||||
.join(&template.output)
|
|
||||||
.join(rel_file_path);
|
|
||||||
|
|
||||||
let contents = tokio::fs::read_to_string(&entry).await.map_err(|e| {
|
|
||||||
anyhow::anyhow!("failed to read template: {}, err: {}", entry.display(), e)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let mut env = minijinja::Environment::new();
|
|
||||||
env.add_template(&entry_name, &contents)?;
|
|
||||||
env.add_global("global", &context.project.global);
|
|
||||||
|
|
||||||
let tmpl = env.get_template(&entry_name)?;
|
|
||||||
|
|
||||||
let output = tmpl
|
|
||||||
.render(minijinja::context! {})
|
|
||||||
.map_err(|e| anyhow::anyhow!("failed to render template: {}", e))?;
|
|
||||||
|
|
||||||
tracing::info!("rendered template: {}", output);
|
|
||||||
|
|
||||||
if let Some(parent) = output_file_path.parent() {
|
|
||||||
tokio::fs::create_dir_all(parent).await.map_err(|e| {
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"failed to create directory (path: {}) for output: {}",
|
|
||||||
parent.display(),
|
|
||||||
e
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut output_file = tokio::fs::File::create(&output_file_path)
|
|
||||||
.await
|
|
||||||
.map_err(|e| {
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"failed to create file: {}, error: {}",
|
|
||||||
output_file_path.display(),
|
|
||||||
e
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
output_file.write_all(output.as_bytes()).await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
async fn execute_project(&self, project_path: &Path, context: &Context) -> anyhow::Result<()> {
|
|
||||||
let Some(template) = &context.project.templates else {
|
|
||||||
return Ok(());
|
|
||||||
};
|
|
||||||
|
|
||||||
match template.ty {
|
|
||||||
TemplateType::Jinja2 => {
|
|
||||||
for entry in glob::glob(&format!(
|
|
||||||
"{}/{}",
|
|
||||||
project_path.display().to_string().trim_end_matches("/"),
|
|
||||||
template.path.trim_start_matches("./"),
|
|
||||||
))
|
|
||||||
.map_err(|e| anyhow::anyhow!("failed to read glob pattern: {}", e))?
|
|
||||||
{
|
|
||||||
let entry = entry.map_err(|e| anyhow::anyhow!("failed to read path: {}", e))?;
|
|
||||||
let entry_name = entry.display().to_string();
|
|
||||||
|
|
||||||
let entry_rel = if entry.is_absolute() {
|
|
||||||
entry.strip_prefix(project_path).map(|e| e.to_path_buf())
|
|
||||||
} else {
|
|
||||||
Ok(entry.clone())
|
|
||||||
};
|
|
||||||
|
|
||||||
let rel_file_path = entry_rel
|
|
||||||
.map(|p| {
|
|
||||||
if p.file_name()
|
|
||||||
.map(|f| f.to_string_lossy().ends_with(".jinja2"))
|
|
||||||
.unwrap_or(false)
|
|
||||||
{
|
|
||||||
p.with_file_name(
|
|
||||||
p.file_stem().expect("to be able to find a filename"),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
p.to_path_buf()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.map_err(|e| {
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"failed to find relative file: {}, project: {}, file: {}",
|
|
||||||
e,
|
|
||||||
project_path.display(),
|
|
||||||
entry_name
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let output_file_path = project_path
|
|
||||||
.join(".forest/temp")
|
|
||||||
.join(&template.output)
|
|
||||||
.join(rel_file_path);
|
|
||||||
|
|
||||||
let contents = tokio::fs::read_to_string(&entry).await.map_err(|e| {
|
|
||||||
anyhow::anyhow!("failed to read template: {}, err: {}", entry.display(), e)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let mut env = minijinja::Environment::new();
|
|
||||||
env.add_template(&entry_name, &contents)?;
|
|
||||||
env.add_global("global", &context.project.global);
|
|
||||||
|
|
||||||
let tmpl = env.get_template(&entry_name)?;
|
|
||||||
|
|
||||||
let output = tmpl
|
|
||||||
.render(minijinja::context! {})
|
|
||||||
.map_err(|e| anyhow::anyhow!("failed to render template: {}", e))?;
|
|
||||||
|
|
||||||
tracing::info!("rendered template: {}", output);
|
|
||||||
|
|
||||||
if let Some(parent) = output_file_path.parent() {
|
|
||||||
tokio::fs::create_dir_all(parent).await.map_err(|e| {
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"failed to create directory (path: {}) for output: {}",
|
|
||||||
parent.display(),
|
|
||||||
e
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut output_file = tokio::fs::File::create(&output_file_path)
|
|
||||||
.await
|
|
||||||
.map_err(|e| {
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"failed to create file: {}, error: {}",
|
|
||||||
output_file_path.display(),
|
|
||||||
e
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
output_file.write_all(output.as_bytes()).await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +1,12 @@
|
|||||||
use tracing::level_filters::LevelFilter;
|
|
||||||
use tracing_subscriber::EnvFilter;
|
|
||||||
|
|
||||||
pub mod cli;
|
pub mod cli;
|
||||||
pub mod model;
|
pub mod model;
|
||||||
pub mod plan_reconciler;
|
pub mod plan_reconciler;
|
||||||
pub mod script;
|
|
||||||
pub mod state;
|
pub mod state;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> anyhow::Result<()> {
|
async fn main() -> anyhow::Result<()> {
|
||||||
dotenvy::dotenv().ok();
|
dotenvy::dotenv().ok();
|
||||||
tracing_subscriber::fmt()
|
tracing_subscriber::fmt::init();
|
||||||
.with_env_filter(
|
|
||||||
EnvFilter::builder()
|
|
||||||
.with_default_directive(LevelFilter::WARN.into())
|
|
||||||
.with_env_var("FOREST_LOG_LEVEL")
|
|
||||||
.from_env()?,
|
|
||||||
)
|
|
||||||
.init();
|
|
||||||
|
|
||||||
cli::execute().await?;
|
cli::execute().await?;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use std::{collections::BTreeMap, fmt::Debug, path::PathBuf};
|
use std::{collections::BTreeMap, fmt::Debug, path::PathBuf};
|
||||||
|
|
||||||
use kdl::{KdlDocument, KdlNode, KdlValue};
|
use kdl::{KdlDocument, KdlEntry, KdlNode, KdlValue};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
@@ -12,10 +12,6 @@ pub struct Context {
|
|||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
pub struct Plan {
|
pub struct Plan {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub templates: Option<Templates>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub scripts: Option<Scripts>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<KdlDocument> for Plan {
|
impl TryFrom<KdlDocument> for Plan {
|
||||||
@@ -39,14 +35,6 @@ impl TryFrom<KdlDocument> for Plan {
|
|||||||
})
|
})
|
||||||
.cloned()
|
.cloned()
|
||||||
.ok_or(anyhow::anyhow!("a forest kuddle plan must have a name"))?,
|
.ok_or(anyhow::anyhow!("a forest kuddle plan must have a name"))?,
|
||||||
templates: plan_children
|
|
||||||
.get("templates")
|
|
||||||
.map(|t| t.try_into())
|
|
||||||
.transpose()?,
|
|
||||||
scripts: plan_children
|
|
||||||
.get("scripts")
|
|
||||||
.map(|m| m.try_into())
|
|
||||||
.transpose()?,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -55,8 +43,6 @@ impl TryFrom<KdlDocument> for Plan {
|
|||||||
#[serde(untagged)]
|
#[serde(untagged)]
|
||||||
pub enum ProjectPlan {
|
pub enum ProjectPlan {
|
||||||
Local { path: PathBuf },
|
Local { path: PathBuf },
|
||||||
Git { url: String, path: Option<PathBuf> },
|
|
||||||
Workspace { name: String },
|
|
||||||
NoPlan,
|
NoPlan,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,35 +64,6 @@ impl TryFrom<&KdlNode> for ProjectPlan {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(git) = children.get_arg("git") {
|
|
||||||
return Ok(Self::Git {
|
|
||||||
url: git
|
|
||||||
.as_string()
|
|
||||||
.map(|l| l.to_string())
|
|
||||||
.ok_or(anyhow::anyhow!("a git url is required"))?,
|
|
||||||
path: children
|
|
||||||
.get("git")
|
|
||||||
.and_then(|git| {
|
|
||||||
git.entries()
|
|
||||||
.iter()
|
|
||||||
.filter(|i| i.name().is_some())
|
|
||||||
.find(|i| i.name().expect("to have a value").to_string() == "path")
|
|
||||||
})
|
|
||||||
.and_then(|i| i.value().as_string().map(|p| p.to_string().into())),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(workspace) = children.get_arg("workspace") {
|
|
||||||
return Ok(Self::Workspace {
|
|
||||||
name: workspace
|
|
||||||
.as_string()
|
|
||||||
.map(|w| w.to_string())
|
|
||||||
.ok_or(anyhow::anyhow!(
|
|
||||||
"workspace requires a project name in the same project"
|
|
||||||
))?,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self::NoPlan)
|
Ok(Self::NoPlan)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -173,22 +130,9 @@ impl TryFrom<&KdlValue> for GlobalVariable {
|
|||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Default)]
|
#[derive(Debug, Clone, Serialize, Default)]
|
||||||
pub struct Global {
|
pub struct Global {
|
||||||
#[serde(flatten)]
|
|
||||||
items: BTreeMap<String, GlobalVariable>,
|
items: BTreeMap<String, GlobalVariable>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Global {
|
|
||||||
fn is_empty(&self) -> bool {
|
|
||||||
self.items.is_empty()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<&Global> for minijinja::Value {
|
|
||||||
fn from(value: &Global) -> Self {
|
|
||||||
Self::from_serialize(&value.items)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<&KdlNode> for Global {
|
impl TryFrom<&KdlNode> for Global {
|
||||||
type Error = anyhow::Error;
|
type Error = anyhow::Error;
|
||||||
|
|
||||||
@@ -253,10 +197,7 @@ impl TryFrom<&KdlNode> for Templates {
|
|||||||
match val.to_lowercase().as_str() {
|
match val.to_lowercase().as_str() {
|
||||||
"jinja2" => templates.ty = TemplateType::Jinja2,
|
"jinja2" => templates.ty = TemplateType::Jinja2,
|
||||||
e => {
|
e => {
|
||||||
anyhow::bail!(
|
anyhow::bail!("failed to find a template matching the required type: {}, only 'jinja2' is supported", e);
|
||||||
"failed to find a template matching the required type: {}, only 'jinja2' is supported",
|
|
||||||
e
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -283,23 +224,12 @@ impl TryFrom<&KdlNode> for Templates {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
#[serde(tag = "type")]
|
pub struct Action {}
|
||||||
pub enum Script {
|
|
||||||
Shell {},
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<&KdlNode> for Script {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
|
|
||||||
fn try_from(value: &KdlNode) -> Result<Self, Self::Error> {
|
|
||||||
Ok(Self::Shell {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
pub struct Scripts {
|
pub struct Scripts {
|
||||||
#[serde(flatten)]
|
pub path: PathBuf,
|
||||||
pub items: BTreeMap<String, Script>,
|
pub actions: BTreeMap<String, Action>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<&KdlNode> for Scripts {
|
impl TryFrom<&KdlNode> for Scripts {
|
||||||
@@ -307,21 +237,22 @@ impl TryFrom<&KdlNode> for Scripts {
|
|||||||
|
|
||||||
fn try_from(value: &KdlNode) -> Result<Self, Self::Error> {
|
fn try_from(value: &KdlNode) -> Result<Self, Self::Error> {
|
||||||
let val = Self {
|
let val = Self {
|
||||||
items: {
|
path: value
|
||||||
let mut out = BTreeMap::default();
|
.get("path")
|
||||||
if let Some(children) = value.children() {
|
.and_then(|p| p.as_string())
|
||||||
for entry in children.nodes() {
|
.map(PathBuf::from)
|
||||||
let name = entry.name().value();
|
.unwrap_or(PathBuf::from("scripts/")),
|
||||||
let val = entry.try_into()?;
|
actions: value
|
||||||
|
.children()
|
||||||
out.insert(name.to_string(), val);
|
.and_then(|c| c.get("actions"))
|
||||||
}
|
.and_then(|a| a.children())
|
||||||
|
.map(|d| {
|
||||||
out
|
d.nodes()
|
||||||
} else {
|
.iter()
|
||||||
out
|
.map(|n| (n.name().value().to_string(), Action {}))
|
||||||
}
|
.collect::<BTreeMap<String, Action>>()
|
||||||
},
|
})
|
||||||
|
.unwrap_or_default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(val)
|
Ok(val)
|
||||||
@@ -331,16 +262,10 @@ impl TryFrom<&KdlNode> for Scripts {
|
|||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
pub struct Project {
|
pub struct Project {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub plan: Option<ProjectPlan>,
|
pub plan: Option<ProjectPlan>,
|
||||||
|
|
||||||
#[serde(skip_serializing_if = "Global::is_empty")]
|
|
||||||
pub global: Global,
|
pub global: Global,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub templates: Option<Templates>,
|
pub templates: Option<Templates>,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub scripts: Option<Scripts>,
|
pub scripts: Option<Scripts>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -397,111 +322,3 @@ impl TryFrom<KdlDocument> for Project {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
|
||||||
pub struct WorkspaceMember {
|
|
||||||
pub path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<&kdl::KdlNode> for WorkspaceMember {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
|
|
||||||
fn try_from(value: &kdl::KdlNode) -> Result<Self, Self::Error> {
|
|
||||||
Ok(Self {
|
|
||||||
path: value
|
|
||||||
.entries()
|
|
||||||
.first()
|
|
||||||
.ok_or(anyhow::anyhow!(
|
|
||||||
"is supposed to have a path `member ./some-path`"
|
|
||||||
))?
|
|
||||||
.value()
|
|
||||||
.as_string()
|
|
||||||
.ok_or(anyhow::anyhow!("value is required to be a string"))?
|
|
||||||
.to_string(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
|
||||||
pub struct Workspace {
|
|
||||||
pub members: Vec<WorkspaceMember>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<KdlDocument> for Workspace {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
|
|
||||||
fn try_from(value: KdlDocument) -> Result<Self, Self::Error> {
|
|
||||||
let workspace = value
|
|
||||||
.get("workspace")
|
|
||||||
.expect("to have a workspace at this point")
|
|
||||||
.children()
|
|
||||||
.ok_or(anyhow::anyhow!("workspace to be a section"))?;
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
members: workspace
|
|
||||||
.get("members")
|
|
||||||
.ok_or(anyhow::anyhow!(
|
|
||||||
"a members section is required for a workspace"
|
|
||||||
))?
|
|
||||||
.children()
|
|
||||||
.ok_or(anyhow::anyhow!("a members is required to have children"))?
|
|
||||||
.nodes()
|
|
||||||
.iter()
|
|
||||||
.map(|m| m.try_into())
|
|
||||||
.collect::<anyhow::Result<Vec<_>>>()?,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
|
||||||
pub enum ForestFile {
|
|
||||||
Workspace(Workspace),
|
|
||||||
Project(Project),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<KdlDocument> for ForestFile {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
|
|
||||||
fn try_from(value: KdlDocument) -> Result<Self, Self::Error> {
|
|
||||||
if value.get("workspace").is_some() && value.get("project").is_some() {
|
|
||||||
anyhow::bail!("a forest.kdl file cannot contain both a workspace and project")
|
|
||||||
}
|
|
||||||
|
|
||||||
if value.get("project").is_some() {
|
|
||||||
return Ok(Self::Project(value.try_into()?));
|
|
||||||
}
|
|
||||||
|
|
||||||
if value.get("workspace").is_some() {
|
|
||||||
return Ok(Self::Workspace(value.try_into()?));
|
|
||||||
}
|
|
||||||
|
|
||||||
anyhow::bail!("a forest.kdl file must be either a project, workspace or plan")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
|
||||||
#[serde(tag = "type")]
|
|
||||||
pub enum WorkspaceProject {
|
|
||||||
Plan(Plan),
|
|
||||||
Project(Project),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<KdlDocument> for WorkspaceProject {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
|
|
||||||
fn try_from(value: KdlDocument) -> Result<Self, Self::Error> {
|
|
||||||
if value.get("plan").is_some() && value.get("project").is_some() {
|
|
||||||
anyhow::bail!("a forest.kdl file cannot contain both a plan and project")
|
|
||||||
}
|
|
||||||
|
|
||||||
if value.get("project").is_some() {
|
|
||||||
return Ok(Self::Project(value.try_into()?));
|
|
||||||
}
|
|
||||||
|
|
||||||
if value.get("plan").is_some() {
|
|
||||||
return Ok(Self::Plan(value.try_into()?));
|
|
||||||
}
|
|
||||||
|
|
||||||
anyhow::bail!("a forest.kdl file must be either a project, workspace or plan")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,13 +2,10 @@ use std::path::{Path, PathBuf};
|
|||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
|
|
||||||
use crate::model::{Project, WorkspaceProject};
|
use crate::model::Project;
|
||||||
|
|
||||||
pub mod git;
|
|
||||||
pub mod local;
|
pub mod local;
|
||||||
|
|
||||||
mod cache;
|
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct PlanReconciler {}
|
pub struct PlanReconciler {}
|
||||||
|
|
||||||
@@ -21,25 +18,17 @@ impl PlanReconciler {
|
|||||||
&self,
|
&self,
|
||||||
project: &Project,
|
project: &Project,
|
||||||
destination: &Path,
|
destination: &Path,
|
||||||
workspace_members: Option<&Vec<(PathBuf, WorkspaceProject)>>,
|
|
||||||
workspace_root: Option<&Path>,
|
|
||||||
) -> anyhow::Result<Option<PathBuf>> {
|
) -> anyhow::Result<Option<PathBuf>> {
|
||||||
tracing::info!("reconciling project");
|
tracing::info!("reconciling project");
|
||||||
if project.plan.is_none() {
|
if project.plan.is_none() {
|
||||||
tracing::debug!("no plan, returning");
|
tracing::debug!("no plan, returning");
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
let cache = cache::Cache::new(destination);
|
|
||||||
|
|
||||||
// prepare the plan dir
|
// prepare the plan dir
|
||||||
// TODO: We're always deleting, consider some form of caching
|
// TODO: We're always deleting, consider some form of caching
|
||||||
let plan_dir = destination.join(".forest").join("plan");
|
let plan_dir = destination.join(".forest").join("plan");
|
||||||
if plan_dir.exists() {
|
if plan_dir.exists() {
|
||||||
if let Some(secs) = cache.is_cache_valid().await? {
|
|
||||||
tracing::debug!("cache is valid for {} seconds", secs);
|
|
||||||
return Ok(Some(plan_dir.join("forest.kdl")));
|
|
||||||
}
|
|
||||||
|
|
||||||
tokio::fs::remove_dir_all(&plan_dir).await?;
|
tokio::fs::remove_dir_all(&plan_dir).await?;
|
||||||
}
|
}
|
||||||
tokio::fs::create_dir_all(&plan_dir)
|
tokio::fs::create_dir_all(&plan_dir)
|
||||||
@@ -54,24 +43,6 @@ impl PlanReconciler {
|
|||||||
let source = &destination.join(path);
|
let source = &destination.join(path);
|
||||||
local::reconcile(source, &plan_dir).await?;
|
local::reconcile(source, &plan_dir).await?;
|
||||||
}
|
}
|
||||||
crate::model::ProjectPlan::Git { url, path } => {
|
|
||||||
git::reconcile(url, path, &plan_dir).await?;
|
|
||||||
}
|
|
||||||
crate::model::ProjectPlan::Workspace { name } => {
|
|
||||||
let workspace_root = workspace_root.expect("to have workspace root available");
|
|
||||||
|
|
||||||
if let Some(workspace_members) = workspace_members {
|
|
||||||
for (member_path, member) in workspace_members {
|
|
||||||
if let WorkspaceProject::Plan(plan) = member {
|
|
||||||
if &plan.name == name {
|
|
||||||
tracing::debug!("found workspace project: {}", name);
|
|
||||||
local::reconcile(&workspace_root.join(member_path), &plan_dir)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
crate::model::ProjectPlan::NoPlan => {
|
crate::model::ProjectPlan::NoPlan => {
|
||||||
tracing::debug!("no plan, returning");
|
tracing::debug!("no plan, returning");
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
@@ -80,8 +51,6 @@ impl PlanReconciler {
|
|||||||
|
|
||||||
tracing::info!("reconciled project");
|
tracing::info!("reconciled project");
|
||||||
|
|
||||||
cache.upsert_cache().await?;
|
|
||||||
|
|
||||||
Ok(Some(plan_dir.join("forest.kdl")))
|
Ok(Some(plan_dir.join("forest.kdl")))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
use std::{
|
|
||||||
path::{Path, PathBuf},
|
|
||||||
time::UNIX_EPOCH,
|
|
||||||
};
|
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use tokio::io::AsyncWriteExt;
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
|
||||||
struct CacheFile {
|
|
||||||
last_update: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Cache {
|
|
||||||
path: PathBuf,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Cache {
|
|
||||||
pub fn new(destination: &Path) -> Self {
|
|
||||||
Self {
|
|
||||||
path: destination.join(".forest").join("plan.cache.json"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn is_cache_valid(&self) -> anyhow::Result<Option<u64>> {
|
|
||||||
if !self.path.exists() {
|
|
||||||
return Ok(None);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Ok(cache_config) = std::env::var("FOREST_CACHE").map(|c| c.trim().to_lowercase()) {
|
|
||||||
if cache_config.eq("no") || cache_config.eq("false") || cache_config.eq("0") {
|
|
||||||
return Ok(None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let file = tokio::fs::read_to_string(&self.path).await?;
|
|
||||||
let cache_file: CacheFile = serde_json::from_str(&file)?;
|
|
||||||
let unix_cache = std::time::Duration::from_secs(cache_file.last_update);
|
|
||||||
let now = std::time::SystemTime::now().duration_since(UNIX_EPOCH)?;
|
|
||||||
|
|
||||||
let cache_expire = now
|
|
||||||
.as_secs()
|
|
||||||
.saturating_sub(std::time::Duration::from_secs(60 * 60).as_secs()); // cache lasts an hour
|
|
||||||
|
|
||||||
if unix_cache.as_secs() > cache_expire {
|
|
||||||
return Ok(Some(unix_cache.as_secs().saturating_sub(cache_expire)));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn upsert_cache(&self) -> anyhow::Result<()> {
|
|
||||||
if let Some(parent) = self.path.parent() {
|
|
||||||
tokio::fs::create_dir_all(parent).await?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let unix = std::time::SystemTime::now().duration_since(UNIX_EPOCH)?;
|
|
||||||
let cache_file = CacheFile {
|
|
||||||
last_update: unix.as_secs(),
|
|
||||||
};
|
|
||||||
let val = serde_json::to_string_pretty(&cache_file)?;
|
|
||||||
|
|
||||||
let mut file = tokio::fs::File::create(&self.path).await?;
|
|
||||||
file.write_all(val.as_bytes()).await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
use std::{
|
|
||||||
env::temp_dir,
|
|
||||||
path::{Path, PathBuf},
|
|
||||||
};
|
|
||||||
|
|
||||||
use super::local;
|
|
||||||
|
|
||||||
pub async fn reconcile(url: &str, path: &Option<PathBuf>, plan_dir: &Path) -> anyhow::Result<()> {
|
|
||||||
let temp = TempDir::new();
|
|
||||||
tokio::fs::create_dir_all(&temp.0).await?;
|
|
||||||
|
|
||||||
let mut cmd = tokio::process::Command::new("git");
|
|
||||||
cmd.args(["clone", url, &temp.0.display().to_string(), "--depth=1"]);
|
|
||||||
|
|
||||||
tracing::info!("cloning plan: {}", url);
|
|
||||||
let out = cmd.output().await?;
|
|
||||||
if !out.status.success() {
|
|
||||||
let stdout = std::str::from_utf8(&out.stdout).unwrap_or_default();
|
|
||||||
let stderr = std::str::from_utf8(&out.stderr).unwrap_or_default();
|
|
||||||
|
|
||||||
anyhow::bail!("failed to process git plan: {}, {}", stdout, stderr)
|
|
||||||
}
|
|
||||||
|
|
||||||
let temp_plan_dir = if let Some(path) = path {
|
|
||||||
temp.0.join(path)
|
|
||||||
} else {
|
|
||||||
temp.0.to_path_buf()
|
|
||||||
};
|
|
||||||
|
|
||||||
local::reconcile(&temp_plan_dir, plan_dir).await?;
|
|
||||||
|
|
||||||
drop(temp);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
struct TempDir(PathBuf);
|
|
||||||
|
|
||||||
impl TempDir {
|
|
||||||
fn new() -> Self {
|
|
||||||
Self(
|
|
||||||
temp_dir()
|
|
||||||
.join("forest")
|
|
||||||
.join(uuid::Uuid::new_v4().to_string()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for TempDir {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
std::fs::remove_dir_all(&self.0).expect("to be able to remove temp dir");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use shell::ShellExecutor;
|
|
||||||
|
|
||||||
use crate::model::{Context, Script};
|
|
||||||
|
|
||||||
pub mod shell;
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct ScriptExecutor {
|
|
||||||
project_path: PathBuf,
|
|
||||||
ctx: Context,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ScriptExecutor {
|
|
||||||
pub fn new(project_path: PathBuf, ctx: Context) -> Self {
|
|
||||||
Self { project_path, ctx }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn run(&self, script_ctx: &Script, name: &str) -> anyhow::Result<()> {
|
|
||||||
if self.run_project(script_ctx, name).await? {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.run_plan(script_ctx, name).await? {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
anyhow::bail!("script was not found for name: {}", name)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn run_project(&self, script_ctx: &Script, name: &str) -> anyhow::Result<bool> {
|
|
||||||
match script_ctx {
|
|
||||||
Script::Shell {} => {
|
|
||||||
if matches!(
|
|
||||||
ShellExecutor::from(self).execute(name).await?,
|
|
||||||
shell::ScriptStatus::Found
|
|
||||||
) {
|
|
||||||
Ok(true)
|
|
||||||
} else {
|
|
||||||
Ok(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn run_plan(&self, script_ctx: &Script, name: &str) -> anyhow::Result<bool> {
|
|
||||||
match script_ctx {
|
|
||||||
Script::Shell {} => {
|
|
||||||
if matches!(
|
|
||||||
ShellExecutor::from_plan(self).execute(name).await?,
|
|
||||||
shell::ScriptStatus::Found
|
|
||||||
) {
|
|
||||||
Ok(true)
|
|
||||||
} else {
|
|
||||||
Ok(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
use std::{path::PathBuf, process::Stdio};
|
|
||||||
|
|
||||||
use anyhow::Context;
|
|
||||||
|
|
||||||
use super::ScriptExecutor;
|
|
||||||
|
|
||||||
pub struct ShellExecutor {
|
|
||||||
root: ScriptExecutor,
|
|
||||||
ty: ShellType,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub enum ScriptStatus {
|
|
||||||
Found,
|
|
||||||
NotFound,
|
|
||||||
}
|
|
||||||
|
|
||||||
enum ShellType {
|
|
||||||
Plan,
|
|
||||||
Project,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ShellExecutor {
|
|
||||||
pub async fn execute(&self, name: &str) -> anyhow::Result<ScriptStatus> {
|
|
||||||
let path = &self.get_path();
|
|
||||||
let script_path = path.join("scripts").join(format!("{name}.sh"));
|
|
||||||
|
|
||||||
if !script_path.exists() {
|
|
||||||
return Ok(ScriptStatus::NotFound);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut cmd = tokio::process::Command::new(&script_path);
|
|
||||||
let cmd = cmd.current_dir(&self.root.project_path);
|
|
||||||
cmd.stdin(Stdio::inherit());
|
|
||||||
cmd.stdout(Stdio::inherit());
|
|
||||||
cmd.stderr(Stdio::inherit());
|
|
||||||
|
|
||||||
let mut proc = cmd.spawn().context(format!(
|
|
||||||
"failed to spawn process: {}",
|
|
||||||
script_path.display()
|
|
||||||
))?;
|
|
||||||
|
|
||||||
let exit = proc.wait().await?;
|
|
||||||
|
|
||||||
if !exit.success() {
|
|
||||||
anyhow::bail!(
|
|
||||||
"command: {name} failed with status: {}",
|
|
||||||
exit.code().unwrap_or(-1)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(ScriptStatus::Found)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_path(&self) -> PathBuf {
|
|
||||||
match self.ty {
|
|
||||||
//ShellType::Plan => self.root.project_path.join(".forest").join("plan"),
|
|
||||||
ShellType::Plan => self.root.project_path.join(".forest").join("plan"),
|
|
||||||
ShellType::Project => self.root.project_path.clone(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_plan(value: &ScriptExecutor) -> Self {
|
|
||||||
Self {
|
|
||||||
root: value.clone(),
|
|
||||||
ty: ShellType::Plan,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<&ScriptExecutor> for ShellExecutor {
|
|
||||||
fn from(value: &ScriptExecutor) -> Self {
|
|
||||||
Self {
|
|
||||||
root: value.clone(),
|
|
||||||
ty: ShellType::Project,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,3 @@
|
|||||||
plan {
|
plan {
|
||||||
name project
|
name project
|
||||||
|
|
||||||
templates type=jinja2 {
|
|
||||||
path "templates/*.jinja2"
|
|
||||||
output "output/"
|
|
||||||
}
|
|
||||||
|
|
||||||
scripts {
|
|
||||||
world type=shell {}
|
|
||||||
hello type=shell {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello plan"
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello plan world"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
something plan
|
|
||||||
|
|
||||||
val is mapping: {{ global.someKey.some.key.val is mapping }}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
something plan
|
|
||||||
|
|
||||||
val is mapping: {{ global.someKey.some.key.val is mapping }}
|
|
||||||
@@ -26,8 +26,11 @@ project {
|
|||||||
output "output/"
|
output "output/"
|
||||||
}
|
}
|
||||||
|
|
||||||
scripts {
|
scripts type=shell {
|
||||||
hello type=shell {}
|
path "scripts/"
|
||||||
|
actions {
|
||||||
|
build
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello world"
|
|
||||||
@@ -1,3 +1 @@
|
|||||||
something
|
something
|
||||||
|
|
||||||
val is mapping: {{ global.someKey.some.key.val is mapping }}
|
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
project {
|
|
||||||
name local
|
|
||||||
description """
|
|
||||||
A simple local project that depends on ../plan for its utility scripts
|
|
||||||
"""
|
|
||||||
|
|
||||||
plan {
|
|
||||||
git "ssh://git@git.front.kjuulh.io/kjuulh/forest" path="examples/plan"
|
|
||||||
}
|
|
||||||
|
|
||||||
global {
|
|
||||||
someName "name"
|
|
||||||
someKey {
|
|
||||||
someNestedKey "somevalue"
|
|
||||||
some {
|
|
||||||
key {
|
|
||||||
val
|
|
||||||
val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
templates type=jinja2 {
|
|
||||||
path "templates/*.jinja2"
|
|
||||||
output "output/"
|
|
||||||
}
|
|
||||||
|
|
||||||
scripts {
|
|
||||||
hello type=shell {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello world"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
something
|
|
||||||
|
|
||||||
val is mapping: {{ global.someKey.some.key.val is mapping }}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
workspace {
|
|
||||||
members {
|
|
||||||
member "projects/a"
|
|
||||||
member "projects/b"
|
|
||||||
member "plan/a"
|
|
||||||
member "plan/b"
|
|
||||||
// member "components/*"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
plan {
|
|
||||||
name a
|
|
||||||
|
|
||||||
scripts {
|
|
||||||
hello_plan type=shell {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello from plan"
|
|
||||||
|
|
||||||
echo "i am here: $PWD"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
plan {
|
|
||||||
name b
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
project {
|
|
||||||
name a
|
|
||||||
|
|
||||||
plan {
|
|
||||||
workspace a
|
|
||||||
}
|
|
||||||
|
|
||||||
scripts {
|
|
||||||
hello type=shell {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello from a"
|
|
||||||
|
|
||||||
echo "i am here: $PWD"
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
project {
|
|
||||||
name b
|
|
||||||
|
|
||||||
scripts {
|
|
||||||
hello type=shell {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "hello from b"
|
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
"type": "item",
|
"type": "item",
|
||||||
"title": "should be able to download a remote plan",
|
"title": "should be able to download a remote plan",
|
||||||
"description": "",
|
"description": "",
|
||||||
"state": "done"
|
"state": "not-done"
|
||||||
},
|
},
|
||||||
"should be able to template from a remote plan": {
|
"should be able to template from a remote plan": {
|
||||||
"type": "item",
|
"type": "item",
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
"type": "item",
|
"type": "item",
|
||||||
"title": "should be able to use scripts from a remote plan",
|
"title": "should be able to use scripts from a remote plan",
|
||||||
"description": "",
|
"description": "",
|
||||||
"state": "done"
|
"state": "not-done"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user