Adjusting changelogs prior to release of dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1

.github/workflows/ci.yaml

@@ -1,14 +1,8 @@
 name: ci
 on:
   pull_request:
-  push:
-    branches:
-      - "main"
 env:
   CARGO_TERM_COLOR: always
-  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  _EXPERIMENTAL_DAGGER_CACHE_CONFIG: type=gha;mode=max
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -17,16 +11,5 @@ jobs:
         uses: actions/checkout@v3
       - name: Update rust toolchain
         run: rustup update stable && rustup default stable
-      - name: Set up cargo cache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: "~/.cargo/bin/\n~/.cargo/registry/index/\n~/.cargo/registry/cache/\n~/.cargo/git/db/\ntarget/"
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.0.0
       - name: Run dagger [CI]
         run: cargo run -p ci -- pr

.github/workflows/create-release.yml

@@ -0,0 +1,25 @@
+name: Release
+permissions:
+  contents: write
+on:
+  push:
+    tags:
+      - v[0-9]+.*
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: taiki-e/create-gh-release-action@v1
+        with:
+          # (Optional) Path to changelog.
+          changelog: CHANGELOG.md
+          # (Optional) Create a draft release.
+          # [default value: false]
+          draft: false
+          # (Required) GitHub token for creating GitHub Releases.
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Update rust toolchain
+        run: rustup update stable && rustup default stable
+      - name: Run dagger [RELEASE]
+        run: cargo run -p ci -- release --version="${{github.ref_name}}"

.github/workflows/lint-pr.yml

@@ -1,15 +0,0 @@
-name: "Lint PR"
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-jobs:
-  main:
-    name: Validate PR title
-    runs-on: ubuntu-latest
-    steps:
-      - uses: amannn/action-semantic-pull-request@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,218 +1,34 @@
-# Changelog
+## 0.2.0 - 2023-02-17
 
-All notable changes to this project will be documented in this file.
+First actual useful version of dagger-sdk. contains code for codegen, cli, and
+core.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+## 0.2.6 - 2023-02-17
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.10 (2023-02-20)
+With releaser
 
-### Bug Fixes
+## v0.2.6 (2023-02-17)
 
- - <csr-id-75bc17e57db222492c6ffd2dfe80208d2bda75c9/> Fix async panic on blocking #19
+## v0.2.5 (2023-02-17)
-   Replaced internal threads with tokio spawn functions
 
-### Commit Statistics
+## v0.2.4 (2023-02-17)
 
-<csr-read-only-do-not-edit/>
+## v0.2.3 (2023-02-17)
 
- - 1 commit contributed to the release.
+## v0.2.2 (2023-02-17)
- - 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
-
- - <csr-id-19ed6c267f779b72430422c463ceed553f6fc618/> re-export through lib.rs
-   this means that you can now use dagger_sdk::connect() instead of
-   dagger_sdk::client::connect();
-
-### 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**
-    - re-export through lib.rs ([`19ed6c2`](https://github.com/kjuulh/dagger-rs/commit/19ed6c267f779b72430422c463ceed553f6fc618))
-</details>
-
-## v0.2.8 (2023-02-19)
-
-### New Features
-
- - <csr-id-f42da8416a5450c7c3c924353c3cc9112afd18f0/> with sccache
-
-### 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**
-    - with sccache ([`f42da84`](https://github.com/kjuulh/dagger-rs/commit/f42da8416a5450c7c3c924353c3cc9112afd18f0))
-    - test change ([`98781f2`](https://github.com/kjuulh/dagger-rs/commit/98781f2496deaea4bc13c9e90e60543b7daac9d7))
-</details>
-
-## v0.2.7 (2023-02-18)
-
-### Bug Fixes
-
- - <csr-id-d72313051b9b46a6eeaa909a11850b3d8fc75e81/> with test changes
-
-### 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**
-    - with test changes ([`d723130`](https://github.com/kjuulh/dagger-rs/commit/d72313051b9b46a6eeaa909a11850b3d8fc75e81))
-</details>
-
-## v0.2.6 (2023-02-18)
-
-With smart releaser
-
-### Bug Fixes
-
- - <csr-id-4ebe0d12b50028a8b79d8c76a2257c9c2b7b3429/> cleanup
-
-### 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**
-    - cleanup ([`4ebe0d1`](https://github.com/kjuulh/dagger-rs/commit/4ebe0d12b50028a8b79d8c76a2257c9c2b7b3429))
-</details>
-
-## v0.2.5 (2023-02-18)
-
-### Bug Fixes
-
- - <csr-id-4ac89b645712dd8c357832a817af131c2d2e0686/> trying agian
-
-### 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**
-    - trying agian ([`4ac89b6`](https://github.com/kjuulh/dagger-rs/commit/4ac89b645712dd8c357832a817af131c2d2e0686))
-</details>
-
-## v0.2.4 (2023-02-18)
-
-### Bug Fixes
-
- - <csr-id-4ac89b645712dd8c357832a817af131c2d2e0686/> trying agian
-
-## v0.2.3 (2023-02-18)
-
-### New Features
-
- - <csr-id-3a45202a21b24d8331a2ead72944df9ac7c70839/> some test
-
-### 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**
-    - some test ([`3a45202`](https://github.com/kjuulh/dagger-rs/commit/3a45202a21b24d8331a2ead72944df9ac7c70839))
-</details>
-
-## v0.2.2 (2023-02-18)
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 1 commit contributed to the release.
- - 0 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**
-    - with test commit ([`0470093`](https://github.com/kjuulh/dagger-rs/commit/0470093912622640913ac34661be72a546dd1ba5))
-</details>
 
 ## v0.2.1 (2023-02-18)
 
+### New Features
+
+ - <csr-id-68af1696f7d6bd8f9f2169075c554938e2d594ba/> color-eyre
+
 ### Commit Statistics
 
 <csr-read-only-do-not-edit/>
 
  - 1 commit contributed to the release.
- - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
 ### Commit Details
@@ -222,7 +38,7 @@ With smart releaser
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - add color eyre ([`32665d8`](https://github.com/kjuulh/dagger-rs/commit/32665d8fa0c97d39a1b43c5e8343f23e87497c16))
+    - color-eyre ([`68af169`](https://github.com/kjuulh/dagger-rs/commit/68af1696f7d6bd8f9f2169075c554938e2d594ba))
 </details>
 
 ## v0.2.0 (2023-02-17)

Cargo.lock

@@ -92,15 +92,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
 [[package]]
 name = "cfg-if"
@@ -114,9 +114,8 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "color-eyre",
- "dagger-sdk",
+ "dagger-sdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "eyre",
- "tokio",
 ]
 
 [[package]]
@@ -246,10 +245,10 @@ dependencies = [
 
 [[package]]
 name = "dagger-codegen"
-version = "0.2.8"
+version = "0.2.1"
 dependencies = [
  "convert_case",
- "dagger-core",
+ "dagger-core 0.2.1",
  "eyre",
  "genco",
  "itertools",
@@ -260,7 +259,31 @@ dependencies = [
 
 [[package]]
 name = "dagger-core"
-version = "0.2.6"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02a16b0e83ae5b88a3d4e2f3cf5149932cfcb3113e67f5579372e25d5dab5b53"
+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.1"
 dependencies = [
  "clap",
  "dirs",
@@ -278,17 +301,16 @@ dependencies = [
  "sha2",
  "tar",
  "tempfile",
- "tokio",
 ]
 
 [[package]]
 name = "dagger-rs"
-version = "0.2.10"
+version = "0.2.1"
 dependencies = [
  "clap",
  "color-eyre",
  "dagger-codegen",
- "dagger-core",
+ "dagger-core 0.2.1",
  "dirs",
  "eyre",
  "flate2",
@@ -304,16 +326,14 @@ dependencies = [
  "sha2",
  "tar",
  "tempfile",
- "tokio",
 ]
 
 [[package]]
 name = "dagger-sdk"
-version = "0.2.13"
+version = "0.2.0"
 dependencies = [
  "base64",
- "dagger-core",
+ "dagger-core 0.2.1",
- "derive_builder",
  "eyre",
  "futures",
  "genco",
@@ -326,69 +346,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "darling"
+name = "dagger-sdk"
-version = "0.14.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
+checksum = "e454c49b81feeb5c4057f54223cb8d7618e5d015ed835c3f3fa231fefa04e833"
 dependencies = [
- "darling_core",
+ "base64",
- "darling_macro",
+ "dagger-core 0.2.0",
-]
+ "eyre",
-
+ "futures",
-[[package]]
+ "genco",
-name = "darling_core"
+ "gql_client",
-version = "0.14.3"
+ "pretty_assertions",
-source = "registry+https://github.com/rust-lang/crates.io-index"
+ "serde",
-checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
+ "serde_json",
-dependencies = [
+ "tokio",
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
-dependencies = [
- "derive_builder_core",
- "syn",
 ]
 
 [[package]]
@@ -435,9 +407,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 +447,23 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.20"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -771,9 +743,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 +756,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 +770,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 +804,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
-version = "0.14.24"
+version = "0.14.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -873,12 +839,6 @@ dependencies = [
  "tokio-native-tls",
 ]
 
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -916,12 +876,12 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -932,14 +892,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -959,9 +919,9 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1037,14 +997,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 +1031,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 +1046,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "openssl"
@@ -1233,9 +1193,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
  "unicode-ident",
 ]
@@ -1362,16 +1322,16 @@ checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1397,9 +1357,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -1483,18 +1443,18 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
  "autocfg",
 ]
@@ -1607,9 +1567,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
@@ -1644,9 +1604,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
  "tokio",
@@ -1654,9 +1614,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.7"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1749,9 +1709,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
 
 [[package]]
 name = "unreachable"
@@ -1815,9 +1775,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1825,9 +1785,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
  "log",
@@ -1840,9 +1800,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1852,9 +1812,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1862,9 +1822,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1875,9 +1835,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "wasm-streams"
@@ -1894,9 +1854,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-rs"
-version = "0.2.10"
+version = "0.2.1"
 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.1" }
-dagger-core = { path = "crates/dagger-core", version = "^0.2.3" }
+dagger-core = { path = "crates/dagger-core", version = "^0.2.1" }
 
 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"] }

README.md

@@ -21,10 +21,10 @@ See [dagger-sdk](./crates/dagger-sdk/README.md)
   - [x] Context
   - [x] Deserializer for nested response (bind)
 - [x] Add codegen to hook into querier
-- [x] fix build / release cycle
+- [ ] fix build / release cycle
-- [x] general api stabilisation
+- [ ] general api stabilisation
 - [x] document usage
-- [x] make async variant
+- [ ] make async variant
 
 ## Architecture
 

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.13" }
+dagger-sdk = "0.2.0"
 eyre = "0.6.8"
-tokio = { version = "1.25.0", features = ["full"] }

ci/src/main.rs

@@ -1,25 +1,26 @@
 use std::sync::Arc;
 
-use dagger_sdk::{Container, HostDirectoryOpts, Query};
+use dagger_sdk::gen::{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("release")
+                .arg(clap::Arg::new("version").long("version").required(true)),
+        )
         .get_matches();
 
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::client::connect()?;
+
+    let base = select_base_image(client.clone());
 
     match matches.subcommand() {
-        Some(("pr", _)) => {
+        Some(("pr", _)) => return validate_pr(client, base),
-            let base = select_base_image(client.clone()).await?;
+        Some(("release", subm)) => return release(client, base, subm),
-            return validate_pr(client, base).await;
-        }
-        Some(("release", subm)) => return release(client, subm).await,
         Some(_) => {
             panic!("invalid subcommand selected!")
         }
@@ -29,146 +30,155 @@ async fn main() -> eyre::Result<()> {
     }
 }
 
-async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
+fn release(
-    let src_dir = client.host().directory_opts(
+    client: Arc<Query>,
-        ".",
+    base: Container,
-        HostDirectoryOpts {
+    subm: &clap::ArgMatches,
-            exclude: Some(vec!["target/"]),
+) -> Result<(), color_eyre::Report> {
-            include: None,
+    let version = subm.get_one::<String>("version").unwrap();
-        },
-    );
-    let base_image = client
-        .container()
-        .from("rust:latest")
-        .with_workdir("app")
-        .with_mounted_directory("/app/", src_dir.id().await?);
 
-    let container = base_image
+    let container = base
-        .with_exec(vec!["cargo", "install", "cargo-smart-release"])
+        .with_exec(
-        .with_exec(vec![
+            vec!["cargo".into(), "install".into(), "cargo-release".into()],
-            "cargo",
+            None,
-            "smart-release",
-            "--execute",
-            "--allow-fully-generated-changelogs",
-            "--no-changelog-preview",
-            "dagger-rs",
-            "dagger-sdk",
-        ]);
-    let exit = container.exit_code().await?;
-    if exit != 0 {
-        eyre::bail!("container failed with non-zero exit code");
-    }
-
-    println!("released pr succeeded!");
-
-    Ok(())
-}
-
-async fn get_dependencies(client: Arc<Query>) -> eyre::Result<Container> {
-    let cargo_dir = client.host().directory_opts(
-        ".",
-        HostDirectoryOpts {
-            exclude: None,
-            include: Some(vec![
-                "**/Cargo.lock",
-                "**/Cargo.toml",
-                "**/main.rs",
-                "**/lib.rs",
-            ]),
-        },
-    );
-
-    let src_dir = client.host().directory_opts(
-        ".",
-        HostDirectoryOpts {
-            exclude: Some(vec!["target/"]),
-            include: None,
-        },
-    );
-
-    let cache_cargo_index_dir = client.cache_volume("cargo_index");
-    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("rust:latest")
-        .with_workdir("app")
-        .with_exec(vec!["apt-get", "update"])
-        .with_exec(vec!["apt-get", "install", "--yes", "libpq-dev", "wget"])
-        .with_exec(vec!["wget", minio_url])
-        .with_exec(vec![
-            "tar",
-            "xzf",
-            "sccache-v0.3.3-x86_64-unknown-linux-musl.tar.gz",
-        ])
-        .with_exec(vec![
-            "mv",
-            "sccache-v0.3.3-x86_64-unknown-linux-musl/sccache",
-            "/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(
-            "AWS_ACCESS_KEY_ID",
-            std::env::var("AWS_ACCESS_KEY_ID").unwrap_or("".into()),
         )
-        .with_env_variable(
+        .with_exec(
-            "AWS_SECRET_ACCESS_KEY",
+            vec![
-            std::env::var("AWS_SECRET_ACCESS_KEY").unwrap_or("".into()),
+                "cargo".into(),
+                "release".into(),
+                "version".into(),
+                "--workspace".into(),
+                "--execute".into(),
+                "--no-confirm".into(),
+                version.clone(),
+            ],
+            None,
         )
-        .with_env_variable("SCCACHE_BUCKET", "sccache")
+        .with_exec(
-        .with_env_variable("SCCACHE_REGION", "auto")
+            vec![
-        .with_env_variable("SCCACHE_ENDPOINT", "https://api-minio.front.kjuulh.io")
+                "cargo".into(),
-        .with_mounted_cache("~/.cargo/bin", cache_cargo_bin.id().await?)
+                "release".into(),
-        .with_mounted_cache("~/.cargo/registry/index", cache_cargo_bin.id().await?)
+                "replace".into(),
-        .with_mounted_cache("~/.cargo/registry/cache", cache_cargo_bin.id().await?)
+                "--workspace".into(),
-        .with_mounted_cache("~/.cargo/git/db", cache_cargo_bin.id().await?)
+                "--execute".into(),
-        .with_mounted_cache("target/", cache_cargo_bin.id().await?)
+                "--no-confirm".into(),
-        .with_exec(vec!["cargo", "install", "cargo-chef"]);
+            ],
-
+            None,
-    let recipe = base_image
+        )
-        .with_mounted_directory(".", cargo_dir.id().await?)
+        .with_exec(
-        .with_mounted_cache("~/.cargo/.package-cache", cache_cargo_index_dir.id().await?)
+            vec![
-        .with_exec(vec![
+                "cargo".into(),
-            "cargo",
+                "release".into(),
-            "chef",
+                "publish".into(),
-            "prepare",
+                "--workspace".into(),
-            "--recipe-path",
+                "--execute".into(),
-            "recipe.json",
+                "--no-verify".into(),
-        ])
+                "--no-confirm".into(),
-        .file("/app/recipe.json");
+            ],
-
+            None,
-    let builder_start = base_image
+        );
-        .with_mounted_file("/app/recipe.json", recipe.id().await?)
+    let exit = container.exit_code();
-        .with_exec(vec![
+    if exit != 0 {
-            "cargo",
+        eyre::bail!("container failed with non-zero exit code");
-            "chef",
+    }
-            "cook",
+
-            "--release",
+    println!("validating pr succeeded!");
-            "--workspace",
+
-            "--recipe-path",
+    Ok(())
-            "recipe.json",
+}
-        ])
+
-        .with_mounted_cache("/app/", cache_cargo_deps.id().await?)
+fn get_dependencies(client: Arc<Query>) -> Container {
-        .with_mounted_directory("/app/", src_dir.id().await?)
+    let cargo_dir = client.host().directory(
-        .with_exec(vec!["cargo", "build", "--all", "--release"]);
+        ".".into(),
-
+        Some(HostDirectoryOpts {
-    return Ok(builder_start);
+            exclude: None,
-}
+            include: Some(vec![
-
+                "**/Cargo.lock".into(),
-async fn select_base_image(client: Arc<Query>) -> eyre::Result<Container> {
+                "**/Cargo.toml".into(),
-    let src_dir = get_dependencies(client.clone()).await;
+                "**/main.rs".into(),
-
+                "**/lib.rs".into(),
-    src_dir
+            ]),
-}
+        }),
-
+    );
-async fn validate_pr(_client: Arc<Query>, container: Container) -> eyre::Result<()> {
+
-    //let container = container.with_exec(vec!["cargo", "test", "--all"], None);
+    let src_dir = client.host().directory(
-
+        ".".into(),
-    let exit = container.exit_code().await?;
+        Some(HostDirectoryOpts {
+            exclude: Some(vec!["target/".into()]),
+            include: None,
+        }),
+    );
+
+    let cache_cargo_index_dir = client.cache_volume("cargo_index".into());
+    let cache_cargo_deps = client.cache_volume("cargo_deps".into());
+
+    let base_image = client
+        .container(None)
+        .from("rust:latest".into())
+        .with_workdir("app".into())
+        .with_exec(
+            vec!["cargo".into(), "install".into(), "cargo-chef".into()],
+            None,
+        );
+
+    let recipe = base_image
+        .with_mounted_directory(".".into(), cargo_dir.id())
+        .with_mounted_cache(
+            "~/.cargo/.package-cache".into(),
+            cache_cargo_index_dir.id(),
+            None,
+        )
+        .with_exec(
+            vec![
+                "cargo".into(),
+                "chef".into(),
+                "prepare".into(),
+                "--recipe-path".into(),
+                "recipe.json".into(),
+            ],
+            None,
+        )
+        .file("/app/recipe.json".into());
+
+    let builder_start = base_image
+        .with_mounted_file("/app/recipe.json".into(), recipe.id())
+        .with_exec(
+            vec![
+                "cargo".into(),
+                "chef".into(),
+                "cook".into(),
+                "--release".into(),
+                "--workspace".into(),
+                "--recipe-path".into(),
+                "recipe.json".into(),
+            ],
+            None,
+        )
+        .with_mounted_cache("/app/".into(), cache_cargo_deps.id(), None)
+        .with_mounted_directory("/app/".into(), src_dir.id())
+        .with_exec(
+            vec![
+                "cargo".into(),
+                "build".into(),
+                "--all".into(),
+                "--release".into(),
+            ],
+            None,
+        );
+
+    return builder_start;
+}
+
+fn select_base_image(client: Arc<Query>) -> Container {
+    let src_dir = get_dependencies(client.clone());
+
+    src_dir
+}
+
+fn validate_pr(_client: Arc<Query>, container: Container) -> eyre::Result<()> {
+    //let container = container.with_exec(vec!["cargo".into(), "test".into(), "--all".into()], None);
+
+    let exit = container.exit_code();
     if exit != 0 {
         eyre::bail!("container failed with non-zero exit code");
     }

crates/dagger-codegen/CHANGELOG.md

@@ -1,317 +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.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
-
- - <csr-id-f29ff836cfd72d5e051ca6a71a230ba1e9933091/> without Some in _opts functions
-   Option has been removed as a wrapper around opts. This makes it much
-   more convenient to use
-   
-   ```rust
-   client.container_opts(Some(ContainerOpts{}))
-   // ->
-   client.container_opts(ContainerOpts{})
-   ```
-   
-   The same options are still available, either an empty object can be
-   passed, or a non _opts function can be used
- - <csr-id-9762da895a164e30c5dc60e89a83e934ceae47ab/> with _opts methods
-   Now all opt values enter into a _opts function instead of the original.
-   This avoids a lot of verbosity for both None in the case opts are
-   unwanted, and Some() if they actually are.
-   
-   They are used like so:
-   
-   ```rust
-   client.container().from("...");
-   client.container_opts(Some(ContainerOpts{ ... }))
-   ```
-   
-   Some from opts will be removed in a future commit/pr
- - <csr-id-94336d06378f035464e233b921dc3858070f582d/> move to &str instead of String and introduce builder.
-   This will make the api much easier to use, as we can now rely on ""
-   instead of "".into() for normal string values.
-   
-   Introduced builder as well, which makes it much easier to use *Opts, as
-   it can handle the building of that, and get the benefits from String ->
-   &str, as that is currently not allowed for optional values
-
-### Bug Fixes
-
- - <csr-id-c627595fd2695e236924175d137c42f1480ccd6b/> cargo clippy
- - <csr-id-02006d40fc2c0383e0412c15c36db9af7eda991f/> without phantom data
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 6 commits contributed to the release.
- - 5 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.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))
-    - without phantom data ([`02006d4`](https://github.com/kjuulh/dagger-rs/commit/02006d40fc2c0383e0412c15c36db9af7eda991f))
-    - move to &str instead of String and introduce builder. ([`94336d0`](https://github.com/kjuulh/dagger-rs/commit/94336d06378f035464e233b921dc3858070f582d))
-</details>
-
-## v0.2.3 (2023-02-19)
-
-### New Features
-
- - <csr-id-de063eae858eb3335d2558a57ee6a88689635200/> with return result instead of unwrap
- - <csr-id-5d667369900a47d3a6015cd3814c240bc5c54436/> remove unnecessary option returns
-
-### 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.3, dagger-codegen v0.2.3, dagger-rs v0.2.9 ([`9235030`](https://github.com/kjuulh/dagger-rs/commit/92350306b3f0da40b4fc6dcaffcd90b891e83f70))
-    - with return result instead of unwrap ([`de063ea`](https://github.com/kjuulh/dagger-rs/commit/de063eae858eb3335d2558a57ee6a88689635200))
-    - remove unnecessary option returns ([`5d66736`](https://github.com/kjuulh/dagger-rs/commit/5d667369900a47d3a6015cd3814c240bc5c54436))
-</details>
-
-## v0.2.2 (2023-02-19)
-
-### New Features
-
- - <csr-id-6e5f4074329ab0462445b31d4153f8497c483438/> update to dagger v0.3.12
-
-### 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.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>
-
-## v0.2.1 (2023-02-18)
-
-<csr-id-6afe141d34308f18f9d46419931d2c9b822a7aef/>
-
-### Bug Fixes
-
- - <csr-id-789b0e69c8c53d0e86d9cec89ab5345507aad514/> update all dependencies
-
-### Other
-
- - <csr-id-6afe141d34308f18f9d46419931d2c9b822a7aef/> fix
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 35 commits contributed to the release over the course of 20 calendar days.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 2 unique issues were worked on: [#5](https://github.com/kjuulh/dagger-rs/issues/5), [#6](https://github.com/kjuulh/dagger-rs/issues/6)
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **[#5](https://github.com/kjuulh/dagger-rs/issues/5)**
-    - update all dependencies ([`789b0e6`](https://github.com/kjuulh/dagger-rs/commit/789b0e69c8c53d0e86d9cec89ab5345507aad514))
- * **[#6](https://github.com/kjuulh/dagger-rs/issues/6)**
-    - feature/add impl ([`4a4c03f`](https://github.com/kjuulh/dagger-rs/commit/4a4c03f3c2ee7f6268c65976715e70767b4ea78d))
- * **Uncategorized**
-    - Release dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1 ([`1332bc8`](https://github.com/kjuulh/dagger-rs/commit/1332bc842ce2ea0254c651419813b63b36ca590c))
-    - add changelogs ([`a064684`](https://github.com/kjuulh/dagger-rs/commit/a064684fcf80196188a57d9ff9067c0b5769fb09))
-    - Adjusting changelogs prior to release of dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1 ([`f4a20fd`](https://github.com/kjuulh/dagger-rs/commit/f4a20fda79063b29829cc899793775ba8cb17214))
-    - remove toolchain ([`f034528`](https://github.com/kjuulh/dagger-rs/commit/f03452840cf9260cd1d5e5aa8d7ee2897384c745))
-    - with actual versions ([`7153c24`](https://github.com/kjuulh/dagger-rs/commit/7153c24f0105a05f170efd10ef2535d83ce0c87e))
-    - with publish ([`989d5bc`](https://github.com/kjuulh/dagger-rs/commit/989d5bc26036d46a199d939b5cbbe72aff2f8fb1))
-    - codegen also with repository ([`c625ae4`](https://github.com/kjuulh/dagger-rs/commit/c625ae49ba4d2112ea9d4907a6689fd8e74b808c))
-    - with readme and license ([`1e26b38`](https://github.com/kjuulh/dagger-rs/commit/1e26b383d4f6dbcbe20f5f7c19c749e743f6e607))
-    - with wildcard version ([`533b9df`](https://github.com/kjuulh/dagger-rs/commit/533b9dfef0165c514127a8437d08daf52adf5739))
-    - cargo version 0.2.0 ([`bec62de`](https://github.com/kjuulh/dagger-rs/commit/bec62de62ff5638428174e232a36eee3ddd0f5ef))
-    - bump version ([`36b0ecd`](https://github.com/kjuulh/dagger-rs/commit/36b0ecdabf4c220cffb2d0660fb6480387e3249a))
-    - fix all clippy ([`6be8482`](https://github.com/kjuulh/dagger-rs/commit/6be8482b461e098384bbf1371ed7d67b259197fa))
-    - fmt tests ([`2eb0277`](https://github.com/kjuulh/dagger-rs/commit/2eb027754b357100544fe0c8f7c5f6125e017c6f))
-    - add tests ([`19b46b6`](https://github.com/kjuulh/dagger-rs/commit/19b46b6cf04ff3cff49047699dea20ca784c5536))
-    - pull out args wip ([`c4edd29`](https://github.com/kjuulh/dagger-rs/commit/c4edd29f50b6ada2cc3afd2f4df2ec47920c4607))
-    - implement sort by name and type ([`d9b51c1`](https://github.com/kjuulh/dagger-rs/commit/d9b51c1ac90c00fb3af24332b6140e1201bc9be7))
-    - fix optional types for real ([`26069a8`](https://github.com/kjuulh/dagger-rs/commit/26069a82a69ec7265216c8ddaceb37228dd0fb81))
-    - fix description ([`f4581ba`](https://github.com/kjuulh/dagger-rs/commit/f4581ba4cd1693a906eaf6c58054398ceae3bfac))
-    - with proper optional types ([`f4a812a`](https://github.com/kjuulh/dagger-rs/commit/f4a812a7d24e9e09cb4e3cbde56ee0b3ac774b62))
-    - set proper option type ([`8549cfc`](https://github.com/kjuulh/dagger-rs/commit/8549cfc3a7d9f831febaeadc22db36604e465ea8))
-    - add fields ([`496a687`](https://github.com/kjuulh/dagger-rs/commit/496a687bc34f7c58cc86df60c183be741b0b8a9c))
-    - add input_fields ([`d2cddff`](https://github.com/kjuulh/dagger-rs/commit/d2cddff365c636feceb3f20a73df812fcab11a19))
-    - with objects ([`5fef514`](https://github.com/kjuulh/dagger-rs/commit/5fef5148010f384d0158361d64b8e17d357d4819))
-    - remove hardcoded test ([`910ff4a`](https://github.com/kjuulh/dagger-rs/commit/910ff4a72e10f5384287fed35f56bc7f662e7ccd))
-    - fix ([`6afe141`](https://github.com/kjuulh/dagger-rs/commit/6afe141d34308f18f9d46419931d2c9b822a7aef))
-    - formatting ([`3a7ee33`](https://github.com/kjuulh/dagger-rs/commit/3a7ee33e1ed317288b2022ea5a4ce721d59fb11e))
-    - remove dummy string ([`e7f6560`](https://github.com/kjuulh/dagger-rs/commit/e7f6560247768afbca0c350df7d4ccf3909b74fa))
-    - with input objects ([`dc53fc1`](https://github.com/kjuulh/dagger-rs/commit/dc53fc1d474b549bb1c580865a049e2fac2f5e6d))
-    - with enum ([`2a1f7c3`](https://github.com/kjuulh/dagger-rs/commit/2a1f7c3f2666f1f4caebf7c22707709741c2cfad))
-    - with codegen output ([`0bf6b0e`](https://github.com/kjuulh/dagger-rs/commit/0bf6b0e91ecc31c1f6b51338234137eb185810a0))
-    - added scalars ([`e587414`](https://github.com/kjuulh/dagger-rs/commit/e5874141b3b6256b7ac2a0bf653089fa7bcc5d14))
-    - with scalars ([`0d6e6e5`](https://github.com/kjuulh/dagger-rs/commit/0d6e6e57ae6a3b8a1f450d719c9973130af873b7))
-    - split out codegen parts ([`3263f1d`](https://github.com/kjuulh/dagger-rs/commit/3263f1d589aee78065401c666533cb0cbadd06ce))
-</details>
-

crates/dagger-codegen/Cargo.toml

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

crates/dagger-codegen/src/functions.rs

@@ -6,8 +6,8 @@ use eyre::ContextCompat;
 use crate::utility::OptionExt;
 
 pub trait FormatTypeFuncs {
-    fn format_kind_list(&self, representation: &str, input: bool, immutable: bool) -> String;
+    fn format_kind_list(&self, representation: &str) -> String;
-    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> String;
+    fn format_kind_scalar_string(&self, representation: &str) -> String;
     fn format_kind_scalar_int(&self, representation: &str) -> String;
     fn format_kind_scalar_float(&self, representation: &str) -> String;
     fn format_kind_scalar_boolean(&self, representation: &str) -> String;
@@ -36,18 +36,14 @@ impl CommonFunctions {
     }
 
     pub fn format_input_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, true, false)
+        self.format_type(t, true)
     }
 
     pub fn format_output_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, false, false)
+        self.format_type(t, false)
     }
 
-    pub fn format_immutable_input_type(&self, t: &TypeRef) -> String {
+    fn format_type(&self, t: &TypeRef, input: bool) -> String {
-        self.format_type(t, true, true)
-    }
-
-    fn format_type(&self, t: &TypeRef, input: bool, immutable: bool) -> String {
         let mut representation = String::new();
         let mut r = Some(t.clone());
         while r.is_some() {
@@ -61,14 +57,9 @@ impl CommonFunctions {
                             Scalar::Float => self
                                 .format_type_funcs
                                 .format_kind_scalar_float(&mut representation),
-                            Scalar::String => {
+                            Scalar::String => self
-                                if immutable {
+                                .format_type_funcs
-                                    "&'a str".into()
+                                .format_kind_scalar_string(&mut representation),
-                                } else {
-                                    self.format_type_funcs
-                                        .format_kind_scalar_string(&mut representation, input)
-                                }
-                            }
                             Scalar::Boolean => self
                                 .format_type_funcs
                                 .format_kind_scalar_boolean(&mut representation),
@@ -96,15 +87,12 @@ impl CommonFunctions {
                                 .as_ref()
                                 .map(|t| t.clone())
                                 .map(|t| *t)
-                                .map(|t| self.format_type(&t, input, immutable))
+                                .map(|t| self.format_type(&t, input))
                                 .context("could not get inner type of list")
                                 .unwrap();
 
-                            representation = self.format_type_funcs.format_kind_list(
+                            representation =
-                                &mut inner_type,
+                                self.format_type_funcs.format_kind_list(&mut inner_type);
-                                input,
-                                immutable,
-                            );
 
                             return representation;
                         }

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

@@ -5,17 +5,13 @@ use super::functions::format_name;
 pub struct FormatTypeFunc;
 
 impl FormatTypeFuncs for FormatTypeFunc {
-    fn format_kind_list(&self, representation: &str, _input: bool, _immutable: bool) -> String {
+    fn format_kind_list(&self, representation: &str) -> String {
         format!("Vec<{}>", representation)
     }
 
-    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> String {
+    fn format_kind_scalar_string(&self, representation: &str) -> String {
         let mut rep = representation.to_string();
-        if input {
+        rep.push_str("String");
-            rep.push_str("impl Into<String>");
-        } else {
-            rep.push_str("String");
-        }
         rep
     }
 

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

@@ -1,17 +1,15 @@
 use convert_case::{Case, Casing};
-use dagger_core::introspection::{FullTypeFields, TypeRef};
+use dagger_core::introspection::FullTypeFields;
 use genco::prelude::rust;
 use genco::quote;
 use genco::tokens::quoted;
 
 use crate::functions::{
-    type_field_has_optional, type_ref_is_list, type_ref_is_list_of_objects, type_ref_is_object,
+    type_field_has_optional, type_ref_is_list_of_objects, type_ref_is_object,
-    type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
+    type_ref_is_optional, CommonFunctions,
 };
 use crate::utility::OptionExt;
 
-use super::templates::object_tmpl::render_optional_field_args;
-
 pub fn format_name(s: &str) -> String {
     s.to_case(Case::Pascal)
 }
@@ -31,83 +29,28 @@ pub fn field_options_struct_name(field: &FullTypeFields) -> Option<String> {
 }
 
 pub fn format_function(funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
-    let is_async = field.type_.pipe(|t| &t.type_ref).pipe(|t| {
-        if type_ref_is_object(&t) || type_ref_is_list_of_objects(&t) {
-            return None;
-        } else {
-            return Some(quote! {
-                async
-            });
-        };
-    });
-
     let signature = quote! {
-        pub $(is_async) fn $(field.name.pipe(|n | format_struct_name(n)))
+        pub fn $(field.name.pipe(|n | format_struct_name(n)))
     };
-
+    let args = format_function_args(funcs, field);
-    let lifecycle = format_optional_args(funcs, field)
-        .pipe(|(_, contains_lifecycle)| contains_lifecycle)
-        .and_then(|c| {
-            if *c {
-                Some(quote! {
-                    <'a>
-                })
-            } else {
-                None
-            }
-        });
-
-    let args = format_function_args(funcs, field, lifecycle.as_ref());
 
     let output_type = field
         .type_
         .pipe(|t| &t.type_ref)
-        .pipe(|t| render_output_type(funcs, t));
+        .pipe(|t| funcs.format_output_type(t));
 
-    if let Some((args, desc, true)) = args {
+    Some(quote! {
-        let required_args = format_required_function_args(funcs, field);
+        $(signature)(
-        Some(quote! {
+            $(args)
-            $(field.description.pipe(|d| format_struct_comment(d)))
+        ) -> $(output_type) {
-            $(&desc)
+            let mut query = self.selection.select($(quoted(field.name.as_ref())));
-            $(&signature)(
-                $(required_args)
-            ) -> $(output_type.as_ref()) {
-                let mut query = self.selection.select($(quoted(field.name.as_ref())));
 
-                $(render_required_args(funcs, field))
+            $(render_required_args(funcs, field))
+            $(render_optional_args(funcs, field))
 
-                $(render_execution(funcs, field))
+            $(render_execution(funcs, field))
-            }
+        }
-
+    })
-            $(field.description.pipe(|d| format_struct_comment(d)))
-            $(&desc)
-            $(&signature)_opts$(lifecycle)(
-                $args
-            ) -> $(output_type) {
-                let mut query = self.selection.select($(quoted(field.name.as_ref())));
-
-                $(render_required_args(funcs, field))
-                $(render_optional_args(funcs, field))
-
-                $(render_execution(funcs, field))
-            }
-        })
-    } else {
-        Some(quote! {
-            $(field.description.pipe(|d| format_struct_comment(d)))
-            $(if let Some((_, desc, _)) = &args => $desc)
-            $(signature)(
-                $(if let Some((args, _, _)) = &args => $args)
-            ) -> $(output_type) {
-                let mut query = self.selection.select($(quoted(field.name.as_ref())));
-
-                $(render_required_args(funcs, field))
-                $(render_optional_args(funcs, field))
-
-                $(render_execution(funcs, field))
-            }
-        })
-    }
 }
 
 fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
@@ -123,42 +66,8 @@ fn render_required_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_scalar(&s.input_value.type_) {
-                        if let Scalar::String =
-                            Scalar::from(&*s.input_value.type_.of_type.as_ref().unwrap().clone())
-                        {
-                            return Some(quote! {
-                                query = query.arg($(quoted(name)), $(&n).into());
-                            });
-                        }
-                    }
-
-                    if type_ref_is_list(&s.input_value.type_) {
-                        let inner = *s
-                            .input_value
-                            .type_
-                            .of_type
-                            .as_ref()
-                            .unwrap()
-                            .clone()
-                            .of_type
-                            .as_ref()
-                            .unwrap()
-                            .clone();
-                        println!("type: {:?}", inner);
-                        if type_ref_is_scalar(&inner) {
-                            if let Scalar::String =
-                                Scalar::from(&*inner.of_type.as_ref().unwrap().clone())
-                            {
-                                return Some(quote! {
-                                    query = query.arg($(quoted(name)), $(&n).into_iter().map(|i| i.into()).collect::<Vec<String>>());
-                                });
-                            }
-                        }
-                    }
-
                     Some(quote! {
-                        query = query.arg($(quoted(name)), $(n));
+                        query = query.arg($(quoted(name)), $(n)).unwrap();
                     })
                 })
             })
@@ -189,7 +98,7 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
 
                     Some(quote! {
                         if let Some($(&n)) = opts.$(&n) {
-                            query = query.arg($(quoted(name)), $(&n));
+                            query = query.arg($(quoted(name)), $(&n)).unwrap();
                         }
                     })
                 })
@@ -202,7 +111,9 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
         }
 
         let required_args = quote! {
-            $(for arg in args join ($['\r']) => $arg)
+            if let Some(opts) = opts {
+                $(for arg in args join ($['\r']) => $arg)
+            }
         };
 
         Some(required_args)
@@ -211,20 +122,6 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
     }
 }
 
-fn render_output_type(funcs: &CommonFunctions, type_ref: &TypeRef) -> rust::Tokens {
-    let output_type = funcs.format_output_type(type_ref);
-
-    if type_ref_is_object(type_ref) || type_ref_is_list_of_objects(type_ref) {
-        return quote! {
-            $(output_type)
-        };
-    }
-
-    quote! {
-        eyre::Result<$output_type>
-    }
-}
-
 fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::Tokens {
     if let Some(true) = field.type_.pipe(|t| type_ref_is_object(&t.type_ref)) {
         let output_type = funcs.format_output_type(&field.type_.as_ref().unwrap().type_ref);
@@ -266,16 +163,11 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
     let graphql_client = rust::import("crate::client", "graphql_client");
 
     quote! {
-        query.execute(&$graphql_client(&self.conn)).await
+        query.execute(&$graphql_client(&self.conn)).unwrap().unwrap()
     }
 }
 
-fn format_function_args(
+fn format_function_args(funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
-    funcs: &CommonFunctions,
-    field: &FullTypeFields,
-    lifecycle: Option<&rust::Tokens>,
-) -> Option<(rust::Tokens, rust::Tokens, bool)> {
-    let mut argument_description = Vec::new();
     if let Some(args) = field.args.as_ref() {
         let args = args
             .into_iter()
@@ -288,18 +180,6 @@ fn format_function_args(
                     let t = funcs.format_input_type(&s.input_value.type_);
                     let n = format_struct_name(&s.input_value.name);
 
-                    if let Some(desc) = s.input_value.description.as_ref().and_then(|d| {
-                        if d != "" {
-                            Some(write_comment_line(&format!("* `{n}` - {}", d)))
-                        } else {
-                            None
-                        }
-                    }) {
-                        argument_description.push(quote! {
-                            $(desc)
-                        });
-                    }
-
                     Some(quote! {
                         $(n): $(t),
                     })
@@ -313,119 +193,14 @@ fn format_function_args(
         };
 
         if type_field_has_optional(field) {
-            let field_name = field_options_struct_name(field);
+            Some(quote! {
-            argument_description.push(quote! {
+                $(required_args)
-                $(field_name.pipe(|_| write_comment_line(&format!("* `opt` - optional argument, see inner type for documentation, use <func>_opts to use"))))
+                opts: Option<$(field_options_struct_name(field))>
-            });
+            })
-
-            let description = quote! {
-                $(if argument_description.len() > 0 => $(format!("/// ")))
-                $(if argument_description.len() > 0 => $(format!("/// # Arguments")))
-                $(if argument_description.len() > 0 => $(format!("/// ")))
-                $(for arg_desc in argument_description join ($['\r']) => $arg_desc)
-            };
-
-            Some((
-                quote! {
-                    $(required_args)
-                    opts: $(field_name)$(lifecycle)
-                },
-                description,
-                true,
-            ))
         } else {
-            let description = quote! {
+            Some(required_args)
-                $(if argument_description.len() > 0 => $(format!("/// ")))
-                $(if argument_description.len() > 0 => $(format!("/// # Arguments")))
-                $(if argument_description.len() > 0 => $(format!("/// ")))
-                $(for arg_desc in argument_description join ($['\r']) => $arg_desc)
-            };
-            Some((required_args, description, false))
         }
     } else {
         None
     }
 }
-
-fn format_required_function_args(
-    funcs: &CommonFunctions,
-    field: &FullTypeFields,
-) -> Option<rust::Tokens> {
-    if let Some(args) = field.args.as_ref() {
-        let args = args
-            .into_iter()
-            .map(|a| {
-                a.as_ref().and_then(|s| {
-                    if type_ref_is_optional(&s.input_value.type_) {
-                        return None;
-                    }
-
-                    let t = funcs.format_input_type(&s.input_value.type_);
-                    let n = format_struct_name(&s.input_value.name);
-
-                    Some(quote! {
-                        $(n): $(t),
-                    })
-                })
-            })
-            .flatten()
-            .collect::<Vec<_>>();
-        let required_args = quote! {
-            &self,
-            $(for arg in args join ($['\r']) => $arg)
-        };
-
-        Some(required_args)
-    } else {
-        None
-    }
-}
-
-pub fn format_optional_args(
-    funcs: &CommonFunctions,
-    field: &FullTypeFields,
-) -> Option<(rust::Tokens, bool)> {
-    field
-        .args
-        .pipe(|t| t.into_iter().flatten().collect::<Vec<_>>())
-        .map(|t| {
-            t.into_iter()
-                .filter(|t| type_ref_is_optional(&t.input_value.type_))
-                .collect::<Vec<_>>()
-        })
-        .pipe(|t| render_optional_field_args(funcs, t))
-        .flatten()
-}
-
-pub fn write_comment_line(content: &str) -> Option<rust::Tokens> {
-    let cnt = content.trim();
-    if cnt == "" {
-        return None;
-    }
-
-    let mut tokens = rust::Tokens::new();
-
-    for line in content.split('\n') {
-        tokens.append(format!("/// {}", line.trim()));
-        tokens.push();
-    }
-
-    Some(tokens)
-}
-
-pub fn format_struct_comment(desc: &str) -> Option<rust::Tokens> {
-    let lines = desc.trim().split("\n");
-
-    let formatted_lines = lines
-        .into_iter()
-        .map(write_comment_line)
-        .collect::<Vec<_>>();
-
-    if formatted_lines.len() > 0 {
-        Some(quote! {
-            $(for line in formatted_lines join($['\r']) => $line)
-        })
-    } else {
-        None
-    }
-}

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

@@ -10,7 +10,7 @@ fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
         .map(|values| {
             values
                 .into_iter()
-                .map(|val| quote! { $(val.name.as_ref()), })
+                .map(|val| quote! { $(val.name.as_ref()) })
         })
         .flatten()
         .collect::<Vec<_>>();
@@ -25,10 +25,7 @@ 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");
-
     Ok(quote! {
-        #[derive($serialize, Clone, PartialEq, Debug)]
         pub enum $(t.name.as_ref()) {
             $(render_enum_values(t))
         }

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

@@ -9,7 +9,7 @@ pub fn render_input(funcs: &CommonFunctions, t: &FullType) -> eyre::Result<rust:
     let deserialize = rust::import("serde", "Deserialize");
     let serialize = rust::import("serde", "Serialize");
     Ok(quote! {
-        #[derive($serialize, $deserialize, Debug, PartialEq, Clone)]
+        #[derive($serialize, $deserialize)]
         pub struct $(format_name(t.name.as_ref().unwrap())) {
             $(render_input_fields(funcs, t.input_fields.as_ref().unwrap_or(&Vec::new())  ))
         }
@@ -33,6 +33,6 @@ pub fn render_input_fields(
 
 pub fn render_input_field(funcs: &CommonFunctions, field: &FullTypeInputFields) -> rust::Tokens {
     quote! {
-        pub $(format_struct_name(&field.input_value.name)): $(funcs.format_output_type(&field.input_value.type_)),
+        pub $(format_struct_name(&field.input_value.name)): $(funcs.format_input_type(&field.input_value.type_)),
     }
 }

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

@@ -2,21 +2,19 @@ use dagger_core::introspection::{FullType, FullTypeFields, FullTypeFieldsArgs};
 use genco::prelude::rust;
 use genco::quote;
 
-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,
+    field_options_struct_name, format_function, format_name, format_struct_name,
-    format_struct_comment, format_struct_name,
 };
 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,
@@ -52,17 +50,20 @@ fn render_optional_args(
 
 fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
     let output_type = field_options_struct_name(field);
-    let fields = format_optional_args(funcs, field);
+    let fields = field
+        .args
+        .pipe(|t| t.into_iter().flatten().collect::<Vec<_>>())
+        .map(|t| {
+            t.into_iter()
+                .filter(|t| type_ref_is_optional(&t.input_value.type_))
+                .collect::<Vec<_>>()
+        })
+        .pipe(|t| render_optional_field_args(funcs, t))
+        .flatten();
 
-    let builder = rust::import("derive_builder", "Builder");
+    if let Some(fields) = fields {
-    let _phantom_data = rust::import("std::marker", "PhantomData");
-
-    if let Some((fields, contains_lifetime)) = fields {
         Some(quote! {
-            #[derive($builder, Debug, PartialEq)]
+            pub struct $output_type {
-            pub struct $output_type$(if contains_lifetime => <'a>) {
-                //#[builder(default, setter(skip))]
-                //pub marker: $(phantom_data)<&'a ()>,
                 $fields
             }
         })
@@ -71,32 +72,22 @@ fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
     }
 }
 
-pub fn render_optional_field_args(
+fn render_optional_field_args(
     funcs: &CommonFunctions,
     args: &Vec<&FullTypeFieldsArgs>,
-) -> Option<(rust::Tokens, bool)> {
+) -> Option<rust::Tokens> {
     if args.len() == 0 {
         return None;
     }
-    let mut contains_lifetime = false;
     let rendered_args = args.into_iter().map(|a| &a.input_value).map(|a| {
-        let type_ = funcs.format_immutable_input_type(&a.type_);
-        if type_.contains("str") {
-            contains_lifetime = true;
-        }
         quote! {
-            $(a.description.pipe(|d| format_struct_comment(d)))
+            pub $(format_struct_name(&a.name)): Option<$(funcs.format_output_type(&a.type_))>,
-            #[builder(setter(into, strip_option))]
-            pub $(format_struct_name(&a.name)): Option<$(type_)>,
         }
     });
 
-    Some((
+    Some(quote! {
-        quote! {
+        $(for arg in rendered_args join ($['\r']) => $arg)
-            $(for arg in rendered_args join ($['\r']) => $arg)
+    })
-        },
-        contains_lifetime,
-    ))
 }
 
 fn render_functions(funcs: &CommonFunctions, fields: &Vec<FullTypeFields>) -> Option<rust::Tokens> {

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

@@ -10,7 +10,7 @@ pub fn render_scalar(t: &FullType) -> eyre::Result<rust::Tokens> {
     let serialize = rust::import("serde", "Serialize");
 
     Ok(quote! {
-        #[derive($serialize, $deserialize, PartialEq, Debug, Clone)]
+        #[derive($serialize, $deserialize)]
         pub struct $(t.name.pipe(|n|format_name(n)))(String);
     })
 }

crates/dagger-core/CHANGELOG.md

@@ -1,181 +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.2.6 (2023-02-20)
-
-### Chore
-
- - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
-
-### Bug Fixes
-
- - <csr-id-8dfecf976c5537cc2c03881de2b2fd2b2508683a/> cli session keep session alive
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - ran clippy ([`1f77d90`](https://github.com/kjuulh/dagger-rs/commit/1f77d90c0f0ac832a181b2322350ea395612986c))
-    - cli session keep session alive ([`8dfecf9`](https://github.com/kjuulh/dagger-rs/commit/8dfecf976c5537cc2c03881de2b2fd2b2508683a))
-</details>
-
-## v0.2.5 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.5, dagger-sdk v0.2.12, dagger-codegen v0.2.7 ([`1725c51`](https://github.com/kjuulh/dagger-rs/commit/1725c5188e8a81069ec4a4de569484c921a94927))
-    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-rs/commit/a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de))
-</details>
-
-## v0.2.4 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-8385aa8a15ff7b45fecc3462c482b998118c14eb/> remove blocking
- - <csr-id-921e61b5e248013cb5fbf4f1bad3eef5a2673145/> remove blocking
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 4 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`f869e57`](https://github.com/kjuulh/dagger-rs/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
-    - remove blocking ([`921e61b`](https://github.com/kjuulh/dagger-rs/commit/921e61b5e248013cb5fbf4f1bad3eef5a2673145))
-    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-rs/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
-    - remove blocking ([`8385aa8`](https://github.com/kjuulh/dagger-rs/commit/8385aa8a15ff7b45fecc3462c482b998118c14eb))
-</details>
-
-## v0.2.3 (2023-02-20)
-
-### Bug Fixes
-
- - <csr-id-75bc17e57db222492c6ffd2dfe80208d2bda75c9/> Fix async panic on blocking #19
-   Replaced internal threads with tokio spawn functions
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-core v0.2.3, dagger-sdk v0.2.9, dagger-rs v0.2.10 ([`82de43a`](https://github.com/kjuulh/dagger-rs/commit/82de43aa91d6a5e09a247d1959137fdc36a40d35))
-    - Fix async panic on blocking #19 ([`75bc17e`](https://github.com/kjuulh/dagger-rs/commit/75bc17e57db222492c6ffd2dfe80208d2bda75c9))
-</details>
-
-## v0.2.2 (2023-02-19)
-
-### New Features
-
- - <csr-id-6e5f4074329ab0462445b31d4153f8497c483438/> update to dagger v0.3.12
-
-### 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.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>
-
-## v0.2.1 (2023-02-18)
-
-### Bug Fixes
-
- - <csr-id-789b0e69c8c53d0e86d9cec89ab5345507aad514/> update all dependencies
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 16 commits contributed to the release over the course of 19 calendar days.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 2 unique issues were worked on: [#5](https://github.com/kjuulh/dagger-rs/issues/5), [#6](https://github.com/kjuulh/dagger-rs/issues/6)
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **[#5](https://github.com/kjuulh/dagger-rs/issues/5)**
-    - update all dependencies ([`789b0e6`](https://github.com/kjuulh/dagger-rs/commit/789b0e69c8c53d0e86d9cec89ab5345507aad514))
- * **[#6](https://github.com/kjuulh/dagger-rs/issues/6)**
-    - feature/add impl ([`4a4c03f`](https://github.com/kjuulh/dagger-rs/commit/4a4c03f3c2ee7f6268c65976715e70767b4ea78d))
- * **Uncategorized**
-    - Release dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1 ([`1332bc8`](https://github.com/kjuulh/dagger-rs/commit/1332bc842ce2ea0254c651419813b63b36ca590c))
-    - add changelogs ([`a064684`](https://github.com/kjuulh/dagger-rs/commit/a064684fcf80196188a57d9ff9067c0b5769fb09))
-    - Adjusting changelogs prior to release of dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1 ([`f4a20fd`](https://github.com/kjuulh/dagger-rs/commit/f4a20fda79063b29829cc899793775ba8cb17214))
-    - with publish ([`989d5bc`](https://github.com/kjuulh/dagger-rs/commit/989d5bc26036d46a199d939b5cbbe72aff2f8fb1))
-    - with repo ([`e5383b5`](https://github.com/kjuulh/dagger-rs/commit/e5383b51f3b290a87b729929c377e93bda3873e0))
-    - with readme and license ([`1e26b38`](https://github.com/kjuulh/dagger-rs/commit/1e26b383d4f6dbcbe20f5f7c19c749e743f6e607))
-    - bump version ([`36b0ecd`](https://github.com/kjuulh/dagger-rs/commit/36b0ecdabf4c220cffb2d0660fb6480387e3249a))
-    - with println ([`d1726a0`](https://github.com/kjuulh/dagger-rs/commit/d1726a052a6dc4e57f364864446cab3cbda7e0bf))
-    - context and querier done ([`52a0db3`](https://github.com/kjuulh/dagger-rs/commit/52a0db3e311f9f88447882f1406701d4cd612b1c))
-    - tested full flow initially ([`7a008be`](https://github.com/kjuulh/dagger-rs/commit/7a008be59e5ca183809e5840cdfae1d87665aa20))
-    - move code to dagger-core ([`ec0d0b2`](https://github.com/kjuulh/dagger-rs/commit/ec0d0b22e646c97acb3ce93f3afb3ddb8590e68f))
-    - add fields ([`496a687`](https://github.com/kjuulh/dagger-rs/commit/496a687bc34f7c58cc86df60c183be741b0b8a9c))
-    - with objects ([`5fef514`](https://github.com/kjuulh/dagger-rs/commit/5fef5148010f384d0158361d64b8e17d357d4819))
-    - with enum ([`2a1f7c3`](https://github.com/kjuulh/dagger-rs/commit/2a1f7c3f2666f1f4caebf7c22707709741c2cfad))
-</details>
-

crates/dagger-core/Cargo.toml

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

crates/dagger-core/src/cli_session.rs

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

crates/dagger-core/src/downloader.rs

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

crates/dagger-core/src/engine.rs

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

crates/dagger-core/src/schema.rs

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

crates/dagger-core/src/session.rs

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

crates/dagger-sdk/CHANGELOG.md

@@ -1,497 +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.2.13 (2023-02-22)
-
-### 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/>
-
- - 6 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**
-    - 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)
-
-### Documentation
-
- - <csr-id-93f40b356c48f14e910968516bed9487912095c1/> change to await syntax
-
-### New Features
-
- - <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.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>
-
-## v0.2.6 (2023-02-19)
-
-### Documentation
-
- - <csr-id-04e70ce964b343e28b3dbd0c46d10ccda958ab8c/> fix readme
-
-### 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.6 ([`c312bc5`](https://github.com/kjuulh/dagger-rs/commit/c312bc57ad3e5380b6a2a927f3bb758aa5344efd))
-    - fix readme ([`04e70ce`](https://github.com/kjuulh/dagger-rs/commit/04e70ce964b343e28b3dbd0c46d10ccda958ab8c))
-</details>
-
-## v0.2.5 (2023-02-19)
-
-### New Features
-
- - <csr-id-f29ff836cfd72d5e051ca6a71a230ba1e9933091/> without Some in _opts
-   functions Option has been removed as a wrapper around opts. This makes it much
-   more convenient to use
-   
-   ```rust
-   client.container_opts(Some(ContainerOpts{}))
-   // ->
-   client.container_opts(ContainerOpts{})
-   ```
-   
-   The same options are still available, either an empty object can be passed, or
-   a non _opts function can be used
- - <csr-id-9762da895a164e30c5dc60e89a83e934ceae47ab/> with _opts methods Now all
-   opt values enter into a _opts function instead of the original. This avoids a
-   lot of verbosity for both None in the case opts are unwanted, and Some() if
-   they actually are.
-   
-   They are used like so:
-   
-   ```rust
-   client.container().from("...");
-   client.container_opts(Some(ContainerOpts{ ... }))
-   ```
-   
-   Some from opts will be removed in a future commit/pr
- - <csr-id-94336d06378f035464e233b921dc3858070f582d/> move to &str instead of
-   String and introduce builder. This will make the api much easier to use, as we
-   can now rely on "" instead of "".into() for normal string values.
-   
-   Introduced builder as well, which makes it much easier to use *Opts, as it can
-   handle the building of that, and get the benefits from String -> &str, as that
-   is currently not allowed for optional values
-
-### Bug Fixes
-
- - <csr-id-c627595fd2695e236924175d137c42f1480ccd6b/> cargo clippy
- - <csr-id-02006d40fc2c0383e0412c15c36db9af7eda991f/> without phantom data
- - <csr-id-6e2292cf11942fbd26a52fe4e0fc8471e6eb70a3/> dependencies
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 7 commits contributed to the release.
- - 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-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))
-    - without phantom data ([`02006d4`](https://github.com/kjuulh/dagger-rs/commit/02006d40fc2c0383e0412c15c36db9af7eda991f))
-    - move to &str instead of String and introduce builder. ([`94336d0`](https://github.com/kjuulh/dagger-rs/commit/94336d06378f035464e233b921dc3858070f582d))
-    - dependencies ([`6e2292c`](https://github.com/kjuulh/dagger-rs/commit/6e2292cf11942fbd26a52fe4e0fc8471e6eb70a3))
-</details>
-
-## v0.2.4 (2023-02-19)
-
-### Bug Fixes
-
- - <csr-id-7d04ab1240e497e7804fed23a378d28c78f50a0a/> readme dagger-rs ->
-   dagger-sdk
-
-### 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.4 ([`cc81124`](https://github.com/kjuulh/dagger-rs/commit/cc81124f899f44f80c1ee7d1e23a7e02d8cc4b7c))
-    - readme dagger-rs -> dagger-sdk ([`7d04ab1`](https://github.com/kjuulh/dagger-rs/commit/7d04ab1240e497e7804fed23a378d28c78f50a0a))
-</details>
-
-## v0.2.3 (2023-02-19)
-
-### New Features
-
- - <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
-   of unwrap
- - <csr-id-5d667369900a47d3a6015cd3814c240bc5c54436/> remove unnecessary option
-   returns
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 4 commits contributed to the release.
- - 3 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.3, dagger-codegen v0.2.3, dagger-rs v0.2.9 ([`9235030`](https://github.com/kjuulh/dagger-rs/commit/92350306b3f0da40b4fc6dcaffcd90b891e83f70))
-    - re-export through lib.rs ([`19ed6c2`](https://github.com/kjuulh/dagger-rs/commit/19ed6c267f779b72430422c463ceed553f6fc618))
-    - with return result instead of unwrap ([`de063ea`](https://github.com/kjuulh/dagger-rs/commit/de063eae858eb3335d2558a57ee6a88689635200))
-    - remove unnecessary option returns ([`5d66736`](https://github.com/kjuulh/dagger-rs/commit/5d667369900a47d3a6015cd3814c240bc5c54436))
-</details>
-
-## v0.2.2 (2023-02-19)
-
-### New Features
-
- - <csr-id-6e5f4074329ab0462445b31d4153f8497c483438/> update to dagger v0.3.12
-
-### Bug Fixes
-
- - <csr-id-10bc6f3846b65cc82c2fb343d8cfe921784bef1b/> fixed fmt errors
-
-### 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-sdk v0.2.2 ([`e921ba1`](https://github.com/kjuulh/dagger-rs/commit/e921ba13638987ccf5beaa48c4be9be5fd879bd0))
-    - 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))
-    - fixed fmt errors ([`10bc6f3`](https://github.com/kjuulh/dagger-rs/commit/10bc6f3846b65cc82c2fb343d8cfe921784bef1b))
-    - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-rs/commit/6e5f4074329ab0462445b31d4153f8497c483438))
-</details>
-
-## v0.2.1 (2023-02-18)
-
-### Bug Fixes
-
- - <csr-id-789b0e69c8c53d0e86d9cec89ab5345507aad514/> update all dependencies
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 40 commits contributed to the release over the course of 20 calendar days.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 2 unique issues were worked on: [#5](https://github.com/kjuulh/dagger-rs/issues/5), [#6](https://github.com/kjuulh/dagger-rs/issues/6)
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **[#5](https://github.com/kjuulh/dagger-rs/issues/5)**
-    - update all dependencies ([`789b0e6`](https://github.com/kjuulh/dagger-rs/commit/789b0e69c8c53d0e86d9cec89ab5345507aad514))
- * **[#6](https://github.com/kjuulh/dagger-rs/issues/6)**
-    - feature/add impl ([`4a4c03f`](https://github.com/kjuulh/dagger-rs/commit/4a4c03f3c2ee7f6268c65976715e70767b4ea78d))
- * **Uncategorized**
-    - Release dagger-sdk v0.2.1 ([`aa0c397`](https://github.com/kjuulh/dagger-rs/commit/aa0c397b15566840eb59ca6186c083f631cc460b))
-    - add dagger-sdk changelog ([`11a5247`](https://github.com/kjuulh/dagger-rs/commit/11a5247933736bc6a4c5300c29599c88597fefb7))
-    - Release dagger-rs v0.2.7, dagger-sdk v0.2.1 ([`20c7118`](https://github.com/kjuulh/dagger-rs/commit/20c71189f6d5d978286ee16f8e958c6045756d80))
-    - Adjusting changelogs prior to release of dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1 ([`f4a20fd`](https://github.com/kjuulh/dagger-rs/commit/f4a20fda79063b29829cc899793775ba8cb17214))
-    - with actual versions ([`7153c24`](https://github.com/kjuulh/dagger-rs/commit/7153c24f0105a05f170efd10ef2535d83ce0c87e))
-    - with publish ([`989d5bc`](https://github.com/kjuulh/dagger-rs/commit/989d5bc26036d46a199d939b5cbbe72aff2f8fb1))
-    - with repo ([`e5383b5`](https://github.com/kjuulh/dagger-rs/commit/e5383b51f3b290a87b729929c377e93bda3873e0))
-    - with wildcard version ([`533b9df`](https://github.com/kjuulh/dagger-rs/commit/533b9dfef0165c514127a8437d08daf52adf5739))
-    - cargo version 0.2.0 ([`bec62de`](https://github.com/kjuulh/dagger-rs/commit/bec62de62ff5638428174e232a36eee3ddd0f5ef))
-    - bump version ([`36b0ecd`](https://github.com/kjuulh/dagger-rs/commit/36b0ecdabf4c220cffb2d0660fb6480387e3249a))
-    - document usage ([`578c2a6`](https://github.com/kjuulh/dagger-rs/commit/578c2a68830eb40da888823a8770af4a764ed4c7))
-    - fix all clippy ([`6be8482`](https://github.com/kjuulh/dagger-rs/commit/6be8482b461e098384bbf1371ed7d67b259197fa))
-    - add with dockerfile ([`0cbd179`](https://github.com/kjuulh/dagger-rs/commit/0cbd1790b0b4030c68f0a0dd619325da26f14f60))
-    - with caching ([`728840c`](https://github.com/kjuulh/dagger-rs/commit/728840ca8e48b8bec66da4e5fa677bfa60d1d147))
-    - add more quickstart ([`59e2572`](https://github.com/kjuulh/dagger-rs/commit/59e2572173872c8091a0613a387a01e0cccc51bf))
-    - build the application ([`d894def`](https://github.com/kjuulh/dagger-rs/commit/d894def70c85ff2fc567bf614e3be6f4134965e2))
-    - add test-the-application ([`cb9a4dd`](https://github.com/kjuulh/dagger-rs/commit/cb9a4dd84fc13ef03ca3ad539646e95c3c047676))
-    - with println ([`d1726a0`](https://github.com/kjuulh/dagger-rs/commit/d1726a052a6dc4e57f364864446cab3cbda7e0bf))
-    - unpack response ([`3b5b59b`](https://github.com/kjuulh/dagger-rs/commit/3b5b59ba1c20cc68218dc5c0af18ff7a78f6953d))
-    - tested full flow initially ([`7a008be`](https://github.com/kjuulh/dagger-rs/commit/7a008be59e5ca183809e5840cdfae1d87665aa20))
-    - move code to dagger-core ([`ec0d0b2`](https://github.com/kjuulh/dagger-rs/commit/ec0d0b22e646c97acb3ce93f3afb3ddb8590e68f))
-    - with selection impl default ([`9f0021b`](https://github.com/kjuulh/dagger-rs/commit/9f0021b7086046c80b3f455f205149e03eb72da2))
-    - fix warnings ([`2b49f9c`](https://github.com/kjuulh/dagger-rs/commit/2b49f9c19098d96df2bb735253710774b0831c94))
-    - fix test ([`03366b7`](https://github.com/kjuulh/dagger-rs/commit/03366b7c5b3cce5ec42b5c7655843170236c56a1))
-    - test marshaller ([`c5dfceb`](https://github.com/kjuulh/dagger-rs/commit/c5dfcebaad9c255b10ba8c6e4d4dba00821c8941))
-    - test marshaller ([`c4ec6f0`](https://github.com/kjuulh/dagger-rs/commit/c4ec6f0c976ce0af2e05e818731b5e2bed7f0522))
-    - implement sort by name and type ([`d9b51c1`](https://github.com/kjuulh/dagger-rs/commit/d9b51c1ac90c00fb3af24332b6140e1201bc9be7))
-    - fix optional types for real ([`26069a8`](https://github.com/kjuulh/dagger-rs/commit/26069a82a69ec7265216c8ddaceb37228dd0fb81))
-    - fix description ([`f4581ba`](https://github.com/kjuulh/dagger-rs/commit/f4581ba4cd1693a906eaf6c58054398ceae3bfac))
-    - with proper optional types ([`f4a812a`](https://github.com/kjuulh/dagger-rs/commit/f4a812a7d24e9e09cb4e3cbde56ee0b3ac774b62))
-    - set proper option type ([`8549cfc`](https://github.com/kjuulh/dagger-rs/commit/8549cfc3a7d9f831febaeadc22db36604e465ea8))
-    - add fields ([`496a687`](https://github.com/kjuulh/dagger-rs/commit/496a687bc34f7c58cc86df60c183be741b0b8a9c))
-    - add input_fields ([`d2cddff`](https://github.com/kjuulh/dagger-rs/commit/d2cddff365c636feceb3f20a73df812fcab11a19))
-    - with objects ([`5fef514`](https://github.com/kjuulh/dagger-rs/commit/5fef5148010f384d0158361d64b8e17d357d4819))
-    - with enum ([`2a1f7c3`](https://github.com/kjuulh/dagger-rs/commit/2a1f7c3f2666f1f4caebf7c22707709741c2cfad))
-    - with codegen output ([`0bf6b0e`](https://github.com/kjuulh/dagger-rs/commit/0bf6b0e91ecc31c1f6b51338234137eb185810a0))
-    - split out codegen parts ([`3263f1d`](https://github.com/kjuulh/dagger-rs/commit/3263f1d589aee78065401c666533cb0cbadd06ce))
-    - add dagger-sdk ([`9dccb83`](https://github.com/kjuulh/dagger-rs/commit/9dccb83d94a720dd58deffe9f3e5aaea784336f3))
-</details>
-

crates/dagger-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.13"
+version = "0.2.0"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -11,18 +11,17 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dagger-core = { path = "../dagger-core", version = "^0.2.6" }
-
 base64 = "0.21.0"
+dagger-core = { path = "../dagger-core", version = "^0.2.1" }
 eyre = "0.6.8"
 futures = "0.3.26"
+
+genco = "0.17.3"
 gql_client = "1.0.7"
+pretty_assertions = "1.3.0"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 tokio = { version = "1.25.0", features = ["full"] }
-derive_builder = "0.12.0"
 
 [dev-dependencies]
-pretty_assertions = "1.3.0"
 rand = "0.8.5"
-genco = "0.17.3"

crates/dagger-sdk/README.md

@@ -1,4 +1,4 @@
-# dagger-sdk
+# dagger-rs
 
 A dagger sdk written in rust for rust.
 
@@ -19,21 +19,20 @@ The examples match the folder name in each directory in examples
 Simply install like:
 
 ```bash
-cargo add dagger-sdk
+cargo install dagger-sdk
 ```
 
 ### Usage
 
 ```rust
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
+    let client = dagger_sdk::client::connect()?;
-    let client = dagger_sdk::connect()?;
 
     let version = client
-        .container()
+        .container(None)
-        .from("golang:1.19")
+        .from("golang:1.19".into())
-        .with_exec(vec!["go", "version"])
+        .with_exec(vec!["go".into(), "version".into()], None)
-        .stdout().await?;
+        .stdout();
 
     println!("Hello from Dagger and {}", version.trim());
 
@@ -46,9 +45,3 @@ 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

@@ -1,35 +1,42 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
+    let client = dagger_sdk::client::connect()?;
-    let client = dagger_sdk::connect().await?;
 
-    let host_source_dir = client.host().directory_opts(
+    let host_source_dir = client.host().directory(
-        "examples/build-the-application/app",
+        "examples/build-the-application/app".into(),
-        HostDirectoryOpts {
+        Some(HostDirectoryOpts {
             exclude: Some(vec!["node_modules".into(), "ci/".into()]),
             include: None,
-        },
+        }),
     );
 
     let source = client
-        .container()
+        .container(None)
-        .from("node:16")
+        .from("node:16".into())
-        .with_mounted_directory("/src", host_source_dir.id().await?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
-        .with_workdir("/src")
+        .with_workdir("/src".into())
-        .with_exec(vec!["npm", "install"]);
+        .with_exec(vec!["npm".into(), "install".into()], None);
 
-    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
+    let test = runner.with_exec(
+        vec![
+            "npm".into(),
+            "test".into(),
+            "--".into(),
+            "--watchAll=false".into(),
+        ],
+        None,
+    );
 
     let build_dir = test
-        .with_exec(vec!["npm", "run", "build"])
+        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
-        .directory("./build");
+        .directory("./build".into());
 
-    let _ = build_dir.export("./build");
+    let _ = build_dir.export("./build".into());
 
-    let entries = build_dir.entries().await;
+    let entries = build_dir.entries(None);
 
     println!("build dir contents: \n {:?}", entries);
 

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

@@ -1,41 +1,53 @@
+use dagger_sdk::gen::HostDirectoryOpts;
 use rand::Rng;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
+    let client = dagger_sdk::client::connect()?;
-    let client = dagger_sdk::connect().await?;
 
-    let host_source_dir = client.host().directory_opts(
+    let host_source_dir = client.host().directory(
-        "./examples/caching/app",
+        "./examples/caching/app".into(),
-        dagger_sdk::HostDirectoryOptsBuilder::default()
+        Some(HostDirectoryOpts {
-            .exclude(vec!["node_modules", "ci/"])
+            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
-            .build()?,
+            include: None,
+        }),
     );
 
-    let node_cache = client.cache_volume("node").id().await?;
+    let node_cache = client.cache_volume("node".into()).id();
 
     let source = client
-        .container()
+        .container(None)
-        .from("node:16")
+        .from("node:16".into())
-        .with_mounted_directory("/src", host_source_dir.id().await?)
+        .with_mounted_directory("/src".into(), host_source_dir.id())
-        .with_mounted_cache("/src/node_modules", node_cache);
+        .with_mounted_cache("/src/node_modules".into(), node_cache, None);
 
     let runner = source
-        .with_workdir("/src")
+        .with_workdir("/src".into())
-        .with_exec(vec!["npm", "install"]);
+        .with_exec(vec!["npm".into(), "install".into()], None);
 
-    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
+    let test = runner.with_exec(
+        vec![
+            "npm".into(),
+            "test".into(),
+            "--".into(),
+            "--watchAll=false".into(),
+        ],
+        None,
+    );
 
     let build_dir = test
-        .with_exec(vec!["npm", "run", "build"])
+        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
-        .directory("./build");
+        .directory("./build".into());
 
     let mut rng = rand::thread_rng();
 
     let ref_ = client
-        .container()
+        .container(None)
-        .from("nginx")
+        .from("nginx".into())
-        .with_directory("/usr/share/nginx/html", build_dir.id().await?)
+        .with_directory("/usr/share/nginx/html".into(), build_dir.id(), None)
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>())).await?;
+        .publish(
+            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
+            None,
+        );
 
     println!("published image to: {}", ref_);
 

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

@@ -1,19 +1,22 @@
+
 use rand::Rng;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
     let mut rng = rand::thread_rng();
 
-    let client = dagger_sdk::connect().await?;
+    let client = dagger_sdk::client::connect()?;
 
     let context_dir = client
         .host()
-        .directory("./examples/existing-dockerfile/app");
+        .directory("./examples/existing-dockerfile/app".into(), None);
 
     let ref_ = client
-        .container()
+        .container(None)
-        .build(context_dir.id().await?)
+        .build(context_dir.id(), None)
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>())).await?;
+        .publish(
+            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
+            None,
+        );
 
     println!("published image to: {}", ref_);
 

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

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

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

@@ -1,41 +1,50 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 use rand::Rng;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
+    let client = dagger_sdk::client::connect()?;
-    let client = dagger_sdk::connect().await?;
 
-    let host_source_dir = client.host().directory_opts(
+    let host_source_dir = client.host().directory(
-        "examples/publish-the-application/app",
+        "examples/publish-the-application/app".into(),
-        HostDirectoryOpts {
+        Some(HostDirectoryOpts {
-            exclude: Some(vec!["node_modules", "ci/"]),
+            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
             include: None,
-        },
+        }),
     );
 
     let source = client
-        .container()
+        .container(None)
-        .from("node:16")
+        .from("node:16".into())
-        .with_mounted_directory("/src", host_source_dir.id().await?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
-        .with_workdir("/src")
+        .with_workdir("/src".into())
-        .with_exec(vec!["npm", "install"]);
+        .with_exec(vec!["npm".into(), "install".into()], None);
 
-    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
+    let test = runner.with_exec(
+        vec![
+            "npm".into(),
+            "test".into(),
+            "--".into(),
+            "--watchAll=false".into(),
+        ],
+        None,
+    );
 
     let build_dir = test
-        .with_exec(vec!["npm", "run", "build"])
+        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
-        .directory("./build");
+        .directory("./build".into());
 
     let mut rng = rand::thread_rng();
 
     let ref_ = client
-        .container()
+        .container(None)
-        .from("nginx")
+        .from("nginx".into())
-        .with_directory("/usr/share/nginx/html", build_dir.id().await?)
+        .with_directory("/usr/share/nginx/html".into(), build_dir.id(), None)
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))
+        .publish(
-        .await?;
+            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
+            None,
+        );
 
     println!("published image to: {}", ref_);
 

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

@@ -1,45 +1,56 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 use rand::Rng;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
+    let client = dagger_sdk::client::connect()?;
-    let client = dagger_sdk::connect().await?;
     let output = "examples/publish-the-application/app/build";
 
-    let host_source_dir = client.host().directory_opts(
+    let host_source_dir = client.host().directory(
-        "examples/publish-the-application/app",
+        "examples/publish-the-application/app".into(),
-        HostDirectoryOpts {
+        Some(HostDirectoryOpts {
-            exclude: Some(vec!["node_modules", "ci/"]),
+            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
             include: None,
-        },
+        }),
     );
 
     let source = client
-        .container()
+        .container(None)
-        .from("node:16")
+        .from("node:16".into())
-        .with_mounted_directory("/src", host_source_dir.id().await?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
-        .with_workdir("/src")
+        .with_workdir("/src".into())
-        .with_exec(vec!["npm", "install"]);
+        .with_exec(vec!["npm".into(), "install".into()], None);
 
-    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
+    let test = runner.with_exec(
+        vec![
+            "npm".into(),
+            "test".into(),
+            "--".into(),
+            "--watchAll=false".into(),
+        ],
+        None,
+    );
 
     let _ = test
-        .with_exec(vec!["npm", "run", "build"])
+        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
-        .directory("./build")
+        .directory("./build".into())
-        .export(output);
+        .export(output.into());
 
     let mut rng = rand::thread_rng();
 
     let ref_ = client
-        .container()
+        .container(None)
-        .from("nginx")
+        .from("nginx".into())
         .with_directory(
-            "/usr/share/nginx/html",
+            "/usr/share/nginx/html".into(),
-            client.host().directory(output).id().await?,
+            client.host().directory(output.into(), None).id(),
+            None,
         )
-        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>())).await?;
+        .publish(
+            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
+            None,
+        );
 
     println!("published image to: {}", ref_);
 

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

@@ -1,29 +1,36 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 
-#[tokio::main]
+fn main() -> eyre::Result<()> {
-async fn main() -> eyre::Result<()> {
+    let client = dagger_sdk::client::connect()?;
-    let client = dagger_sdk::connect().await?;
 
-    let host_source_dir = client.host().directory_opts(
+    let host_source_dir = client.host().directory(
-        "examples/test-the-application/app",
+        "examples/test-the-application/app".into(),
-        HostDirectoryOpts {
+        Some(HostDirectoryOpts {
-            exclude: Some(vec!["node_modules", "ci/"]),
+            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
             include: None,
-        },
+        }),
     );
 
     let source = client
-        .container()
+        .container(None)
-        .from("node:16")
+        .from("node:16".into())
-        .with_mounted_directory("/src", host_source_dir.id().await?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
-        .with_workdir("/src")
+        .with_workdir("/src".into())
-        .with_exec(vec!["npm", "install"]);
+        .with_exec(vec!["npm".into(), "install".into()], None);
 
     let out = runner
-        .with_exec(vec!["npm", "test", "--", "--watchAll=false"])
+        .with_exec(
-        .stderr().await?;
+            vec![
+                "npm".into(),
+                "test".into(),
+                "--".into(),
+                "--watchAll=false".into(),
+            ],
+            None,
+        )
+        .stderr();
 
     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,6 +1,18 @@
-mod client;
+pub mod client;
-mod gen;
+pub mod gen;
 mod querybuilder;
 
-pub use client::*;
+pub fn add(left: usize, right: usize) -> usize {
-pub use gen::*;
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}

crates/dagger-sdk/src/querybuilder.rs

@@ -46,13 +46,13 @@ impl Selection {
         }
     }
 
-    pub fn arg<S>(&self, name: &str, value: S) -> Selection
+    pub fn arg<S>(&self, name: &str, value: S) -> eyre::Result<Selection>
     where
         S: Serialize,
     {
         let mut s = self.clone();
 
-        let val = serde_json::to_string(&value).unwrap();
+        let val = serde_json::to_string(&value)?;
 
         match s.args.as_mut() {
             Some(args) => {
@@ -65,7 +65,7 @@ impl Selection {
             }
         }
 
-        s
+        Ok(s)
     }
 
     pub fn build(&self) -> eyre::Result<String> {
@@ -93,20 +93,25 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    pub async fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<D>
+    pub fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<Option<D>>
     where
         D: for<'de> Deserialize<'de>,
     {
         let query = self.build()?;
 
-        let resp: Option<serde_json::Value> = match gql_client.query(&query).await {
+        let basic = tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .unwrap();
+
+        let resp: Option<serde_json::Value> = match basic.block_on(gql_client.query(&query)) {
             Ok(r) => r,
             Err(e) => eyre::bail!(e),
         };
 
         let resp: Option<D> = self.unpack_resp(resp)?;
 
-        Ok(resp.unwrap())
+        Ok(resp)
     }
 
     fn path(&self) -> Vec<Selection> {
@@ -166,8 +171,10 @@ mod tests {
             .select("core")
             .select("image")
             .arg("ref", "alpine")
+            .unwrap()
             .select("file")
-            .arg("path", "/etc/alpine-release");
+            .arg("path", "/etc/alpine-release")
+            .unwrap();
 
         let query = root.build().unwrap();
 
@@ -183,8 +190,10 @@ mod tests {
             .select("core")
             .select("image")
             .arg("ref", "alpine")
+            .unwrap()
             .select_with_alias("foo", "file")
-            .arg("path", "/etc/alpine-release");
+            .arg("path", "/etc/alpine-release")
+            .unwrap();
 
         let query = root.build().unwrap();
 
@@ -199,8 +208,10 @@ mod tests {
         let root = query()
             .select("a")
             .arg("arg", "one")
+            .unwrap()
             .select("b")
-            .arg("arg", "two");
+            .arg("arg", "two")
+            .unwrap();
 
         let query = root.build().unwrap();
 
@@ -211,7 +222,7 @@ mod tests {
     fn test_vec_arg() {
         let input = vec!["some-string"];
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:["some-string"])}"#.to_string())
@@ -221,7 +232,7 @@ mod tests {
     fn test_ref_slice_arg() {
         let input = &["some-string"];
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:["some-string"])}"#.to_string())
@@ -231,7 +242,7 @@ mod tests {
     fn test_stringb_arg() {
         let input = "some-string".to_string();
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:"some-string")}"#.to_string())
@@ -264,7 +275,7 @@ mod tests {
             })),
         };
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(

crates/dagger-sdk/tests/mod.rs

@@ -1,21 +1,21 @@
-use dagger_sdk::{connect, ContainerExecOptsBuilder};
+use dagger_sdk::client::connect;
+use dagger_sdk::gen::ContainerExecOpts;
 
-#[tokio::test]
+#[test]
-async fn test_example_container() {
+fn test_example_container() {
-    let client = connect().await.unwrap();
+    let client = connect().unwrap();
 
-    let alpine = client.container().from("alpine:3.16.2");
+    let alpine = client.container(None).from("alpine:3.16.2".into());
 
     let out = alpine
-        .exec_opts(
+        .exec(Some(ContainerExecOpts {
-            ContainerExecOptsBuilder::default()
+            args: Some(vec!["cat".into(), "/etc/alpine-release".into()]),
-                .args(vec!["cat", "/etc/alpine-release"])
+            stdin: None,
-                .build()
+            redirect_stdout: None,
-                .unwrap(),
+            redirect_stderr: None,
-        )
+            experimental_privileged_nesting: None,
-        .stdout()
+        }))
-        .await
+        .stdout();
-        .unwrap();
 
     assert_eq!(out, "3.16.2\n".to_string())
 }

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