CHANGELOG.md

@@ -5,31 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.10 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-75bc17e57db222492c6ffd2dfe80208d2bda75c9/> Fix async panic on blocking #19
-   Replaced internal threads with tokio spawn functions
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 1 commit contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Fix async panic on blocking #19 ([`75bc17e`](https://github.com/kjuulh/dagger-rs/commit/75bc17e57db222492c6ffd2dfe80208d2bda75c9))
-</details>
-
 ## v0.2.9 (2023-02-19)
 
 ### New Features

Cargo.lock

@@ -92,15 +92,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
 [[package]]
 name = "cfg-if"
@@ -114,7 +114,7 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "color-eyre",
- "dagger-sdk",
+ "dagger-sdk 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "eyre",
  "tokio",
 ]
@@ -246,10 +246,10 @@ dependencies = [
 
 [[package]]
 name = "dagger-codegen"
-version = "0.2.7"
+version = "0.2.5"
 dependencies = [
  "convert_case",
- "dagger-core",
+ "dagger-core 0.2.2",
  "eyre",
  "genco",
  "itertools",
@@ -260,7 +260,31 @@ dependencies = [
 
 [[package]]
 name = "dagger-core"
-version = "0.2.6"
+version = "0.2.2"
+dependencies = [
+ "clap",
+ "dirs",
+ "eyre",
+ "flate2",
+ "genco",
+ "graphql-introspection-query",
+ "graphql_client",
+ "hex",
+ "hex-literal",
+ "platform-info",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tar",
+ "tempfile",
+]
+
+[[package]]
+name = "dagger-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7efe798e1fe0d882e335aab8928d5deaafb0d27869b69ec7e9e4686548e11753"
 dependencies = [
  "clap",
  "dirs",
@@ -278,17 +302,16 @@ dependencies = [
  "sha2",
  "tar",
  "tempfile",
- "tokio",
 ]
 
 [[package]]
 name = "dagger-rs"
-version = "0.2.10"
+version = "0.2.9"
 dependencies = [
  "clap",
  "color-eyre",
  "dagger-codegen",
- "dagger-core",
+ "dagger-core 0.2.2",
  "dirs",
  "eyre",
  "flate2",
@@ -304,15 +327,14 @@ dependencies = [
  "sha2",
  "tar",
  "tempfile",
- "tokio",
 ]
 
 [[package]]
 name = "dagger-sdk"
-version = "0.2.12"
+version = "0.2.8"
 dependencies = [
  "base64",
- "dagger-core",
+ "dagger-core 0.2.2",
  "derive_builder",
  "eyre",
  "futures",
@@ -325,6 +347,23 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "dagger-sdk"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e90636d5b74ce8a62e8507a8d075c4d997c3123a1709596d0f97c3070f993b2d"
+dependencies = [
+ "base64",
+ "dagger-core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derive_builder",
+ "eyre",
+ "futures",
+ "gql_client",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "darling"
 version = "0.14.3"
@@ -435,9 +474,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
 dependencies = [
  "cfg-if",
 ]
@@ -475,23 +514,23 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.20"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -771,9 +810,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -784,12 +823,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -804,9 +837,9 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
@@ -838,9 +871,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
-version = "0.14.24"
+version = "0.14.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -916,12 +949,12 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -932,14 +965,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -959,9 +992,9 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1037,14 +1070,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1071,7 +1104,7 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
@@ -1086,9 +1119,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "openssl"
@@ -1233,9 +1266,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
  "unicode-ident",
 ]
@@ -1362,16 +1395,16 @@ checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1397,9 +1430,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -1483,18 +1516,18 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
  "autocfg",
 ]
@@ -1607,9 +1640,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
@@ -1644,9 +1677,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
  "tokio",
@@ -1654,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.7"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1749,9 +1782,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
 
 [[package]]
 name = "unreachable"
@@ -1815,9 +1848,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1825,9 +1858,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
  "log",
@@ -1840,9 +1873,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1852,9 +1885,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1862,9 +1895,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1875,9 +1908,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "wasm-streams"
@@ -1894,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-rs"
-version = "0.2.10"
+version = "0.2.9"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -19,8 +19,8 @@ members = [
 ]
 
 [dependencies]
-dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" }
+dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.3" }
-dagger-core = { path = "crates/dagger-core", version = "^0.2.3" }
+dagger-core = { path = "crates/dagger-core", version = "^0.2.2" }
 
 clap = "4.1.6"
 dirs = "4.0.0"
@@ -28,15 +28,17 @@ eyre = "0.6.8"
 flate2 = { version = "1.0.25", features = ["zlib"] }
 genco = "0.17.3"
 graphql-introspection-query = "0.2.0"
-graphql_client = { version = "0.12.0", features = ["reqwest"] }
+graphql_client = { version = "0.12.0", features = [
+  "reqwest",
+  "reqwest-blocking",
+] }
 hex = "0.4.3"
 hex-literal = "0.3.4"
 platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
+reqwest = { version = "0.11.14", features = ["stream", "blocking", "deflate"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
 color-eyre = "0.6.2"
-tokio = { version = "1.25.0", features = ["full"] }

ci/CHANGELOG.md

@@ -1,73 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## v0.1.0 (2023-02-20)
-
-<csr-id-06e2638e1fec0579d992792b94838629739bb1f0/>
-<csr-id-48433cf36884ec9fa4cfed8bc5d4b3e8422c0ab9/>
-<csr-id-45d646203704aed317ee2273b825ae708e83ca32/>
-<csr-id-c35c104b49dc2f4456ed18e353bf8d4017cff640/>
-
-### Chore
-
- - <csr-id-06e2638e1fec0579d992792b94838629739bb1f0/> with actual await on connect
- - <csr-id-48433cf36884ec9fa4cfed8bc5d4b3e8422c0ab9/> with dagger v0.2.10
- - <csr-id-45d646203704aed317ee2273b825ae708e83ca32/> with async/await
- - <csr-id-c35c104b49dc2f4456ed18e353bf8d4017cff640/> update ci to use dagger-sdk v0.2.6
-
-### Documentation
-
- - <csr-id-30b7511e454d4695cc1106a3d303b20aa8647fe4/> add changelog
-
-### New Features
-
- - <csr-id-691ecfbf52fa24a466d554b7b9701d67c33a42a5/> ci with dagger v0.2.2
- - <csr-id-f42da8416a5450c7c3c924353c3cc9112afd18f0/> with sccache
-
-### Bug Fixes
-
- - <csr-id-f40ba9b40312a66b7699209fdddc0153ef139931/> with older version of dagger-sdk
- - <csr-id-02006d40fc2c0383e0412c15c36db9af7eda991f/> without phantom data
- - <csr-id-199fe16dbf426f287a7a5237c25bc16a4cae49bc/> update rust crate dagger-sdk to 0.2.1
- - <csr-id-25fb9d4f24af8e7d6d81463c19a07a718b8a312a/> with secret
- - <csr-id-d72313051b9b46a6eeaa909a11850b3d8fc75e81/> with test changes
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 16 commits contributed to the release over the course of 2 calendar days.
- - 12 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 2 unique issues were worked on: [#7](https://github.com/kjuulh/dagger-rs/issues/7), [#8](https://github.com/kjuulh/dagger-rs/issues/8)
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **[#7](https://github.com/kjuulh/dagger-rs/issues/7)**
-    - add ci ([`4ce58a4`](https://github.com/kjuulh/dagger-rs/commit/4ce58a418c0ccef6cc0bfbaa878453f03c02dffb))
- * **[#8](https://github.com/kjuulh/dagger-rs/issues/8)**
-    - feature with workspace ([`03e022f`](https://github.com/kjuulh/dagger-rs/commit/03e022fcaccd30ef0566dcfe31beb3473706bd1d))
- * **Uncategorized**
-    - add changelog ([`30b7511`](https://github.com/kjuulh/dagger-rs/commit/30b7511e454d4695cc1106a3d303b20aa8647fe4))
-    - with actual await on connect ([`06e2638`](https://github.com/kjuulh/dagger-rs/commit/06e2638e1fec0579d992792b94838629739bb1f0))
-    - with dagger v0.2.10 ([`48433cf`](https://github.com/kjuulh/dagger-rs/commit/48433cf36884ec9fa4cfed8bc5d4b3e8422c0ab9))
-    - with older version of dagger-sdk ([`f40ba9b`](https://github.com/kjuulh/dagger-rs/commit/f40ba9b40312a66b7699209fdddc0153ef139931))
-    - with async/await ([`45d6462`](https://github.com/kjuulh/dagger-rs/commit/45d646203704aed317ee2273b825ae708e83ca32))
-    - update ci to use dagger-sdk v0.2.6 ([`c35c104`](https://github.com/kjuulh/dagger-rs/commit/c35c104b49dc2f4456ed18e353bf8d4017cff640))
-    - without phantom data ([`02006d4`](https://github.com/kjuulh/dagger-rs/commit/02006d40fc2c0383e0412c15c36db9af7eda991f))
-    - ci with dagger v0.2.2 ([`691ecfb`](https://github.com/kjuulh/dagger-rs/commit/691ecfbf52fa24a466d554b7b9701d67c33a42a5))
-    - with bin cache ([`3cb83bb`](https://github.com/kjuulh/dagger-rs/commit/3cb83bb79ceda52a0bf459850252e3902b7352fa))
-    - update rust crate dagger-sdk to 0.2.1 ([`199fe16`](https://github.com/kjuulh/dagger-rs/commit/199fe16dbf426f287a7a5237c25bc16a4cae49bc))
-    - with secret ([`25fb9d4`](https://github.com/kjuulh/dagger-rs/commit/25fb9d4f24af8e7d6d81463c19a07a718b8a312a))
-    - with sccache ([`f42da84`](https://github.com/kjuulh/dagger-rs/commit/f42da8416a5450c7c3c924353c3cc9112afd18f0))
-    - with test changes ([`d723130`](https://github.com/kjuulh/dagger-rs/commit/d72313051b9b46a6eeaa909a11850b3d8fc75e81))
-    - add ci ([`468bca4`](https://github.com/kjuulh/dagger-rs/commit/468bca4a69ec321b3ae1304d29d1be66a921a7db))
-</details>
-

ci/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 clap = "4.1.6"
 color-eyre = "0.6.2"
-dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.12" }
+dagger-sdk = "0.2.8"
 eyre = "0.6.8"
 tokio = { version = "1.25.0", features = ["full"] }

ci/src/main.rs

@@ -12,7 +12,7 @@ async fn main() -> eyre::Result<()> {
         .subcommand(clap::Command::new("release"))
         .get_matches();
 
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     match matches.subcommand() {
         Some(("pr", _)) => {

crates/dagger-codegen/CHANGELOG.md

@@ -5,59 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.7 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.5, dagger-sdk v0.2.12, dagger-codegen v0.2.7 ([`1725c51`](https://github.com/kjuulh/dagger-rs/commit/1725c5188e8a81069ec4a4de569484c921a94927))
-    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-rs/commit/a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de))
-</details>
-
-## v0.2.6 (2023-02-20)
-
-<csr-id-803cfc4f8c4d72ab7d011be5523b3bfc6039de39/>
-
-### Chore
-
- - <csr-id-803cfc4f8c4d72ab7d011be5523b3bfc6039de39/> ran clippy
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 3 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`f869e57`](https://github.com/kjuulh/dagger-rs/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-rs/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
-    - ran clippy ([`803cfc4`](https://github.com/kjuulh/dagger-rs/commit/803cfc4f8c4d72ab7d011be5523b3bfc6039de39))
-</details>
-
 ## v0.2.5 (2023-02-19)
 
 ### New Features
@@ -90,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 3 commits contributed to the release.
+ - 2 commits contributed to the release.
  - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
@@ -101,7 +48,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-sdk v0.2.8, dagger-codegen v0.2.5 ([`0499024`](https://github.com/kjuulh/dagger-rs/commit/04990247ba8e9d0555847f582fef14849dbedebf))
     - add documentation strings ([`978ede6`](https://github.com/kjuulh/dagger-rs/commit/978ede68ae52f5b5150a2aa45b8d6e1fbbbee2f4))
     - Use async runtime instead of blocking. ([`9be6f43`](https://github.com/kjuulh/dagger-rs/commit/9be6f435d9ea39f31a8906e55dbd3e8b1e5ec598))
 </details>

crates/dagger-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-codegen"
-version = "0.2.7"
+version = "0.2.5"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -11,7 +11,7 @@ publish = true
 
 [dependencies]
 convert_case = "0.6.0"
-dagger-core = { path = "../dagger-core", version = "^0.2.6" }
+dagger-core = { path = "../dagger-core", version = "^0.2.2" }
 
 eyre = "0.6.8"
 genco = "0.17.3"

crates/dagger-codegen/src/rust/templates/object_tmpl.rs

@@ -3,7 +3,7 @@ use genco::prelude::rust;
 use genco::quote;
 use itertools::Itertools;
 
-use crate::functions::CommonFunctions;
+use crate::functions::{type_ref_is_optional, CommonFunctions};
 use crate::rust::functions::{
     field_options_struct_name, format_function, format_name, format_optional_args,
     format_struct_comment, format_struct_name,
@@ -12,7 +12,7 @@ use crate::utility::OptionExt;
 
 pub fn render_object(funcs: &CommonFunctions, t: &FullType) -> eyre::Result<rust::Tokens> {
     let selection = rust::import("crate::querybuilder", "Selection");
-    let child = rust::import("tokio::process", "Child");
+    let child = rust::import("std::process", "Child");
     let conn = rust::import("dagger_core::connect_params", "ConnectParams");
     let arc = rust::import("std::sync", "Arc");
 

crates/dagger-core/CHANGELOG.md

@@ -5,114 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.6 (2023-02-20)
-
-### Chore
-
- - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
-
-### Bug Fixes
-
- - <csr-id-8dfecf976c5537cc2c03881de2b2fd2b2508683a/> cli session keep session alive
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - ran clippy ([`1f77d90`](https://github.com/kjuulh/dagger-rs/commit/1f77d90c0f0ac832a181b2322350ea395612986c))
-    - cli session keep session alive ([`8dfecf9`](https://github.com/kjuulh/dagger-rs/commit/8dfecf976c5537cc2c03881de2b2fd2b2508683a))
-</details>
-
-## v0.2.5 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.5, dagger-sdk v0.2.12, dagger-codegen v0.2.7 ([`1725c51`](https://github.com/kjuulh/dagger-rs/commit/1725c5188e8a81069ec4a4de569484c921a94927))
-    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-rs/commit/a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de))
-</details>
-
-## v0.2.4 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-8385aa8a15ff7b45fecc3462c482b998118c14eb/> remove blocking
- - <csr-id-921e61b5e248013cb5fbf4f1bad3eef5a2673145/> remove blocking
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 4 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`f869e57`](https://github.com/kjuulh/dagger-rs/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
-    - remove blocking ([`921e61b`](https://github.com/kjuulh/dagger-rs/commit/921e61b5e248013cb5fbf4f1bad3eef5a2673145))
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-rs/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
-    - remove blocking ([`8385aa8`](https://github.com/kjuulh/dagger-rs/commit/8385aa8a15ff7b45fecc3462c482b998118c14eb))
-</details>
-
-## v0.2.3 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-75bc17e57db222492c6ffd2dfe80208d2bda75c9/> Fix async panic on blocking #19
-   Replaced internal threads with tokio spawn functions
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.3, dagger-sdk v0.2.9, dagger-rs v0.2.10 ([`82de43a`](https://github.com/kjuulh/dagger-rs/commit/82de43aa91d6a5e09a247d1959137fdc36a40d35))
-    - Fix async panic on blocking #19 ([`75bc17e`](https://github.com/kjuulh/dagger-rs/commit/75bc17e57db222492c6ffd2dfe80208d2bda75c9))
-</details>
-
 ## v0.2.2 (2023-02-19)
 
 ### New Features
@@ -123,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 1 commit contributed to the release.
  - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
@@ -134,7 +26,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-rs/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
     - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-rs/commit/6e5f4074329ab0462445b31d4153f8497c483438))
 </details>
 

crates/dagger-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-core"
-version = "0.2.6"
+version = "0.2.2"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -16,14 +16,16 @@ eyre = "0.6.8"
 flate2 = { version = "1.0.25", features = ["zlib"] }
 genco = "0.17.3"
 graphql-introspection-query = "0.2.0"
-graphql_client = { version = "0.12.0", features = ["reqwest"] }
+graphql_client = { version = "0.12.0", features = [
+  "reqwest",
+  "reqwest-blocking",
+] }
 hex = "0.4.3"
 hex-literal = "0.3.4"
 platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
+reqwest = { version = "0.11.14", features = ["stream", "blocking", "deflate"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
-tokio = { version = "1.25.0", features = ["full"] }

crates/dagger-core/src/cli_session.rs

@@ -1,12 +1,11 @@
 use std::{
     fs::canonicalize,
+    io::{BufRead, BufReader},
     path::PathBuf,
-    process::Stdio,
+    process::{Child, Stdio},
-    sync::Arc,
+    sync::{mpsc::sync_channel, Arc},
 };
 
-use tokio::io::AsyncBufReadExt;
-
 use crate::{config::Config, connect_params::ConnectParams};
 
 #[derive(Clone, Debug)]
@@ -21,12 +20,12 @@ impl CliSession {
         }
     }
 
-    pub async fn connect(
+    pub fn connect(
         &self,
         config: &Config,
         cli_path: &PathBuf,
-    ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+    ) -> eyre::Result<(ConnectParams, Child)> {
-        self.inner.connect(config, cli_path).await
+        self.inner.connect(config, cli_path)
     }
 }
 
@@ -34,17 +33,17 @@ impl CliSession {
 struct InnerCliSession {}
 
 impl InnerCliSession {
-    pub async fn connect(
+    pub fn connect(
         &self,
         config: &Config,
         cli_path: &PathBuf,
-    ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+    ) -> eyre::Result<(ConnectParams, Child)> {
         let proc = self.start(config, cli_path)?;
-        let params = self.get_conn(proc).await?;
+        let params = self.get_conn(proc)?;
         Ok(params)
     }
 
-    fn start(&self, config: &Config, cli_path: &PathBuf) -> eyre::Result<tokio::process::Child> {
+    fn start(&self, config: &Config, cli_path: &PathBuf) -> eyre::Result<std::process::Child> {
         let mut args: Vec<String> = vec!["session".into()];
         if let Some(workspace) = &config.workdir_path {
             let abs_path = canonicalize(workspace)?;
@@ -55,7 +54,7 @@ impl InnerCliSession {
             args.extend(["--project".into(), abs_path.to_string_lossy().to_string()])
         }
 
-        let proc = tokio::process::Command::new(
+        let proc = std::process::Command::new(
             cli_path
                 .to_str()
                 .ok_or(eyre::anyhow!("could not get string from path"))?,
@@ -71,10 +70,10 @@ impl InnerCliSession {
         return Ok(proc);
     }
 
-    async fn get_conn(
+    fn get_conn(
         &self,
-        mut proc: tokio::process::Child,
+        mut proc: std::process::Child,
-    ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+    ) -> eyre::Result<(ConnectParams, std::process::Child)> {
         let stdout = proc
             .stdout
             .take()
@@ -85,27 +84,32 @@ impl InnerCliSession {
             .take()
             .ok_or(eyre::anyhow!("could not acquire stderr from child process"))?;
 
-        let (sender, mut receiver) = tokio::sync::mpsc::channel(1);
+        let (sender, receiver) = sync_channel(1);
 
-        tokio::spawn(async move {
+        std::thread::spawn(move || {
-            let mut stdout_bufr = tokio::io::BufReader::new(stdout).lines();
+            let stdout_bufr = BufReader::new(stdout);
-            while let Ok(Some(line)) = stdout_bufr.next_line().await {
+            for line in stdout_bufr.lines() {
-                if let Ok(conn) = serde_json::from_str::<ConnectParams>(&line) {
+                let out = line.as_ref().unwrap();
-                    sender.send(conn).await.unwrap();
+                if let Ok(conn) = serde_json::from_str::<ConnectParams>(&out) {
+                    sender.send(conn).unwrap();
                 }
-
+                if let Ok(line) = line {
                     println!("dagger: {}", line);
                 }
+            }
         });
 
-        tokio::spawn(async move {
+        std::thread::spawn(|| {
-            let mut stdout_bufr = tokio::io::BufReader::new(stderr).lines();
+            let stderr_bufr = BufReader::new(stderr);
-            while let Ok(Some(line)) = stdout_bufr.next_line().await {
+            for line in stderr_bufr.lines() {
+                if let Ok(line) = line {
                     println!("dagger: {}", line);
                 }
+                //panic!("could not start dagger session: {}", out)
+            }
         });
 
-        let conn = receiver.recv().await.ok_or(eyre::anyhow!("could not receive ok signal from dagger-engine"))?;
+        let conn = receiver.recv()?;
 
         Ok((conn, proc))
     }

crates/dagger-core/src/downloader.rs

@@ -119,7 +119,7 @@ impl Downloader {
         Ok(path)
     }
 
-    pub async fn get_cli(&self) -> eyre::Result<PathBuf> {
+    pub fn get_cli(&self) -> eyre::Result<PathBuf> {
         let version = &self.version;
         let mut cli_bin_path = self.cache_dir()?;
         cli_bin_path.push(format!("{CLI_BIN_PREFIX}{version}"));
@@ -129,7 +129,7 @@ impl Downloader {
 
         if !cli_bin_path.exists() {
             cli_bin_path = self
-                .download(cli_bin_path).await
+                .download(cli_bin_path)
                 .context("failed to download CLI from archive")?;
         }
 
@@ -145,11 +145,11 @@ impl Downloader {
         Ok(cli_bin_path)
     }
 
-    async fn download(&self, path: PathBuf) -> eyre::Result<PathBuf> {
+    fn download(&self, path: PathBuf) -> eyre::Result<PathBuf> {
-        let expected_checksum = self.expected_checksum().await?;
+        let expected_checksum = self.expected_checksum()?;
 
         let mut bytes = vec![];
-        let actual_hash = self.extract_cli_archive(&mut bytes).await?;
+        let actual_hash = self.extract_cli_archive(&mut bytes)?;
 
         if expected_checksum != actual_hash {
             eyre::bail!("downloaded CLI binary checksum doesn't match checksum from checksums.txt")
@@ -165,15 +165,15 @@ impl Downloader {
         Ok(path)
     }
 
-    async fn expected_checksum(&self) -> eyre::Result<String> {
+    fn expected_checksum(&self) -> eyre::Result<String> {
         let archive_url = &self.archive_url();
         let archive_path = PathBuf::from(&archive_url);
         let archive_name = archive_path
             .file_name()
             .ok_or(eyre::anyhow!("could not get file_name from archive_url"))?;
-        let resp = reqwest::get(self.checksum_url()).await?;
+        let resp = reqwest::blocking::get(self.checksum_url())?;
         let resp = resp.error_for_status()?;
-        for line in resp.text().await?.lines() {
+        for line in resp.text()?.lines() {
             let mut content = line.split_whitespace();
             let checksum = content
                 .next()
@@ -190,13 +190,17 @@ impl Downloader {
         eyre::bail!("could not find a matching version or binary in checksums.txt")
     }
 
-    pub async fn extract_cli_archive(&self, dest: &mut Vec<u8>) -> eyre::Result<String> {
+    pub fn extract_cli_archive(&self, dest: &mut Vec<u8>) -> eyre::Result<String> {
         let archive_url = self.archive_url();
-        let resp = reqwest::get(&archive_url).await?;
+        let resp = reqwest::blocking::get(&archive_url)?;
-        let resp = resp.error_for_status()?;
+        let mut resp = resp.error_for_status()?;
-        let bytes = resp.bytes().await?;
+        let mut bytes = vec![];
+        let lines = resp.read_to_end(&mut bytes)?;
+        if lines == 0 {
+            eyre::bail!("nothing was downloaded")
+        }
         let mut hasher = sha2::Sha256::new();
-        hasher.update(&bytes);
+        hasher.update(bytes.as_slice());
         let res = hasher.finalize();
 
         println!("{}", hex::encode(&res));
@@ -205,7 +209,7 @@ impl Downloader {
             // TODO:  Nothing for now
             todo!()
         } else {
-            self.extract_from_tar(&bytes, dest)?;
+            self.extract_from_tar(bytes.as_slice(), dest)?;
         }
 
         Ok(hex::encode(res))
@@ -236,9 +240,9 @@ impl Downloader {
 mod test {
     use super::Downloader;
 
-    #[tokio::test]
+    #[test]
-    async fn download() {
+    fn download() {
-        let cli_path = Downloader::new("0.3.10".into()).unwrap().get_cli().await.unwrap();
+        let cli_path = Downloader::new("0.3.10".into()).unwrap().get_cli().unwrap();
 
         assert_eq!(
             Some("dagger-0.3.10"),

crates/dagger-core/src/engine.rs

@@ -1,4 +1,4 @@
-
+use std::process::Child;
 
 use crate::{
     cli_session::CliSession, config::Config, connect_params::ConnectParams, downloader::Downloader,
@@ -11,17 +11,17 @@ impl Engine {
         Self {}
     }
 
-    async fn from_cli(&self, cfg: &Config) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+    fn from_cli(&self, cfg: &Config) -> eyre::Result<(ConnectParams, Child)> {
-        let cli = Downloader::new("0.3.12".into())?.get_cli().await?;
+        let cli = Downloader::new("0.3.12".into())?.get_cli()?;
 
         let cli_session = CliSession::new();
 
-        Ok(cli_session.connect(cfg, &cli).await?)
+        Ok(cli_session.connect(cfg, &cli)?)
     }
 
-    pub async fn start(&self, cfg: &Config) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+    pub fn start(&self, cfg: &Config) -> eyre::Result<(ConnectParams, Child)> {
         // TODO: Add from existing session as well
-        self.from_cli(cfg).await
+        self.from_cli(cfg)
     }
 }
 
@@ -32,10 +32,10 @@ mod tests {
     use super::Engine;
 
     // TODO: these tests potentially have a race condition
-    #[tokio::test]
+    #[test]
-    async fn engine_can_start() {
+    fn engine_can_start() {
         let engine = Engine::new();
-        let params = engine.start(&Config::new(None, None, None, None)).await.unwrap();
+        let params = engine.start(&Config::new(None, None, None, None)).unwrap();
 
         assert_ne!(
             params.0,

crates/dagger-core/src/schema.rs

@@ -1,14 +1,14 @@
 use crate::introspection::IntrospectionResponse;
 use crate::{config::Config, engine::Engine, session::Session};
 
-pub async fn get_schema() -> eyre::Result<IntrospectionResponse> {
+pub fn get_schema() -> eyre::Result<IntrospectionResponse> {
     let cfg = Config::new(None, None, None, None);
 
     //TODO: Implement context for proc
-    let (conn, _proc) = Engine::new().start(&cfg).await?;
+    let (conn, _proc) = Engine::new().start(&cfg)?;
     let session = Session::new();
     let req_builder = session.start(&cfg, &conn)?;
-    let schema = session.schema(req_builder).await?;
+    let schema = session.schema(req_builder)?;
 
     Ok(schema)
 }
@@ -17,8 +17,8 @@ pub async fn get_schema() -> eyre::Result<IntrospectionResponse> {
 mod tests {
     use super::get_schema;
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_schema() {
+    fn can_get_schema() {
-        let _ = get_schema().await.unwrap();
+        let _ = get_schema().unwrap();
     }
 }

crates/dagger-core/src/session.rs

@@ -1,7 +1,7 @@
 use graphql_client::GraphQLQuery;
 use reqwest::{
+    blocking::{Client, RequestBuilder},
     header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE},
-    Client, RequestBuilder,
 };
 
 use crate::{config::Config, connect_params::ConnectParams, introspection::IntrospectionResponse};
@@ -37,14 +37,14 @@ impl Session {
         Ok(req_builder)
     }
 
-    pub async fn schema(&self, req_builder: RequestBuilder) -> eyre::Result<IntrospectionResponse> {
+    pub fn schema(&self, req_builder: RequestBuilder) -> eyre::Result<IntrospectionResponse> {
         let request_body: graphql_client::QueryBody<()> = graphql_client::QueryBody {
             variables: (),
             query: introspection_query::QUERY,
             operation_name: introspection_query::OPERATION_NAME,
         };
 
-        let res = req_builder.json(&request_body).send().await?;
+        let res = req_builder.json(&request_body).send()?;
 
         if res.status().is_success() {
             // do nothing
@@ -52,7 +52,7 @@ impl Session {
             return Err(eyre::anyhow!("server error!"));
         } else {
             let status = res.status();
-            let error_message = match res.text().await {
+            let error_message = match res.text() {
                 Ok(msg) => match serde_json::from_str::<serde_json::Value>(&msg) {
                     Ok(json) => {
                         format!("HTTP {}\n{}", status, serde_json::to_string_pretty(&json)?)
@@ -64,7 +64,7 @@ impl Session {
             return Err(eyre::anyhow!(error_message));
         }
 
-        let json: IntrospectionResponse = res.json().await?;
+        let json: IntrospectionResponse = res.json()?;
 
         Ok(json)
     }

crates/dagger-sdk/CHANGELOG.md

@@ -3,153 +3,7 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## v0.2.12 (2023-02-20)
-
-### Chore
-
- - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 3 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - ran clippy ([`1f77d90`](https://github.com/kjuulh/dagger-rs/commit/1f77d90c0f0ac832a181b2322350ea395612986c))
-    - Release dagger-core v0.2.5, dagger-sdk v0.2.12, dagger-codegen v0.2.7 ([`1725c51`](https://github.com/kjuulh/dagger-rs/commit/1725c5188e8a81069ec4a4de569484c921a94927))
-    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-rs/commit/a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de))
-</details>
-
-## v0.2.11 (2023-02-20)
-
-<csr-id-803cfc4f8c4d72ab7d011be5523b3bfc6039de39/>
-
-### Chore
-
- - <csr-id-803cfc4f8c4d72ab7d011be5523b3bfc6039de39/> ran clippy
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 3 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`f869e57`](https://github.com/kjuulh/dagger-rs/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-rs/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
-    - ran clippy ([`803cfc4`](https://github.com/kjuulh/dagger-rs/commit/803cfc4f8c4d72ab7d011be5523b3bfc6039de39))
-</details>
-
-## v0.2.10 (2023-02-20)
-
-Alignment release
-
-### Bug Fixes
-
- - <csr-id-b100285312df522218bfd4bc00bbf41b857a81bf/> changelog
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 8 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-sdk v0.2.10 ([`5cb9729`](https://github.com/kjuulh/dagger-rs/commit/5cb97296b61677fb37e4bdb8519d30a484f93621))
-    - changelog ([`b100285`](https://github.com/kjuulh/dagger-rs/commit/b100285312df522218bfd4bc00bbf41b857a81bf))
-    - Adjusting changelogs prior to release of dagger-sdk v0.2.10 ([`8ed0647`](https://github.com/kjuulh/dagger-rs/commit/8ed06476e56f3290a419d2a67e7f25da575c63ad))
-    - update changelog ([`09aa658`](https://github.com/kjuulh/dagger-rs/commit/09aa658b6fb3c1e9a2de668c4a69bbe5be13202f))
-    - Adjusting changelogs prior to release of dagger-sdk v0.2.10 ([`b436f27`](https://github.com/kjuulh/dagger-rs/commit/b436f27a535f085bb8a4e66c7c4b3df461e74c21))
-    - Adjusting changelogs prior to release of dagger-sdk v0.2.10, dagger-rs v0.2.10 ([`577a293`](https://github.com/kjuulh/dagger-rs/commit/577a293c6777b9305a4f5fc7c3abee4aff4d74b5))
-    - Adjusting changelogs prior to release of dagger-sdk v0.2.10, dagger-rs v0.2.10 ([`76bb1fc`](https://github.com/kjuulh/dagger-rs/commit/76bb1fcedd03bd2d3b1e0f841f10325e4a85e108))
-    - Release dagger-rs v0.2.10 ([`dc3487b`](https://github.com/kjuulh/dagger-rs/commit/dc3487b840beb9543699f72d4282147e4ebc72f2))
-</details>
-
-## v0.2.10
-
-([`577a293`](https://github.com/kjuulh/dagger-rs/commit/577a293c6777b9305a4f5fc7c3abee4aff4d74b5))
-  - Adjusting changelogs prior to release of dagger-sdk v0.2.10, dagger-rs
-
-## v0.2.10
-
-([`76bb1fc`](https://github.com/kjuulh/dagger-rs/commit/76bb1fcedd03bd2d3b1e0f841f10325e4a85e108))
-  - Release dagger-rs v0.2.10
-    ([`dc3487b`](https://github.com/kjuulh/dagger-rs/commit/dc3487b840beb9543699f72d4282147e4ebc72f2))
-
-</details>
-
-## v0.2.10
-
-([`577a293`](https://github.com/kjuulh/dagger-rs/commit/577a293c6777b9305a4f5fc7c3abee4aff4d74b5))
-
-- Adjusting changelogs prior to release of dagger-sdk v0.2.10, dagger-rs
-
-## v0.2.10
-
-([`76bb1fc`](https://github.com/kjuulh/dagger-rs/commit/76bb1fcedd03bd2d3b1e0f841f10325e4a85e108))
-
-- Release dagger-rs v0.2.10
-  ([`dc3487b`](https://github.com/kjuulh/dagger-rs/commit/dc3487b840beb9543699f72d4282147e4ebc72f2))
-
-</details>
-
-## v0.2.9 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-75bc17e57db222492c6ffd2dfe80208d2bda75c9/> Fix async panic on blocking
-   #19 Replaced internal threads with tokio spawn functions
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.3, dagger-sdk v0.2.9, dagger-rs v0.2.10 ([`82de43a`](https://github.com/kjuulh/dagger-rs/commit/82de43aa91d6a5e09a247d1959137fdc36a40d35))
-    - Fix async panic on blocking #19 ([`75bc17e`](https://github.com/kjuulh/dagger-rs/commit/75bc17e57db222492c6ffd2dfe80208d2bda75c9))
-</details>
 
 ## v0.2.8 (2023-02-19)
 
@@ -161,7 +15,7 @@ Alignment release
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 1 commit contributed to the release.
  - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
@@ -172,7 +26,6 @@ Alignment release
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-sdk v0.2.8, dagger-codegen v0.2.5 ([`0499024`](https://github.com/kjuulh/dagger-rs/commit/04990247ba8e9d0555847f582fef14849dbedebf))
     - add documentation strings ([`978ede6`](https://github.com/kjuulh/dagger-rs/commit/978ede68ae52f5b5150a2aa45b8d6e1fbbbee2f4))
 </details>
 
@@ -184,8 +37,8 @@ Alignment release
 
 ### New Features
 
- - <csr-id-9be6f435d9ea39f31a8906e55dbd3e8b1e5ec598/> Use async runtime instead
+ - <csr-id-9be6f435d9ea39f31a8906e55dbd3e8b1e5ec598/> Use async runtime instead of blocking.
-   of blocking. Default to using async runtime instead of blocking. I.e.
+   Default to using async runtime instead of blocking. I.e.
    
    ```rust
    fn main() -> eyre::Result<()> {
@@ -256,8 +109,8 @@ Alignment release
 
 ### New Features
 
- - <csr-id-f29ff836cfd72d5e051ca6a71a230ba1e9933091/> without Some in _opts
+ - <csr-id-f29ff836cfd72d5e051ca6a71a230ba1e9933091/> without Some in _opts functions
-   functions Option has been removed as a wrapper around opts. This makes it much
+   Option has been removed as a wrapper around opts. This makes it much
    more convenient to use
    
    ```rust
@@ -266,12 +119,12 @@ Alignment release
    client.container_opts(ContainerOpts{})
    ```
    
-   The same options are still available, either an empty object can be passed, or
+   The same options are still available, either an empty object can be
-   a non _opts function can be used
+   passed, or a non _opts function can be used
- - <csr-id-9762da895a164e30c5dc60e89a83e934ceae47ab/> with _opts methods Now all
+ - <csr-id-9762da895a164e30c5dc60e89a83e934ceae47ab/> with _opts methods
-   opt values enter into a _opts function instead of the original. This avoids a
+   Now all opt values enter into a _opts function instead of the original.
-   lot of verbosity for both None in the case opts are unwanted, and Some() if
+   This avoids a lot of verbosity for both None in the case opts are
-   they actually are.
+   unwanted, and Some() if they actually are.
    
    They are used like so:
    
@@ -281,13 +134,13 @@ Alignment release
    ```
    
    Some from opts will be removed in a future commit/pr
- - <csr-id-94336d06378f035464e233b921dc3858070f582d/> move to &str instead of
+ - <csr-id-94336d06378f035464e233b921dc3858070f582d/> move to &str instead of String and introduce builder.
-   String and introduce builder. This will make the api much easier to use, as we
+   This will make the api much easier to use, as we can now rely on ""
-   can now rely on "" instead of "".into() for normal string values.
+   instead of "".into() for normal string values.
    
-   Introduced builder as well, which makes it much easier to use *Opts, as it can
+   Introduced builder as well, which makes it much easier to use *Opts, as
-   handle the building of that, and get the benefits from String -> &str, as that
+   it can handle the building of that, and get the benefits from String ->
-   is currently not allowed for optional values
+   &str, as that is currently not allowed for optional values
 
 ### Bug Fixes
 
@@ -323,8 +176,7 @@ Alignment release
 
 ### Bug Fixes
 
- - <csr-id-7d04ab1240e497e7804fed23a378d28c78f50a0a/> readme dagger-rs ->
+ - <csr-id-7d04ab1240e497e7804fed23a378d28c78f50a0a/> readme dagger-rs -> dagger-sdk
-   dagger-sdk
 
 ### Commit Statistics
 
@@ -352,10 +204,8 @@ Alignment release
  - <csr-id-19ed6c267f779b72430422c463ceed553f6fc618/> re-export through lib.rs
    this means that you can now use dagger_sdk::connect() instead of
    dagger_sdk::client::connect();
- - <csr-id-de063eae858eb3335d2558a57ee6a88689635200/> with return result instead
+ - <csr-id-de063eae858eb3335d2558a57ee6a88689635200/> with return result instead of unwrap
-   of unwrap
+ - <csr-id-5d667369900a47d3a6015cd3814c240bc5c54436/> remove unnecessary option returns
- - <csr-id-5d667369900a47d3a6015cd3814c240bc5c54436/> remove unnecessary option
-   returns
 
 ### Commit Statistics
 

crates/dagger-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.12"
+version = "0.2.8"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -11,7 +11,7 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dagger-core = { path = "../dagger-core", version = "^0.2.6" }
+dagger-core = { path = "../dagger-core", version = "^0.2.2" }
 
 base64 = "0.21.0"
 eyre = "0.6.8"

crates/dagger-sdk/examples/build-the-application/main.rs

@@ -2,7 +2,7 @@ use dagger_sdk::HostDirectoryOpts;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let host_source_dir = client.host().directory_opts(
         "examples/build-the-application/app",

crates/dagger-sdk/examples/caching/main.rs

@@ -2,7 +2,7 @@ use rand::Rng;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let host_source_dir = client.host().directory_opts(
         "./examples/caching/app",

crates/dagger-sdk/examples/existing-dockerfile/main.rs

@@ -4,7 +4,7 @@ use rand::Rng;
 async fn main() -> eyre::Result<()> {
     let mut rng = rand::thread_rng();
 
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let context_dir = client
         .host()

crates/dagger-sdk/examples/first-pipeline/main.rs

@@ -1,6 +1,6 @@
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let version = client
         .container()

crates/dagger-sdk/examples/multi-stage-build/main.rs

@@ -3,7 +3,7 @@ use rand::Rng;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let host_source_dir = client.host().directory_opts(
         "examples/publish-the-application/app",

crates/dagger-sdk/examples/publish-the-application/main.rs

@@ -3,7 +3,7 @@ use rand::Rng;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
     let output = "examples/publish-the-application/app/build";
 
     let host_source_dir = client.host().directory_opts(

crates/dagger-sdk/examples/test-the-application/main.rs

@@ -2,7 +2,7 @@ use dagger_sdk::HostDirectoryOpts;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let host_source_dir = client.host().directory_opts(
         "examples/test-the-application/app",

crates/dagger-sdk/src/client.rs

@@ -13,9 +13,9 @@ use crate::querybuilder::query;
 
 pub type DaggerConn = Arc<Query>;
 
-pub async fn connect() -> eyre::Result<DaggerConn> {
+pub fn connect() -> eyre::Result<DaggerConn> {
     let cfg = Config::default();
-    let (conn, proc) = DaggerEngine::new().start(&cfg).await?;
+    let (conn, proc) = DaggerEngine::new().start(&cfg)?;
 
     Ok(Arc::new(Query {
         conn,
@@ -44,8 +44,8 @@ pub fn graphql_client(conn: &ConnectParams) -> gql_client::Client {
 mod test {
     use super::connect;
 
-    #[tokio::test]
+    #[test]
-    async fn test_connect() {
+    fn test_connect() {
-        let _ = connect().await.unwrap();
+        let _ = connect().unwrap();
     }
 }

crates/dagger-sdk/src/gen.rs

@@ -3,8 +3,8 @@ use crate::querybuilder::Selection;
 use dagger_core::connect_params::ConnectParams;
 use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
+use std::process::Child;
 use std::sync::Arc;
-use tokio::process::Child;
 
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
 pub struct CacheId(String);
@@ -22,8 +22,8 @@ pub struct SecretId(String);
 pub struct SocketId(String);
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct BuildArg {
-    pub value: String,
     pub name: String,
+    pub value: String,
 }
 pub struct CacheVolume {
     pub proc: Arc<Child>,
@@ -35,7 +35,7 @@ impl CacheVolume {
     pub async fn id(
         &self,
     ) -> eyre::Result<CacheId> {
-        let query = self.selection.select("id");
+        let mut query = self.selection.select("id");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -216,7 +216,7 @@ impl Container {
     pub async fn default_args(
         &self,
     ) -> eyre::Result<Vec<String>> {
-        let query = self.selection.select("defaultArgs");
+        let mut query = self.selection.select("defaultArgs");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -239,7 +239,7 @@ impl Container {
     pub async fn entrypoint(
         &self,
     ) -> eyre::Result<Vec<String>> {
-        let query = self.selection.select("entrypoint");
+        let mut query = self.selection.select("entrypoint");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -258,7 +258,7 @@ impl Container {
     pub fn env_variables(
         &self,
     ) -> Vec<EnvVariable> {
-        let query = self.selection.select("envVariables");
+        let mut query = self.selection.select("envVariables");
 
         return vec![EnvVariable {
             proc: self.proc.clone(),
@@ -274,7 +274,7 @@ impl Container {
     pub fn exec(
         &self,
     ) -> Container {
-        let query = self.selection.select("exec");
+        let mut query = self.selection.select("exec");
 
         return Container {
             proc: self.proc.clone(),
@@ -321,7 +321,7 @@ impl Container {
     pub async fn exit_code(
         &self,
     ) -> eyre::Result<isize> {
-        let query = self.selection.select("exitCode");
+        let mut query = self.selection.select("exitCode");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -405,7 +405,7 @@ impl Container {
     pub fn fs(
         &self,
     ) -> Directory {
-        let query = self.selection.select("fs");
+        let mut query = self.selection.select("fs");
 
         return Directory {
             proc: self.proc.clone(),
@@ -417,7 +417,7 @@ impl Container {
     pub async fn id(
         &self,
     ) -> eyre::Result<ContainerId> {
-        let query = self.selection.select("id");
+        let mut query = self.selection.select("id");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -436,7 +436,7 @@ impl Container {
     pub fn labels(
         &self,
     ) -> Vec<Label> {
-        let query = self.selection.select("labels");
+        let mut query = self.selection.select("labels");
 
         return vec![Label {
             proc: self.proc.clone(),
@@ -448,7 +448,7 @@ impl Container {
     pub async fn mounts(
         &self,
     ) -> eyre::Result<Vec<String>> {
-        let query = self.selection.select("mounts");
+        let mut query = self.selection.select("mounts");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -499,7 +499,7 @@ impl Container {
     pub async fn platform(
         &self,
     ) -> eyre::Result<Platform> {
-        let query = self.selection.select("platform");
+        let mut query = self.selection.select("platform");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -546,7 +546,7 @@ impl Container {
     pub fn rootfs(
         &self,
     ) -> Directory {
-        let query = self.selection.select("rootfs");
+        let mut query = self.selection.select("rootfs");
 
         return Directory {
             proc: self.proc.clone(),
@@ -559,7 +559,7 @@ impl Container {
     pub async fn stderr(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("stderr");
+        let mut query = self.selection.select("stderr");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -568,7 +568,7 @@ impl Container {
     pub async fn stdout(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("stdout");
+        let mut query = self.selection.select("stdout");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -576,7 +576,7 @@ impl Container {
     pub async fn user(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("user");
+        let mut query = self.selection.select("user");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -588,7 +588,7 @@ impl Container {
     pub fn with_default_args(
         &self,
     ) -> Container {
-        let query = self.selection.select("withDefaultArgs");
+        let mut query = self.selection.select("withDefaultArgs");
 
         return Container {
             proc: self.proc.clone(),
@@ -1188,7 +1188,7 @@ impl Container {
     pub async fn workdir(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("workdir");
+        let mut query = self.selection.select("workdir");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1298,7 +1298,7 @@ impl Directory {
     pub fn docker_build(
         &self,
     ) -> Container {
-        let query = self.selection.select("dockerBuild");
+        let mut query = self.selection.select("dockerBuild");
 
         return Container {
             proc: self.proc.clone(),
@@ -1345,7 +1345,7 @@ impl Directory {
     pub async fn entries(
         &self,
     ) -> eyre::Result<Vec<String>> {
-        let query = self.selection.select("entries");
+        let mut query = self.selection.select("entries");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1397,7 +1397,7 @@ impl Directory {
     pub async fn id(
         &self,
     ) -> eyre::Result<DirectoryId> {
-        let query = self.selection.select("id");
+        let mut query = self.selection.select("id");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1703,7 +1703,7 @@ impl EnvVariable {
     pub async fn name(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("name");
+        let mut query = self.selection.select("name");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1711,7 +1711,7 @@ impl EnvVariable {
     pub async fn value(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("value");
+        let mut query = self.selection.select("value");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1727,7 +1727,7 @@ impl File {
     pub async fn contents(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("contents");
+        let mut query = self.selection.select("contents");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1746,7 +1746,7 @@ impl File {
     pub async fn id(
         &self,
     ) -> eyre::Result<FileId> {
-        let query = self.selection.select("id");
+        let mut query = self.selection.select("id");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1754,7 +1754,7 @@ impl File {
     pub fn secret(
         &self,
     ) -> Secret {
-        let query = self.selection.select("secret");
+        let mut query = self.selection.select("secret");
 
         return Secret {
             proc: self.proc.clone(),
@@ -1766,7 +1766,7 @@ impl File {
     pub async fn size(
         &self,
     ) -> eyre::Result<isize> {
-        let query = self.selection.select("size");
+        let mut query = self.selection.select("size");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1806,7 +1806,7 @@ impl GitRef {
     pub async fn digest(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("digest");
+        let mut query = self.selection.select("digest");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1818,7 +1818,7 @@ impl GitRef {
     pub fn tree(
         &self,
     ) -> Directory {
-        let query = self.selection.select("tree");
+        let mut query = self.selection.select("tree");
 
         return Directory {
             proc: self.proc.clone(),
@@ -1878,7 +1878,7 @@ impl GitRepository {
     pub async fn branches(
         &self,
     ) -> eyre::Result<Vec<String>> {
-        let query = self.selection.select("branches");
+        let mut query = self.selection.select("branches");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -1916,7 +1916,7 @@ impl GitRepository {
     pub async fn tags(
         &self,
     ) -> eyre::Result<Vec<String>> {
-        let query = self.selection.select("tags");
+        let mut query = self.selection.select("tags");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2029,7 +2029,7 @@ impl Host {
     pub fn workdir(
         &self,
     ) -> Directory {
-        let query = self.selection.select("workdir");
+        let mut query = self.selection.select("workdir");
 
         return Directory {
             proc: self.proc.clone(),
@@ -2074,7 +2074,7 @@ impl HostVariable {
     pub fn secret(
         &self,
     ) -> Secret {
-        let query = self.selection.select("secret");
+        let mut query = self.selection.select("secret");
 
         return Secret {
             proc: self.proc.clone(),
@@ -2086,7 +2086,7 @@ impl HostVariable {
     pub async fn value(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("value");
+        let mut query = self.selection.select("value");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2102,7 +2102,7 @@ impl Label {
     pub async fn name(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("name");
+        let mut query = self.selection.select("name");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2110,7 +2110,7 @@ impl Label {
     pub async fn value(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("value");
+        let mut query = self.selection.select("value");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2126,7 +2126,7 @@ impl Project {
     pub fn extensions(
         &self,
     ) -> Vec<Project> {
-        let query = self.selection.select("extensions");
+        let mut query = self.selection.select("extensions");
 
         return vec![Project {
             proc: self.proc.clone(),
@@ -2138,7 +2138,7 @@ impl Project {
     pub fn generated_code(
         &self,
     ) -> Directory {
-        let query = self.selection.select("generatedCode");
+        let mut query = self.selection.select("generatedCode");
 
         return Directory {
             proc: self.proc.clone(),
@@ -2150,7 +2150,7 @@ impl Project {
     pub async fn install(
         &self,
     ) -> eyre::Result<bool> {
-        let query = self.selection.select("install");
+        let mut query = self.selection.select("install");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2158,7 +2158,7 @@ impl Project {
     pub async fn name(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("name");
+        let mut query = self.selection.select("name");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2166,7 +2166,7 @@ impl Project {
     pub async fn schema(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("schema");
+        let mut query = self.selection.select("schema");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2174,7 +2174,7 @@ impl Project {
     pub async fn sdk(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("sdk");
+        let mut query = self.selection.select("sdk");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2248,7 +2248,7 @@ impl Query {
     pub fn container(
         &self,
     ) -> Container {
-        let query = self.selection.select("container");
+        let mut query = self.selection.select("container");
 
         return Container {
             proc: self.proc.clone(),
@@ -2287,7 +2287,7 @@ impl Query {
     pub async fn default_platform(
         &self,
     ) -> eyre::Result<Platform> {
-        let query = self.selection.select("defaultPlatform");
+        let mut query = self.selection.select("defaultPlatform");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2299,7 +2299,7 @@ impl Query {
     pub fn directory(
         &self,
     ) -> Directory {
-        let query = self.selection.select("directory");
+        let mut query = self.selection.select("directory");
 
         return Directory {
             proc: self.proc.clone(),
@@ -2391,7 +2391,7 @@ impl Query {
     pub fn host(
         &self,
     ) -> Host {
-        let query = self.selection.select("host");
+        let mut query = self.selection.select("host");
 
         return Host {
             proc: self.proc.clone(),
@@ -2495,7 +2495,7 @@ impl Query {
     pub fn socket(
         &self,
     ) -> Socket {
-        let query = self.selection.select("socket");
+        let mut query = self.selection.select("socket");
 
         return Socket {
             proc: self.proc.clone(),
@@ -2537,7 +2537,7 @@ impl Secret {
     pub async fn id(
         &self,
     ) -> eyre::Result<SecretId> {
-        let query = self.selection.select("id");
+        let mut query = self.selection.select("id");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2545,7 +2545,7 @@ impl Secret {
     pub async fn plaintext(
         &self,
     ) -> eyre::Result<String> {
-        let query = self.selection.select("plaintext");
+        let mut query = self.selection.select("plaintext");
 
         query.execute(&graphql_client(&self.conn)).await
     }
@@ -2561,7 +2561,7 @@ impl Socket {
     pub async fn id(
         &self,
     ) -> eyre::Result<SocketId> {
-        let query = self.selection.select("id");
+        let mut query = self.selection.select("id");
 
         query.execute(&graphql_client(&self.conn)).await
     }

crates/dagger-sdk/tests/mod.rs

@@ -2,7 +2,7 @@ use dagger_sdk::{connect, ContainerExecOptsBuilder};
 
 #[tokio::test]
 async fn test_example_container() {
-    let client = connect().await.unwrap();
+    let client = connect().unwrap();
 
     let alpine = client.container().from("alpine:3.16.2");
 

src/cli.rs

@@ -13,11 +13,11 @@ impl Cli {
         })
     }
 
-    pub async fn execute(self, args: &[&str]) -> eyre::Result<()> {
+    pub fn execute(self, args: &[&str]) -> eyre::Result<()> {
         let matches = self.cmd.get_matches_from(args);
 
         match matches.subcommand() {
-            Some(("generate", args)) => cli_generate::GenerateCommand::exec(args).await?,
+            Some(("generate", args)) => cli_generate::GenerateCommand::exec(args)?,
             _ => eyre::bail!("command missing"),
         }
 

src/cli_generate.rs

@@ -17,12 +17,12 @@ impl GenerateCommand {
         clap::Command::new("generate").arg(Arg::new("output").long("output"))
     }
 
-    pub async fn exec(arg_matches: &ArgMatches) -> eyre::Result<()> {
+    pub fn exec(arg_matches: &ArgMatches) -> eyre::Result<()> {
         let cfg = Config::default();
-        let (conn, _proc) = Engine::new().start(&cfg).await?;
+        let (conn, _proc) = Engine::new().start(&cfg)?;
         let session = Session::new();
         let req = session.start(&cfg, &conn)?;
-        let schema = session.schema(req).await?;
+        let schema = session.schema(req)?;
         let code = generate(
             schema.into_schema().schema.unwrap(),
             Arc::new(RustGenerator {}),

src/main.rs

@@ -3,15 +3,14 @@ use cli::Cli;
 pub mod cli;
 mod cli_generate;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
     color_eyre::install().unwrap();
 
     let args = std::env::args();
     let args = args.collect::<Vec<String>>();
     let args = args.iter().map(|s| s.as_str()).collect::<Vec<&str>>();
 
-    Cli::new()?.execute(args.as_slice()).await?;
+    Cli::new()?.execute(args.as_slice())?;
 
     Ok(())
 }