feat(sdk): add documentation strings

ARCHITECTURE.md

@@ -1,12 +0,0 @@
-# Architecture
-
-- `.` Root project mainly used for generating the CLI, which in turn is used to
-  bootstrap the code generation from `dagger`
-- `crates/dagger-core` Contains all base types used during actual usage. This is
-  where the primary logic lives in which the user interacts (\*disclaimer: most
-  stuff haven't moved in here yet.)
-- `crates/dagger-sdk` Contains the actual sdk in which the user interacts,
-  `dagger-core` is reexported through this API as well.
-- `crates/dagger-codegen` This is the bulk of the work, it takes the input
-  graphql and spits out the API in which the user interacts, this is heavily
-  inspired by other `dagger-sdk's`. It primarily turns graphql into rust code.

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

CONTRIBUTING.md

@@ -1,11 +0,0 @@
-# Contributing
-
-The sdk is still quite young, so feel free to either:
-
-- Refactor
-- Document
-- Improve the code
-
-Feel free to ping me on discord @Hermansen#4325, or just create an issue if
-there is a missing feature, or you'd like some mentorship in getting into the
-code

Cargo.lock

@@ -71,9 +71,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "block-buffer"
-version = "0.10.4"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
 dependencies = [
  "generic-array",
 ]
@@ -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,16 +114,15 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "color-eyre",
- "dagger-sdk",
+ "dagger-sdk 0.2.6",
  "eyre",
- "tokio",
 ]
 
 [[package]]
 name = "clap"
-version = "4.1.8"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
  "bitflags",
  "clap_lex",
@@ -134,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
 dependencies = [
  "os_str_bytes",
 ]
@@ -246,10 +245,10 @@ dependencies = [
 
 [[package]]
 name = "dagger-codegen"
-version = "0.2.8"
+version = "0.2.4"
 dependencies = [
  "convert_case",
- "dagger-core",
+ "dagger-core 0.2.2",
  "eyre",
  "genco",
  "itertools",
@@ -260,7 +259,31 @@ dependencies = [
 
 [[package]]
 name = "dagger-core"
-version = "0.2.8"
+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 +301,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 +326,31 @@ dependencies = [
  "sha2",
  "tar",
  "tempfile",
+]
+
+[[package]]
+name = "dagger-sdk"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "654625e954f59d70eb897bb681936c3e8b69c5f6e528f85c0b307554883db63f"
+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 = "dagger-sdk"
-version = "0.2.19"
+version = "0.2.7"
 dependencies = [
  "base64",
- "dagger-core",
+ "dagger-core 0.2.2",
  "derive_builder",
  "eyre",
  "futures",
@@ -327,9 +365,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.14.4"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
+checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -337,9 +375,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.4"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
 dependencies = [
  "fnv",
  "ident_case",
@@ -351,9 +389,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.14.4"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
 dependencies = [
  "darling_core",
  "quote",
@@ -435,9 +473,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 +513,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]]
@@ -537,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
+checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -552,9 +590,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
+checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -562,15 +600,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -579,15 +617,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
+checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
+checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -596,21 +634,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
+checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
 
 [[package]]
 name = "futures-task"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
 
 [[package]]
 name = "futures-util"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -746,9 +784,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.16"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
 dependencies = [
  "bytes",
  "fnv",
@@ -771,9 +809,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 +822,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 +836,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 +870,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
-version = "0.14.25"
+version = "0.14.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -916,12 +948,12 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.6"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -932,14 +964,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.4"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -953,15 +985,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+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",
 ]
@@ -974,9 +1006,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libz-sys"
@@ -1037,14 +1069,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 +1103,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 +1118,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,18 +1265,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.52"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -1301,9 +1333,18 @@ dependencies = [
 
 [[package]]
 name = "relative-path"
-version = "1.8.0"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698"
+checksum = "d3bf6b372449361333ac1f498b7edae4dd5e70dccd7c0c2a7c7bce8f05ede648"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
 
 [[package]]
 name = "reqwest"
@@ -1353,23 +1394,23 @@ checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustix"
-version = "0.36.9"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "schannel"
@@ -1388,9 +1429,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",
@@ -1411,18 +1452,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.156"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.156"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1431,9 +1472,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.94"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
+checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
 dependencies = [
  "itoa",
  "ryu",
@@ -1474,18 +1515,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",
 ]
@@ -1498,9 +1539,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
  "libc",
  "winapi",
@@ -1514,9 +1555,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1536,15 +1577,16 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.4.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "libc",
  "redox_syscall",
- "rustix",
+ "remove_dir_all",
- "windows-sys 0.42.0",
+ "winapi",
 ]
 
 [[package]]
@@ -1558,18 +1600,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.39"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.39"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1597,15 +1639,15 @@ 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"
-version = "1.26.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
+checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1618,7 +1660,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1634,9 +1676,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",
@@ -1644,9 +1686,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",
@@ -1718,15 +1760,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.11"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c"
+checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unicode-normalization"
@@ -1739,9 +1781,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"
@@ -1805,9 +1847,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",
@@ -1815,9 +1857,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",
@@ -1830,9 +1872,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",
@@ -1842,9 +1884,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",
@@ -1852,9 +1894,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",
@@ -1865,9 +1907,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"
@@ -1884,9 +1926,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",
@@ -1949,9 +1991,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -1964,45 +2006,45 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
 
 [[package]]
 name = "winreg"

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.8" }
+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"] }

Makefile.toml

@@ -1,43 +0,0 @@
-[tasks.codegen]
-command = "cargo"
-args = ["run", "-p", "ci", "--", "codegen"]
-workspace = false
-
-[tasks.build]
-command = "cargo"
-args = ["run", "-p", "ci", "--", "ci"]
-dependencies = ["codegen"]
-workspace = false
-
-[tasks.fmt]
-command = "cargo"
-args = ["fmt", "--all"]
-workspace = false
-
-[tasks.fix]
-command = "cargo"
-args = ["fix", "--workspace", "--allow-dirty"]
-dependencies = ["fmt"]
-workspace = false
-
-[tasks.release_crate]
-command = "cargo"
-args = [
-  "smart-release",
-  "--allow-fully-generated-changelogs",
-  "--update-crates-index",
-  "dagger-sdk",
-]
-dependencies = ["codegen", "fix"]
-workspace = false
-
-[tasks.release_crate_commit]
-command = "cargo"
-args = [
-  "smart-release",
-  "-e",
-  "--allow-fully-generated-changelogs",
-  "--update-crates-index",
-  "dagger-sdk",
-]
-workspace = false

README.md

@@ -1,55 +1,40 @@
-# dagger-sdk
+# dagger-rs
 
 A dagger sdk written in rust for rust.
 
-## Examples
+# Usage
 
-See [examples](./crates/dagger-sdk/examples/)
+See [dagger-sdk](./crates/dagger-sdk/README.md)
 
-Run them like so
+### Status
 
-```bash
+- [x] dagger cli downloader
-cargo run --example first-pipeline
+- [x] dagger network session
-```
+- [x] graphql rust codegen (User API)
+  - [x] Scalars
+  - [x] Enums
+  - [x] Input
+  - [x] Objects
+- [x] Implement context and querier
+  - [x] Marshaller
+  - [x] Querier
+  - [x] Context
+  - [x] Deserializer for nested response (bind)
+- [x] Add codegen to hook into querier
+- [x] fix build / release cycle
+- [x] general api stabilisation
+- [x] document usage
+- [x] make async variant
 
-The examples match the folder name in each directory in examples
+## Architecture
 
-## Install
+- `.` Root project mainly used for generating the CLI, which in turn is used to
-
+  bootstrap the code generation from `dagger`
-Simply install like:
+- `crates/dagger-core` Contains all base types used during actual usage. This is
-
+  where the primary logic lives in which the user interacts (\*disclaimer: most
-```bash
+  stuff haven't moved in here yet.)
-cargo add dagger-sdk
+- `crates/dagger-sdk` Contains the actual sdk in which the user interacts,
-```
+  `dagger-core` is reexported through this API as well.
-
+- `crates/dagger-codegen` This is the bulk of the work, it takes the input
-### Usage
+  graphql and spits out the API in which the user interacts, this is heavily
-
+  inspired by other `dagger-sdk's`. It primarily turns graphql into rust code.
-```rust
-#[tokio::main]
-async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
-
-    let version = client
-        .container()
-        .from("golang:1.19")
-        .with_exec(vec!["go", "version"])
-        .stdout()
-        .await?;
-
-    println!("Hello from Dagger and {}", version.trim());
-
-    Ok(())
-}
-```
-
-And run it like a normal application:
-
-```bash
-cargo run
-```
-
-### Contributing
-
-See [CONTRIBUTING](./CONTRIBUTING.md)
-
-or just cargo make codegen

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,5 @@ edition = "2021"
 [dependencies]
 clap = "4.1.6"
 color-eyre = "0.6.2"
-dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.19" }
+dagger-sdk = "0.2.6"
 eyre = "0.6.8"
-tokio = { version = "1.25.0", features = ["full"] }

ci/src/main.rs

@@ -1,28 +1,24 @@
 use std::sync::Arc;
 
-use clap::ArgMatches;
 use dagger_sdk::{Container, HostDirectoryOpts, Query};
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
     color_eyre::install().unwrap();
 
     let matches = clap::Command::new("ci")
         .subcommand_required(true)
         .subcommand(clap::Command::new("pr"))
         .subcommand(clap::Command::new("release"))
-        .subcommand(clap::Command::new("codegen"))
         .get_matches();
 
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     match matches.subcommand() {
         Some(("pr", _)) => {
-            let base = select_base_image(client.clone()).await?;
+            let base = select_base_image(client.clone())?;
-            return validate_pr(client, base).await;
+            return validate_pr(client, base);
         }
-        Some(("release", subm)) => return release(client, subm).await,
+        Some(("release", subm)) => return release(client, subm),
-        Some(("codegen", subm)) => return run_codegen(client, subm).await,
         Some(_) => {
             panic!("invalid subcommand selected!")
         }
@@ -32,43 +28,7 @@ async fn main() -> eyre::Result<()> {
     }
 }
 
-async fn run_codegen(client: Arc<Query>, _subm: &ArgMatches) -> eyre::Result<()> {
+fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
-    let docker_cli = client
-        .container()
-        .from("docker:cli")
-        .file("/usr/local/bin/docker");
-    let socket = client.host().unix_socket("/var/run/docker.sock");
-
-    let container = get_dependencies(client).await?;
-
-    let generated_image = container
-        .with_exec(vec!["mkdir", "-p", "/mnt/output"])
-        .with_mounted_file("/usr/bin/docker", docker_cli.id().await?)
-        .with_unix_socket("/var/run/docker.sock", socket.id().await?)
-        .with_exec(vec![
-            "cargo",
-            "run",
-            "--",
-            "generate",
-            "--output",
-            "crates/dagger-sdk/gen.rs",
-        ])
-        .with_exec(vec!["cargo", "fmt", "--all"])
-        .with_exec(vec!["cargo", "fix", "--workspace", "--allow-dirty"])
-        .with_exec(vec!["cargo", "fmt", "--all"])
-        .with_exec(vec!["mv", "crates/dagger-sdk/gen.rs", "/mnt/output/gen.rs"]);
-
-    let _ = generated_image.exit_code().await?;
-
-    generated_image
-        .file("/mnt/output/gen.rs")
-        .export("crates/dagger-sdk/src/gen.rs")
-        .await?;
-
-    Ok(())
-}
-
-async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
     let src_dir = client.host().directory_opts(
         ".",
         HostDirectoryOpts {
@@ -80,7 +40,7 @@ async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), col
         .container()
         .from("rust:latest")
         .with_workdir("app")
-        .with_mounted_directory("/app/", src_dir.id().await?);
+        .with_mounted_directory("/app/", src_dir.id()?);
 
     let container = base_image
         .with_exec(vec!["cargo", "install", "cargo-smart-release"])
@@ -93,7 +53,7 @@ async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), col
             "dagger-rs",
             "dagger-sdk",
         ]);
-    let exit = container.exit_code().await?;
+    let exit = container.exit_code()?;
     if exit != 0 {
         eyre::bail!("container failed with non-zero exit code");
     }
@@ -103,7 +63,7 @@ async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), col
     Ok(())
 }
 
-async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
+fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
     let cargo_dir = client.host().directory_opts(
         ".",
         HostDirectoryOpts {
@@ -126,14 +86,14 @@ async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
     );
 
     let cache_cargo_index_dir = client.cache_volume("cargo_index");
-    let _cache_cargo_deps = client.cache_volume("cargo_deps");
+    let cache_cargo_deps = client.cache_volume("cargo_deps");
     let cache_cargo_bin = client.cache_volume("cargo_bin_cache");
 
     let minio_url = "https://github.com/mozilla/sccache/releases/download/v0.3.3/sccache-v0.3.3-x86_64-unknown-linux-musl.tar.gz";
 
     let base_image = client
         .container()
-        .from("rustlang/rust:nightly")
+        .from("rust:latest")
         .with_workdir("app")
         .with_exec(vec!["apt-get", "update"])
         .with_exec(vec!["apt-get", "install", "--yes", "libpq-dev", "wget"])
@@ -149,7 +109,7 @@ async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
             "/usr/local/bin/sccache",
         ])
         .with_exec(vec!["chmod", "+x", "/usr/local/bin/sccache"])
-        //.with_env_variable("RUSTC_WRAPPER", "/usr/local/bin/sccache")
+        .with_env_variable("RUSTC_WRAPPER", "/usr/local/bin/sccache")
         .with_env_variable(
             "AWS_ACCESS_KEY_ID",
             std::env::var("AWS_ACCESS_KEY_ID").unwrap_or("".into()),
@@ -161,16 +121,16 @@ async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
         .with_env_variable("SCCACHE_BUCKET", "sccache")
         .with_env_variable("SCCACHE_REGION", "auto")
         .with_env_variable("SCCACHE_ENDPOINT", "https://api-minio.front.kjuulh.io")
-        .with_mounted_cache("~/.cargo/bin", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/bin", cache_cargo_bin.id()?)
-        .with_mounted_cache("~/.cargo/registry/index", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/registry/index", cache_cargo_bin.id()?)
-        .with_mounted_cache("~/.cargo/registry/cache", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/registry/cache", cache_cargo_bin.id()?)
-        .with_mounted_cache("~/.cargo/git/db", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/git/db", cache_cargo_bin.id()?)
-        .with_mounted_cache("target/", cache_cargo_bin.id().await?)
+        .with_mounted_cache("target/", cache_cargo_bin.id()?)
         .with_exec(vec!["cargo", "install", "cargo-chef"]);
 
     let recipe = base_image
-        .with_mounted_directory(".", cargo_dir.id().await?)
+        .with_mounted_directory(".", cargo_dir.id()?)
-        .with_mounted_cache("~/.cargo/.package-cache", cache_cargo_index_dir.id().await?)
+        .with_mounted_cache("~/.cargo/.package-cache", cache_cargo_index_dir.id()?)
         .with_exec(vec![
             "cargo",
             "chef",
@@ -181,7 +141,7 @@ async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
         .file("/app/recipe.json");
 
     let builder_start = base_image
-        .with_mounted_file("/app/recipe.json", recipe.id().await?)
+        .with_mounted_file("/app/recipe.json", recipe.id()?)
         .with_exec(vec![
             "cargo",
             "chef",
@@ -191,35 +151,23 @@ async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
             "--recipe-path",
             "recipe.json",
         ])
-        .with_directory("/app/", src_dir.id().await?)
+        .with_mounted_cache("/app/", cache_cargo_deps.id()?)
+        .with_mounted_directory("/app/", src_dir.id()?)
         .with_exec(vec!["cargo", "build", "--all", "--release"]);
 
     return Ok(builder_start);
 }
 
-async fn select_base_image(client: Arc<Query>) -> eyre::Result<Container> {
+fn select_base_image(client: Arc<Query>) -> eyre::Result<Container> {
-    let src_dir = get_dependencies(client.clone()).await;
+    let src_dir = get_dependencies(client.clone());
 
     src_dir
 }
 
-async fn validate_pr(client: Arc<Query>, container: Container) -> eyre::Result<()> {
+fn validate_pr(_client: Arc<Query>, container: Container) -> eyre::Result<()> {
-    let exit = container.exit_code().await?;
+    //let container = container.with_exec(vec!["cargo", "test", "--all"], None);
-    if exit != 0 {
-        eyre::bail!("container failed with non-zero exit code");
-    }
-    let docker_cli = client
-        .container()
-        .from("docker:cli")
-        .file("/usr/local/bin/docker");
-    let socket = client.host().unix_socket("/var/run/docker.sock");
 
-    let container = container
+    let exit = container.exit_code()?;
-        .with_mounted_file("/usr/bin/docker", docker_cli.id().await?)
-        .with_unix_socket("/var/run/docker.sock", socket.id().await?)
-        .with_exec(vec!["cargo", "test", "--all"]);
-
-    let exit = container.exit_code().await?;
     if exit != 0 {
         eyre::bail!("container failed with non-zero exit code");
     }

crates/dagger-codegen/CHANGELOG.md

@@ -5,133 +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.8 (2023-02-22)
-
-### New Features
-
- - <csr-id-266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c/> with clone
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 1 commit contributed to the release.
- - 2 days passed between releases.
- - 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**
-    - with clone ([`266ad32`](https://github.com/kjuulh/dagger-rs/commit/266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c))
-</details>
-
-## v0.2.7 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-### 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.6, dagger-codegen v0.2.7, dagger-sdk v0.2.12 ([`7179f8b`](https://github.com/kjuulh/dagger-rs/commit/7179f8b598ef04e62925e39d3f55740253c01686))
-    - 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
-
- - <csr-id-978ede68ae52f5b5150a2aa45b8d6e1fbbbee2f4/> add documentation strings
- - <csr-id-9be6f435d9ea39f31a8906e55dbd3e8b1e5ec598/> Use async runtime instead of blocking.
-   Default to using async runtime instead of blocking. I.e.
-   
-   ```rust
-   fn main() -> eyre::Result<()> {
-   // ...
-   
-   client.container().from("rust").publish("somewhere")?;
-   
-   // ...
-   }
-   
-   // to
-   
-   async fn main() -> eyre::Result<()> {
-   // ...
-   
-   client.container().from("rust").publish("somewhere").await?;
-   
-   // ...
-   }
-   ```
-
-### 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**
-    - 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>
-
 ## v0.2.4 (2023-02-19)
 
 ### New Features
@@ -178,7 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 6 commits contributed to the release.
+ - 5 commits contributed to the release.
  - 5 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
@@ -189,7 +62,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.5, dagger-codegen v0.2.4 ([`f727318`](https://github.com/kjuulh/dagger-rs/commit/f72731807d8358fdb3d80432136b7a08bb7b1773))
     - cargo clippy ([`c627595`](https://github.com/kjuulh/dagger-rs/commit/c627595fd2695e236924175d137c42f1480ccd6b))
     - without Some in _opts functions ([`f29ff83`](https://github.com/kjuulh/dagger-rs/commit/f29ff836cfd72d5e051ca6a71a230ba1e9933091))
     - with _opts methods ([`9762da8`](https://github.com/kjuulh/dagger-rs/commit/9762da895a164e30c5dc60e89a83e934ceae47ab))

crates/dagger-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-codegen"
-version = "0.2.8"
+version = "0.2.4"
 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.8" }
+dagger-core = { path = "../dagger-core", version = "^0.2.2" }
 
 eyre = "0.6.8"
 genco = "0.17.3"

crates/dagger-codegen/src/functions.rs

@@ -153,7 +153,6 @@ impl From<&TypeRef> for Scalar {
     }
 }
 
-#[allow(dead_code)]
 pub fn get_type_from_name<'t>(types: &'t [FullType], name: &'t str) -> Option<&'t FullType> {
     types
         .into_iter()
@@ -196,22 +195,6 @@ pub fn type_ref_is_scalar(type_ref: &TypeRef) -> bool {
         .unwrap_or(false)
 }
 
-pub fn type_ref_is_enum(type_ref: &TypeRef) -> bool {
-    let mut type_ref = type_ref.clone();
-    if type_ref
-        .kind
-        .pipe(|k| *k == __TypeKind::NON_NULL)
-        .unwrap_or(false)
-    {
-        type_ref = *type_ref.of_type.unwrap().clone();
-    }
-
-    type_ref
-        .kind
-        .pipe(|k| *k == __TypeKind::ENUM)
-        .unwrap_or(false)
-}
-
 pub fn type_ref_is_object(type_ref: &TypeRef) -> bool {
     let mut type_ref = type_ref.clone();
     if type_ref
@@ -275,7 +258,6 @@ pub fn input_values_has_optionals(input_values: &[&InputValue]) -> bool {
         > 0
 }
 
-#[allow(dead_code)]
 pub fn input_values_is_empty(input_values: &[InputValue]) -> bool {
     input_values.len() > 0
 }

crates/dagger-codegen/src/lib.rs

@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
 mod functions;
 mod generator;
 pub mod rust;

crates/dagger-codegen/src/rust/functions.rs

@@ -5,8 +5,8 @@ use genco::quote;
 use genco::tokens::quoted;
 
 use crate::functions::{
-    type_field_has_optional, type_ref_is_enum, type_ref_is_list, type_ref_is_list_of_objects,
+    type_field_has_optional, type_ref_is_list, type_ref_is_list_of_objects, type_ref_is_object,
-    type_ref_is_object, type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
+    type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
 };
 use crate::utility::OptionExt;
 
@@ -133,12 +133,6 @@ fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
                         }
                     }
 
-                    if type_ref_is_enum(&s.input_value.type_) {
-                        return Some(quote! {
-                            query = query.arg_enum($(quoted(name)), $(n));
-                        })
-                    }
-
                     if type_ref_is_list(&s.input_value.type_) {
                         let inner = *s
                             .input_value
@@ -193,14 +187,6 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
                     let n = format_struct_name(&s.input_value.name);
                     let name = &s.input_value.name;
 
-                    if type_ref_is_enum(&s.input_value.type_) {
-                        return Some(quote! {
-                            if let Some($(&n)) = opts.$(&n) {
-                                query = query.arg_enum($(quoted(name)), $(n));
-                            }
-                        });
-                    }
-
                     Some(quote! {
                         if let Some($(&n)) = opts.$(&n) {
                             query = query.arg($(quoted(name)), $(&n));

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

@@ -26,10 +26,9 @@ fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
 
 pub fn render_enum(t: &FullType) -> eyre::Result<rust::Tokens> {
     let serialize = rust::import("serde", "Serialize");
-    let deserialize = rust::import("serde", "Deserialize");
 
     Ok(quote! {
-        #[derive($serialize, $deserialize, Clone, PartialEq, Debug)]
+        #[derive($serialize, Clone, PartialEq, Debug)]
         pub enum $(t.name.as_ref()) {
             $(render_enum_values(t))
         }

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

@@ -1,8 +1,9 @@
 use dagger_core::introspection::{FullType, FullTypeFields, FullTypeFieldsArgs};
 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,
@@ -11,12 +12,11 @@ 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");
 
     Ok(quote! {
-        #[derive(Debug, Clone)]
         pub struct $(t.name.pipe(|s| format_name(s))) {
             pub proc: $arc<$child>,
             pub selection: $selection,
@@ -86,7 +86,7 @@ pub fn render_optional_field_args(
         }
         quote! {
             $(a.description.pipe(|d| format_struct_comment(d)))
-            #[builder(setter(into, strip_option), default)]
+            #[builder(setter(into, strip_option))]
             pub $(format_struct_name(&a.name)): Option<$(type_)>,
         }
     });

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

@@ -11,18 +11,6 @@ pub fn render_scalar(t: &FullType) -> eyre::Result<rust::Tokens> {
 
     Ok(quote! {
         #[derive($serialize, $deserialize, PartialEq, Debug, Clone)]
-        pub struct $(t.name.pipe(|n|format_name(n)))(pub String);
+        pub struct $(t.name.pipe(|n|format_name(n)))(String);
-
-        impl Into<$(t.name.pipe(|n| format_name(n)))> for &str {
-            fn into(self) -> $(t.name.pipe(|n| format_name(n))) {
-                $(t.name.pipe(|n| format_name(n)))(self.to_string())
-            }
-        }
-
-        impl Into<$(t.name.pipe(|n| format_name(n)))> for String {
-            fn into(self) -> $(t.name.pipe(|n| format_name(n))) {
-                $(t.name.pipe(|n| format_name(n)))(self.clone())
-            }
-        }
     })
 }

crates/dagger-core/CHANGELOG.md

@@ -5,179 +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.8 (2023-03-10)
-
-### New Features
-
- - <csr-id-41b20b6268db9d8defe333694e4d3ec019d7c923/> bump version
- - <csr-id-5f9b3a19c0ab6988bc335b020052074f3f101305/> set internal warnings as errors
- - <csr-id-f9e7af931d94fbedacf74f5da9a2f71b1992324b/> introduce tests again
-
-### Bug Fixes
-
- - <csr-id-ecca036bc644fee93fbcb69bf6da9f29169e473e/> fix builder pattern to actually work with default values
-   In previous versions the builder pattern required all values to be set.
-   This has not been fixed, so that default values are allowed.
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 4 commits contributed to the release over the course of 13 calendar days.
- - 13 days passed between releases.
- - 4 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**
-    - bump version ([`41b20b6`](https://github.com/kjuulh/dagger-rs/commit/41b20b6268db9d8defe333694e4d3ec019d7c923))
-    - set internal warnings as errors ([`5f9b3a1`](https://github.com/kjuulh/dagger-rs/commit/5f9b3a19c0ab6988bc335b020052074f3f101305))
-    - introduce tests again ([`f9e7af9`](https://github.com/kjuulh/dagger-rs/commit/f9e7af931d94fbedacf74f5da9a2f71b1992324b))
-    - fix builder pattern to actually work with default values ([`ecca036`](https://github.com/kjuulh/dagger-rs/commit/ecca036bc644fee93fbcb69bf6da9f29169e473e))
-</details>
-
-## v0.2.7 (2023-02-24)
-
-### New Features
-
- - <csr-id-3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f/> update to dagger-v0.3.13
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 4 days passed between releases.
- - 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.7, dagger-sdk v0.2.15 ([`6a9a560`](https://github.com/kjuulh/dagger-rs/commit/6a9a560cdca097abf23371d44599a2f1b726ae7f))
-    - update to dagger-v0.3.13 ([`3e8ca8d`](https://github.com/kjuulh/dagger-rs/commit/3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f))
-</details>
-
-## v0.2.6 (2023-02-20)
-
-<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
-
-### Chore
-
- - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
-
-### Bug Fixes
-
- - <csr-id-8dfecf976c5537cc2c03881de2b2fd2b2508683a/> cli session keep session alive
-
-### 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**
-    - Release dagger-core v0.2.6, dagger-codegen v0.2.7, dagger-sdk v0.2.12 ([`7179f8b`](https://github.com/kjuulh/dagger-rs/commit/7179f8b598ef04e62925e39d3f55740253c01686))
-    - 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
@@ -188,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
 
@@ -199,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.8"
+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,6 +1,10 @@
-use std::{fs::canonicalize, path::PathBuf, process::Stdio, sync::Arc};
+use std::{
-
+    fs::canonicalize,
-use tokio::io::AsyncBufReadExt;
+    io::{BufRead, BufReader},
+    path::PathBuf,
+    process::{Child, Stdio},
+    sync::{mpsc::sync_channel, Arc},
+};
 
 use crate::{config::Config, connect_params::ConnectParams};
 
@@ -16,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)
     }
 }
 
@@ -29,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)?;
@@ -50,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"))?,
@@ -66,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()
@@ -80,29 +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);
                 }
-
-                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() {
-                println!("dagger: {}", line);
+                if let Ok(line) = line {
+                    println!("dagger: {}", line);
+                }
+                //panic!("could not start dagger session: {}", out)
             }
         });
 
-        let conn = receiver.recv().await.ok_or(eyre::anyhow!(
+        let conn = receiver.recv()?;
-            "could not receive ok signal from dagger-engine"
-        ))?;
 
         Ok((conn, proc))
     }

crates/dagger-core/src/downloader.rs

@@ -1,6 +1,6 @@
 use std::{
     fs::File,
-    io::{copy, Write},
+    io::{copy, Read, Write},
     os::unix::prelude::PermissionsExt,
     path::PathBuf,
 };
@@ -27,7 +27,6 @@ impl Platform {
         let normalize_arch = match arch.as_str() {
             "x86_64" => "amd64",
             "aarch" => "arm64",
-            "aarch64" => "arm64",
             arch => arch,
         };
 
@@ -120,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}"));
@@ -131,7 +130,6 @@ impl Downloader {
         if !cli_bin_path.exists() {
             cli_bin_path = self
                 .download(cli_bin_path)
-                .await
                 .context("failed to download CLI from archive")?;
         }
 
@@ -139,10 +137,6 @@ impl Downloader {
             if let Ok(entry) = file {
                 let path = entry.path();
                 if path != cli_bin_path {
-                    println!(
-                        "deleting client: path: {:?} vs cli_bin_path: {:?}",
-                        path, cli_bin_path
-                    );
                     std::fs::remove_file(path)?;
                 }
             }
@@ -151,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")
@@ -171,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()
@@ -196,20 +190,26 @@ 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));
+
         if archive_url.ends_with(".zip") {
             // TODO:  Nothing for now
             todo!()
         } else {
-            self.extract_from_tar(&bytes, dest)?;
+            self.extract_from_tar(bytes.as_slice(), dest)?;
         }
 
         Ok(hex::encode(res))
@@ -223,6 +223,8 @@ impl Downloader {
             let mut entry = entry?;
             let path = entry.path()?;
 
+            println!("path: {:?}", path);
+
             if path.ends_with("dagger") {
                 copy(&mut entry, output)?;
 
@@ -238,13 +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())
+        let cli_path = Downloader::new("0.3.10".into()).unwrap().get_cli().unwrap();
-            .unwrap()
-            .get_cli()
-            .await
-            .unwrap();
 
         assert_eq!(
             Some("dagger-0.3.10"),

crates/dagger-core/src/engine.rs

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

crates/dagger-core/src/introspection.rs

@@ -241,7 +241,6 @@ pub struct SchemaTypes {
     pub full_type: FullType,
 }
 
-#[allow(dead_code)]
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SchemaDirectivesArgs {
@@ -258,7 +257,6 @@ pub struct SchemaDirectives {
     pub args: Option<Vec<Option<SchemaDirectivesArgs>>>,
 }
 
-#[allow(dead_code)]
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Schema {

crates/dagger-core/src/lib.rs

@@ -1,7 +1,3 @@
-#![deny(warnings)]
-
-pub const DAGGER_ENGINE_VERSION: &'static str = "0.4.0";
-
 pub mod cli_session;
 pub mod config;
 pub mod connect_params;

crates/dagger-core/src/schema.rs

@@ -1,14 +1,24 @@
 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)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::get_schema;
+
+    #[test]
+    fn can_get_schema() {
+        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,393 +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.19 (2023-03-14)
-
-### Chore
-
- - <csr-id-6629d2db4fbc7cdba9b2e4a241e4b0a2592cf384/> fix release version
-
-### Bug Fixes
-
- - <csr-id-8fd6bb983ef00b1aa2cf1ba3088028329033c38f/> serialization of enum args for graphql
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 1 unique issue was worked on: [#34](https://github.com/kjuulh/dagger-rs/issues/34)
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **[#34](https://github.com/kjuulh/dagger-rs/issues/34)**
-    - serialization of enum args for graphql ([`8fd6bb9`](https://github.com/kjuulh/dagger-rs/commit/8fd6bb983ef00b1aa2cf1ba3088028329033c38f))
- * **Uncategorized**
-    - fix release version ([`6629d2d`](https://github.com/kjuulh/dagger-rs/commit/6629d2db4fbc7cdba9b2e4a241e4b0a2592cf384))
-</details>
-
-## v0.2.17 (2023-03-13)
-
-<csr-id-f67928155f02076cbb41abd4010523879ff3caf1/>
-<csr-id-2cc0231c5f29993081f0f7e15e44cac95a7d6086/>
-<csr-id-9ba01396cb44ee02cf7a16008e3f0bdae9f78754/>
-<csr-id-e9e35edb1cb67eee8cc033212aba3b1888def78f/>
-
-### Bug Fixes
-
- - <csr-id-1bfd084cd28e2b984c61de7f3f9a065cc41be007/> make sure tests have a command to execute
- - <csr-id-5593fce2e16e0aa97a2e6843f15d3bb1121048f5/> remove unused imports
- - <csr-id-c025d1742482d701946c292dcf104421d3cade8e/> add support for String as well
- - <csr-id-d7317e5cf34ee84a7b092357f5fbb15cd2bae2e3/> add public tuple field and into func
- - <csr-id-44fa0240f8197f49fdf942b5c3d89079b59195d1/> update rust crate futures to 0.3.27
-
-### Other
-
- - <csr-id-f67928155f02076cbb41abd4010523879ff3caf1/> initial issue
-
-### Refactor
-
- - <csr-id-2cc0231c5f29993081f0f7e15e44cac95a7d6086/> remove export and instead use exitcode
- - <csr-id-9ba01396cb44ee02cf7a16008e3f0bdae9f78754/> move issues to actual tests and refactor
- - <csr-id-e9e35edb1cb67eee8cc033212aba3b1888def78f/> move issues to another folder
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 10 commits contributed to the release over the course of 2 calendar days.
- - 2 days passed between releases.
- - 9 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-sdk v0.2.17 ([`a8e6dde`](https://github.com/kjuulh/dagger-rs/commit/a8e6dde615029d9a94d159ed84b5373121cd201f))
-    - make sure tests have a command to execute ([`1bfd084`](https://github.com/kjuulh/dagger-rs/commit/1bfd084cd28e2b984c61de7f3f9a065cc41be007))
-    - remove unused imports ([`5593fce`](https://github.com/kjuulh/dagger-rs/commit/5593fce2e16e0aa97a2e6843f15d3bb1121048f5))
-    - remove export and instead use exitcode ([`2cc0231`](https://github.com/kjuulh/dagger-rs/commit/2cc0231c5f29993081f0f7e15e44cac95a7d6086))
-    - move issues to actual tests and refactor ([`9ba0139`](https://github.com/kjuulh/dagger-rs/commit/9ba01396cb44ee02cf7a16008e3f0bdae9f78754))
-    - add support for String as well ([`c025d17`](https://github.com/kjuulh/dagger-rs/commit/c025d1742482d701946c292dcf104421d3cade8e))
-    - move issues to another folder ([`e9e35ed`](https://github.com/kjuulh/dagger-rs/commit/e9e35edb1cb67eee8cc033212aba3b1888def78f))
-    - add public tuple field and into func ([`d7317e5`](https://github.com/kjuulh/dagger-rs/commit/d7317e5cf34ee84a7b092357f5fbb15cd2bae2e3))
-    - initial issue ([`f679281`](https://github.com/kjuulh/dagger-rs/commit/f67928155f02076cbb41abd4010523879ff3caf1))
-    - update rust crate futures to 0.3.27 ([`44fa024`](https://github.com/kjuulh/dagger-rs/commit/44fa0240f8197f49fdf942b5c3d89079b59195d1))
-</details>
-
-## v0.2.16 (2023-03-10)
-
-<csr-id-e642778d9028726dfb07217814e15ad1dd3b83f2/>
-
-### Chore
-
- - <csr-id-e642778d9028726dfb07217814e15ad1dd3b83f2/> fix tasks
-
-### Documentation
-
- - <csr-id-13b7805e7e6fcf47e0a1318adcc25b4ab773a3c9/> fix missing await in connect
-
-### New Features
-
- - <csr-id-7133bfae9508bc5977548e373c49342a1248d6e4/> with dagger-engine v.0.4.0
- - <csr-id-4381af029521c2cbac9325278d261db79a994657/> add tests to sdk
- - <csr-id-5f9b3a19c0ab6988bc335b020052074f3f101305/> set internal warnings as errors
-
-### Bug Fixes
-
- - <csr-id-ecca036bc644fee93fbcb69bf6da9f29169e473e/> fix builder pattern to actually work with default values
-   In previous versions the builder pattern required all values to be set.
-   This has not been fixed, so that default values are allowed.
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 7 commits contributed to the release over the course of 13 calendar days.
- - 13 days passed between releases.
- - 6 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.8, dagger-sdk v0.2.16 ([`f390eac`](https://github.com/kjuulh/dagger-rs/commit/f390eac29f1d041d18d2207a5aa0a8d993aab68c))
-    - fix tasks ([`e642778`](https://github.com/kjuulh/dagger-rs/commit/e642778d9028726dfb07217814e15ad1dd3b83f2))
-    - with dagger-engine v.0.4.0 ([`7133bfa`](https://github.com/kjuulh/dagger-rs/commit/7133bfae9508bc5977548e373c49342a1248d6e4))
-    - fix missing await in connect ([`13b7805`](https://github.com/kjuulh/dagger-rs/commit/13b7805e7e6fcf47e0a1318adcc25b4ab773a3c9))
-    - add tests to sdk ([`4381af0`](https://github.com/kjuulh/dagger-rs/commit/4381af029521c2cbac9325278d261db79a994657))
-    - set internal warnings as errors ([`5f9b3a1`](https://github.com/kjuulh/dagger-rs/commit/5f9b3a19c0ab6988bc335b020052074f3f101305))
-    - fix builder pattern to actually work with default values ([`ecca036`](https://github.com/kjuulh/dagger-rs/commit/ecca036bc644fee93fbcb69bf6da9f29169e473e))
-</details>
-
-## v0.2.15 (2023-02-24)
-
-### New Features
-
- - <csr-id-3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f/> update to dagger-v0.3.13
-
-### Bug Fixes
-
- - <csr-id-e578b0e371e13bc30ada793b7cd6ebe75ba83a07/> set deserialize on enums as well
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 3 commits contributed to the release.
- - 2 days passed between releases.
- - 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.7, dagger-sdk v0.2.15 ([`6a9a560`](https://github.com/kjuulh/dagger-rs/commit/6a9a560cdca097abf23371d44599a2f1b726ae7f))
-    - set deserialize on enums as well ([`e578b0e`](https://github.com/kjuulh/dagger-rs/commit/e578b0e371e13bc30ada793b7cd6ebe75ba83a07))
-    - update to dagger-v0.3.13 ([`3e8ca8d`](https://github.com/kjuulh/dagger-rs/commit/3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f))
-</details>
-
-## v0.2.14 (2023-02-22)
-
-<csr-id-e331ca003546f4ebe00f33b65c3b45c6b0586514/>
-
-### Chore
-
- - <csr-id-e331ca003546f4ebe00f33b65c3b45c6b0586514/> fix whitespace
-
-### 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-sdk v0.2.14 ([`88b055c`](https://github.com/kjuulh/dagger-rs/commit/88b055cb47d3d474e2c37d8fa8259df5faad9da5))
-    - fix whitespace ([`e331ca0`](https://github.com/kjuulh/dagger-rs/commit/e331ca003546f4ebe00f33b65c3b45c6b0586514))
-</details>
-
-## v0.2.13 (2023-02-22)
-
-<csr-id-7c3654d276bb5f66e692a210cb60cdf46b19e226/>
-<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
-
-### Chore
-
- - <csr-id-7c3654d276bb5f66e692a210cb60cdf46b19e226/> ran clippy
- - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
-
-### New Features
-
- - <csr-id-266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c/> with clone
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 7 commits contributed to the release over the course of 2 calendar days.
- - 2 days passed between releases.
- - 4 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-codegen v0.2.8, dagger-sdk v0.2.13 ([`456f483`](https://github.com/kjuulh/dagger-rs/commit/456f48389b5514d7f743a600a7732fb02dd87418))
-    - ran clippy ([`7c3654d`](https://github.com/kjuulh/dagger-rs/commit/7c3654d276bb5f66e692a210cb60cdf46b19e226))
-    - with clone ([`266ad32`](https://github.com/kjuulh/dagger-rs/commit/266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c))
-    - Release dagger-core v0.2.6, dagger-codegen v0.2.7, dagger-sdk v0.2.12 ([`7179f8b`](https://github.com/kjuulh/dagger-rs/commit/7179f8b598ef04e62925e39d3f55740253c01686))
-    - 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.12 (2023-02-20)
-
-<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
-
-### Chore
-
- - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-## 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)
-
-### New Features
-
- - <csr-id-978ede68ae52f5b5150a2aa45b8d6e1fbbbee2f4/> add documentation strings
-
-### 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-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>
 
 ## v0.2.7 (2023-02-19)
 
@@ -399,26 +13,26 @@ 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<()> {
-   // ...
+     // ...
    
-   client.container().from("rust").publish("somewhere")?;
+     client.container().from("rust").publish("somewhere")?;
    
-   // ...
+     // ...
    }
    
    // to
    
    async fn main() -> eyre::Result<()> {
-   // ...
+     // ...
    
-   client.container().from("rust").publish("somewhere").await?;
+     client.container().from("rust").publish("somewhere").await?;
    
-   // ...
+     // ...
    }
    ```
 
@@ -426,7 +40,7 @@ Alignment release
 
 <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
 
@@ -437,7 +51,6 @@ Alignment release
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-sdk v0.2.7 ([`a1887af`](https://github.com/kjuulh/dagger-rs/commit/a1887afc8b51f61491ba7f13c5e7a5b7619623c4))
     - change to await syntax ([`93f40b3`](https://github.com/kjuulh/dagger-rs/commit/93f40b356c48f14e910968516bed9487912095c1))
     - Use async runtime instead of blocking. ([`9be6f43`](https://github.com/kjuulh/dagger-rs/commit/9be6f435d9ea39f31a8906e55dbd3e8b1e5ec598))
 </details>
@@ -471,8 +84,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
@@ -481,12 +94,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:
    
@@ -496,13 +109,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
 
@@ -538,8 +151,7 @@ Alignment release
 
 ### Bug Fixes
 
- - <csr-id-7d04ab1240e497e7804fed23a378d28c78f50a0a/> readme dagger-rs ->
+ - <csr-id-7d04ab1240e497e7804fed23a378d28c78f50a0a/> readme dagger-rs -> dagger-sdk
-   dagger-sdk
 
 ### Commit Statistics
 
@@ -567,10 +179,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.19"
+version = "0.2.7"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -11,14 +11,14 @@ 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.8" }
+dagger-core = { path = "../dagger-core", version = "^0.2.2" }
 
 base64 = "0.21.0"
 eyre = "0.6.8"
-futures = "0.3.27"
+futures = "0.3.26"
 gql_client = "1.0.7"
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.93", features = ["raw_value"] }
+serde_json = "1.0.93"
 tokio = { version = "1.25.0", features = ["full"] }
 derive_builder = "0.12.0"
 

crates/dagger-sdk/README.md

@@ -27,7 +27,7 @@ cargo add dagger-sdk
 ```rust
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let version = client
         .container()
@@ -46,3 +46,9 @@ And run it like a normal application:
 ```bash
 cargo run
 ```
+
+### Disclaimer
+
+You are free to use something else than `tokio`, I haven't tested it with
+anything else, but it should work with any other runtime. We don't rely on it
+specifically. That might change in the future though.

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",
@@ -35,8 +35,7 @@ async fn main() -> eyre::Result<()> {
         .container()
         .from("nginx")
         .with_directory("/usr/share/nginx/html", build_dir.id().await?)
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>())).await?;
-        .await?;
 
     println!("published image to: {}", ref_);
 

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()
@@ -13,8 +13,7 @@ async fn main() -> eyre::Result<()> {
     let ref_ = client
         .container()
         .build(context_dir.id().await?)
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>())).await?;
-        .await?;
 
     println!("published image to: {}", ref_);
 

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

@@ -1,13 +1,12 @@
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::connect()?;
 
     let version = client
         .container()
         .from("golang:1.19")
         .with_exec(vec!["go", "version"])
-        .stdout()
+        .stdout().await?;
-        .await?;
 
     println!("Hello from Dagger and {}", version.trim());
 

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(
@@ -39,8 +39,7 @@ async fn main() -> eyre::Result<()> {
             "/usr/share/nginx/html",
             client.host().directory(output).id().await?,
         )
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>())).await?;
-        .await?;
 
     println!("published image to: {}", ref_);
 

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",
@@ -23,8 +23,7 @@ async fn main() -> eyre::Result<()> {
 
     let out = runner
         .with_exec(vec!["npm", "test", "--", "--watchAll=false"])
-        .stderr()
+        .stderr().await?;
-        .await?;
 
     println!("{}", out);
 

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/lib.rs

@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
 mod client;
 mod gen;
 mod querybuilder;

crates/dagger-sdk/src/querybuilder.rs

@@ -68,32 +68,6 @@ impl Selection {
         s
     }
 
-    pub fn arg_enum<S>(&self, name: &str, value: S) -> Selection
-    where
-        S: Serialize,
-    {
-        let mut s = self.clone();
-
-        let val = serde_json::to_string(&value).unwrap();
-        let val = val[1..val.len() - 1].to_string();
-
-        println!("test");
-        println!("{}", val);
-
-        match s.args.as_mut() {
-            Some(args) => {
-                let _ = args.insert(name.to_string(), val);
-            }
-            None => {
-                let mut hm = HashMap::new();
-                let _ = hm.insert(name.to_string(), val);
-                s.args = Some(hm);
-            }
-        }
-
-        s
-    }
-
     pub fn build(&self) -> eyre::Result<String> {
         let mut fields = vec!["query".to_string()];
 
@@ -102,7 +76,7 @@ impl Selection {
                 if let Some(args) = sel.args {
                     let actualargs = args
                         .iter()
-                        .map(|(name, arg)| format!("{name}:{}", arg.as_str()))
+                        .map(|(name, arg)| format!("{name}:{arg}"))
                         .collect::<Vec<_>>();
 
                     query = query.add(&format!("({})", actualargs.join(", ")));
@@ -125,9 +99,6 @@ impl Selection {
     {
         let query = self.build()?;
 
-        let qbs = query.as_str();
-        println!("{}", qbs);
-
         let resp: Option<serde_json::Value> = match gql_client.query(&query).await {
             Ok(r) => r,
             Err(e) => eyre::bail!(e),

crates/dagger-sdk/tests/issues/iss_30.rs

@@ -1,47 +0,0 @@
-use dagger_sdk::{QueryContainerOpts, QueryContainerOptsBuilder};
-
-static PLATFORMS: [&str; 2] = ["linux/arm64", "linux/x86_64"];
-
-#[tokio::test]
-async fn test_issue_30_alt() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
-
-    for platform in PLATFORMS {
-        let ref_ = client
-            .container_opts(QueryContainerOpts {
-                id: None,
-                platform: Some(platform.to_string().into()),
-            })
-            .from("alpine")
-            .with_exec(vec!["echo", "'hello'"])
-            .exit_code()
-            .await?;
-
-        println!("published image to: {:#?}", ref_);
-    }
-
-    Ok(())
-}
-
-#[tokio::test]
-async fn test_issue_30() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
-
-    for platform in PLATFORMS {
-        let ref_ = client
-            .container_opts(
-                QueryContainerOptsBuilder::default()
-                    .platform(platform)
-                    .build()
-                    .unwrap(),
-            )
-            .from("alpine")
-            .with_exec(vec!["echo", "'hello'"])
-            .exit_code()
-            .await?;
-
-        println!("published image to: {:#?}", ref_);
-    }
-
-    Ok(())
-}

crates/dagger-sdk/tests/issues/iss_33.rs

@@ -1,29 +0,0 @@
-use dagger_sdk::{ContainerWithExposedPortOpts, NetworkProtocol};
-
-#[tokio::test]
-async fn test_issue_30_alt() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
-
-    client
-        .container()
-        .from("denoland/deno:debian-1.30.3")
-        .with_exposed_port_opts(
-            53,
-            ContainerWithExposedPortOpts {
-                protocol: Some(NetworkProtocol::TCP),
-                description: None,
-            },
-        )
-        .with_exposed_port_opts(
-            53,
-            ContainerWithExposedPortOpts {
-                protocol: Some(NetworkProtocol::UDP),
-                description: None,
-            },
-        )
-        .with_exec(vec!["echo", "hello"])
-        .exit_code()
-        .await?;
-
-    Ok(())
-}

crates/dagger-sdk/tests/issues/mod.rs

@@ -1,2 +0,0 @@
-mod iss_30;
-mod iss_33;

crates/dagger-sdk/tests/mod.rs

@@ -1,11 +1,8 @@
-mod issues;
-
 use dagger_sdk::{connect, ContainerExecOptsBuilder};
-use pretty_assertions::assert_eq;
 
 #[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");
 
@@ -22,99 +19,3 @@ async fn test_example_container() {
 
     assert_eq!(out, "3.16.2\n".to_string())
 }
-
-#[tokio::test]
-async fn test_directory() {
-    let c = connect().await.unwrap();
-
-    let contents = c
-        .directory()
-        .with_new_file("/hello.txt", "world")
-        .file("/hello.txt")
-        .contents()
-        .await
-        .unwrap();
-
-    assert_eq!("world", contents)
-}
-
-#[tokio::test]
-async fn test_git() {
-    let c = connect().await.unwrap();
-
-    let tree = c.git("github.com/dagger/dagger").branch("main").tree();
-
-    let _ = tree
-        .entries()
-        .await
-        .unwrap()
-        .iter()
-        .find(|f| f.as_str() == "README.md")
-        .unwrap();
-
-    let readme_file = tree.file("README.md");
-
-    let readme = readme_file.contents().await.unwrap();
-    assert_eq!(true, readme.find("Dagger").is_some());
-
-    let readme_id = readme_file.id().await.unwrap();
-    let other_readme = c.file(readme_id).contents().await.unwrap();
-
-    assert_eq!(readme, other_readme);
-}
-
-#[tokio::test]
-async fn test_container() {
-    let client = connect().await.unwrap();
-
-    let alpine = client.container().from("alpine:3.16.2");
-
-    let contents = alpine
-        .fs()
-        .file("/etc/alpine-release")
-        .contents()
-        .await
-        .unwrap();
-    assert_eq!(contents, "3.16.2\n".to_string());
-
-    let out = alpine
-        .exec_opts(
-            ContainerExecOptsBuilder::default()
-                .args(vec!["cat", "/etc/alpine-release"])
-                .build()
-                .unwrap(),
-        )
-        .stdout()
-        .await
-        .unwrap();
-    assert_eq!(out, "3.16.2\n".to_string());
-
-    let id = alpine.id().await.unwrap();
-    let contents = client
-        .container_opts(dagger_sdk::QueryContainerOpts {
-            id: Some(id),
-            platform: None,
-        })
-        .fs()
-        .file("/etc/alpine-release")
-        .contents()
-        .await
-        .unwrap();
-    assert_eq!(contents, "3.16.2\n".to_string());
-}
-
-#[tokio::test]
-async fn test_err_message() {
-    let client = connect().await.unwrap();
-
-    let alpine = client.container().from("fake.invalid:latest").id().await;
-    assert_eq!(alpine.is_err(), true);
-    let err = alpine.expect_err("Tests expect err");
-
-    let error_msg = r#"
-GQLClient Error: Look at json field for more details
-Message: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-"#;
-
-    assert_eq!(err.to_string().as_str(), error_msg);
-}

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(())
 }