feat: final commit indicating move to dagger/dagger

Signed-off-by: kjuulh <contact@kjuulh.io>

.github/workflows/ci-multiplatform.yml

@@ -0,0 +1,150 @@
+name: ci-multi-platform
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: '00 01 * * *'
+jobs:
+  test:
+    name: test
+    env:
+      # For some builds, we use cross to test on 32-bit and big-endian
+      # systems.
+      CARGO: cargo
+      # When CARGO is set to CROSS, this is set to `--target matrix.target`.
+      TARGET_FLAGS: ""
+      # When CARGO is set to CROSS, TARGET_DIR includes matrix.target.
+      TARGET_DIR: ./target
+      # Emit backtraces on panics.
+      RUST_BACKTRACE: 1
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        build:
+          - pinned
+          - stable
+          - beta
+          - nightly
+          - nightly-musl
+          #- nightly-32
+          #- nightly-mips
+          #- nightly-arm
+          #- macos
+          # - win-msvc
+          #- win-gnu
+        include:
+          - build: pinned
+            os: ubuntu-22.04
+            rust: 1.65.0
+          - build: stable
+            os: ubuntu-22.04
+            rust: stable
+          - build: beta
+            os: ubuntu-22.04
+            rust: beta
+          - build: nightly
+            os: ubuntu-22.04
+            rust: nightly
+          - build: nightly-musl
+            os: ubuntu-22.04
+            rust: nightly
+            target: x86_64-unknown-linux-musl
+            #- build: nightly-32
+            #  os: ubuntu-22.04
+            #  rust: nightly
+            #  target: i686-unknown-linux-gnu
+            #- build: nightly-mips
+            #  os: ubuntu-22.04
+            #  rust: nightly
+            #  target: mips64-unknown-linux-gnuabi64
+            #- build: nightly-arm
+            #  os: ubuntu-22.04
+            #  rust: nightly
+            #  target: arm-unknown-linux-gnueabihf
+            #- build: macos
+            #  os: macos-12
+            #  rust: nightly
+            #- build: win-msvc
+            #  os: windows-2022
+            #  rust: nightly
+            #- build: win-gnu
+            #  os: windows-2022
+            #  rust: nightly-x86_64-gnu
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      #- name: Install packages (Ubuntu)
+      #  if: matrix.os == 'ubuntu-22.04'
+      #  run: |
+      #    ci/ubuntu-install-packages
+      - name: Install packages (macOS)
+        if: matrix.os == 'macos-12'
+        run: |
+          ci/scripts/macos-install-packages
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.0.0
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+      - name: Use Cross
+        if: matrix.target != ''
+        run: |
+          cargo install cross
+          echo "CARGO=cross" >> $GITHUB_ENV
+          echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
+          echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
+      - name: Show command used for Cargo
+        run: |
+          echo "cargo command is: ${{ env.CARGO }}"
+          echo "target flag is: ${{ env.TARGET_FLAGS }}"
+      - name: Build
+        run: ${{ env.CARGO }} build --verbose --workspace ${{ env.TARGET_FLAGS }}
+      - name: Run tests (without cross)
+        if: matrix.target == ''
+        run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
+        #- name: Run tests (with cross)
+        #  if: matrix.target != ''
+        #  run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
+  test_multi_platform:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+          #- windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install packages (macOS)
+        if: matrix.os == 'macos-latest'
+        run: |
+          ci/scripts/macos-install-packages
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.0.0
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+      - name: Run unit tests
+        run: cargo test --locked --all-targets --workspace --all-features
+        timeout-minutes: 10
+  rustfmt:
+    name: rustfmt
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rustfmt
+      - name: Check formatting
+        run: cargo fmt --all --check

.github/workflows/ci.yaml

@@ -27,5 +27,10 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.0.0
+      -
+        name: Expose GitHub Runtime
+        uses: crazy-max/ghaction-github-runtime@v2
       - name: Run dagger [CI]
-        run: cargo run -p ci -- pr
+        run: |
+          export _EXPERIMENTAL_DAGGER_CACHE_CONFIG="type=gha,mode=max,url=$ACTIONS_CACHE_URL,token=$ACTIONS_RUNTIME_TOKEN"
+          cargo run -p ci -- pr

.github/workflows/lint-pr.yml

@@ -0,0 +1,15 @@
+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 }}

ARCHITECTURE.md

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

CHANGELOG.md

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

CONTRIBUTING.md

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

Cargo.toml

@@ -1,44 +1,26 @@
-[package]
-name = "dagger-rs"
-version = "0.2.8"
-edition = "2021"
-readme = "README.md"
-license-file = "LICENSE.MIT"
-description = "A dagger sdk for rust, written in rust"
-repository = "https://github.com/kjuulh/dagger-rs"
-publish = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [workspace]
 members = [
   "crates/dagger-codegen",
   "crates/dagger-sdk",
   "crates/dagger-core",
+  "crates/dagger-bootstrap",
   "ci",
 ]
 
-[dependencies]
-dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.2" }
-dagger-core = { path = "crates/dagger-core", version = "^0.2.2" }
+[workspace.dependencies]
+dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" }
+dagger-core = { path = "crates/dagger-core", version = "^0.2.10" }
+dagger-bootstrap = { path = "crates/dagger-bootstrap", version = "^0.2.10" }
+dagger-sdk = { path = "crates/dagger-sdk", version = "^0.2.19" }
 
-clap = "4.1.6"
-dirs = "4.0.0"
 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",
-  "reqwest-blocking",
-] }
-hex = "0.4.3"
-hex-literal = "0.3.4"
-platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "blocking", "deflate"] }
+color-eyre = "0.6.2"
 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"] }
+tracing = { version = "0.1.37", features = ["log"] }
+tracing-subscriber = { version = "0.3.16", features = [
+  "tracing-log",
+  "tracing",
+] }
+thiserror = "1.0.40"

Cross.toml

@@ -0,0 +1,2 @@
+[target.x86_64-unknown-linux-musl]
+image = "messense/rust-musl-cross:x86_64-musl"

Makefile.toml

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

README.md

@@ -1,40 +1,7 @@
-# dagger-rs
+# dagger-sdk
 
-A dagger sdk written in rust for rust.
+A dagger sdk written in rust
 
-# Usage
+## Disclaimer:
 
-See [dagger-sdk](./crates/dagger-sdk/README.md)
-
-### Status
-
-- [x] dagger cli downloader
-- [x] dagger network session
-- [x] graphql rust codegen (User API)
-  - [x] Scalars
-  - [x] Enums
-  - [x] Input
-  - [x] Objects
-- [x] Implement context and querier
-  - [x] Marshaller
-  - [x] Querier
-  - [x] Context
-  - [x] Deserializer for nested response (bind)
-- [x] Add codegen to hook into querier
-- [ ] fix build / release cycle
-- [ ] general api stabilisation
-- [x] document usage
-- [ ] make async variant
-
-## Architecture
-
-- `.` Root project mainly used for generating the CLI, which in turn is used to
-  bootstrap the code generation from `dagger`
-- `crates/dagger-core` Contains all base types used during actual usage. This is
-  where the primary logic lives in which the user interacts (\*disclaimer: most
-  stuff haven't moved in here yet.)
-- `crates/dagger-sdk` Contains the actual sdk in which the user interacts,
-  `dagger-core` is reexported through this API as well.
-- `crates/dagger-codegen` This is the bulk of the work, it takes the input
-  graphql and spits out the API in which the user interacts, this is heavily
-  inspired by other `dagger-sdk's`. It primarily turns graphql into rust code.
+Repository has moved to: https://github.com/dagger/dagger/tree/main/sdk/rust

ci/CHANGELOG.md

@@ -0,0 +1,73 @@
+# 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,5 +8,6 @@ edition = "2021"
 [dependencies]
 clap = "4.1.6"
 color-eyre = "0.6.2"
-dagger-sdk = "0.2.1"
+dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.22" }
 eyre = "0.6.8"
+tokio = { version = "1.25.0", features = ["full"] }

ci/scripts/macos-install-packages

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+brew install docker
+colima start

ci/src/main.rs

@@ -1,24 +1,28 @@
 use std::sync::Arc;
 
-use dagger_sdk::gen::{Container, HostDirectoryOpts, Query};
+use clap::ArgMatches;
+use dagger_sdk::{Container, HostDirectoryOpts, Query};
 
-fn main() -> eyre::Result<()> {
+#[tokio::main]
+async fn main() -> eyre::Result<()> {
     color_eyre::install().unwrap();
 
     let matches = clap::Command::new("ci")
         .subcommand_required(true)
         .subcommand(clap::Command::new("pr"))
         .subcommand(clap::Command::new("release"))
+        .subcommand(clap::Command::new("codegen"))
         .get_matches();
 
-    let client = dagger_sdk::client::connect()?;
+    let client = dagger_sdk::connect().await?;
 
     match matches.subcommand() {
         Some(("pr", _)) => {
-            let base = select_base_image(client.clone());
-            return validate_pr(client, base);
+            let base = select_base_image(client.clone()).await?;
+            return validate_pr(client, base).await;
         }
-        Some(("release", subm)) => return release(client, subm),
+        Some(("release", subm)) => return release(client, subm).await,
+        Some(("codegen", subm)) => return run_codegen(client, subm).await,
         Some(_) => {
             panic!("invalid subcommand selected!")
         }
@@ -28,42 +32,70 @@ fn main() -> eyre::Result<()> {
     }
 }
 
-fn release(client: Arc<Query>, subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
-    let src_dir = client.host().directory(
-        ".".into(),
-        Some(HostDirectoryOpts {
-            exclude: Some(vec!["target/".into()]),
+async fn run_codegen(client: Arc<Query>, _subm: &ArgMatches) -> eyre::Result<()> {
+    let docker_cli = client
+        .container()
+        .from("docker:cli")
+        .file("/usr/local/bin/docker");
+    let socket = client.host().unix_socket("/var/run/docker.sock");
+
+    let container = get_dependencies(client).await?;
+
+    let generated_image = container
+        .with_exec(vec!["mkdir", "-p", "/mnt/output"])
+        .with_mounted_file("/usr/bin/docker", docker_cli.id().await?)
+        .with_unix_socket("/var/run/docker.sock", socket.id().await?)
+        .with_exec(vec![
+            "cargo",
+            "run",
+            "-p",
+            "dagger-bootstrap",
+            "--",
+            "generate",
+            "--output",
+            "crates/dagger-sdk/gen.rs",
+        ])
+        .with_exec(vec!["cargo", "fmt", "--all"])
+        .with_exec(vec!["cargo", "fix", "--workspace", "--allow-dirty"])
+        .with_exec(vec!["cargo", "fmt", "--all"])
+        .with_exec(vec!["mv", "crates/dagger-sdk/gen.rs", "/mnt/output/gen.rs"]);
+
+    let _ = generated_image.exit_code().await?;
+
+    generated_image
+        .file("/mnt/output/gen.rs")
+        .export("crates/dagger-sdk/src/gen.rs")
+        .await?;
+
+    Ok(())
+}
+
+async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
+    let src_dir = client.host().directory_opts(
+        ".",
+        HostDirectoryOpts {
+            exclude: Some(vec!["target/"]),
             include: None,
-        }),
+        },
     );
     let base_image = client
-        .container(None)
-        .from("rust:latest".into())
-        .with_workdir("app".into())
-        .with_mounted_directory("/app/".into(), src_dir.id());
+        .container()
+        .from("rust:latest")
+        .with_workdir("app")
+        .with_mounted_directory("/app/", src_dir.id().await?);
 
     let container = base_image
-        .with_exec(
-            vec![
-                "cargo".into(),
-                "install".into(),
-                "cargo-smart-release".into(),
-            ],
-            None,
-        )
-        .with_exec(
-            vec![
-                "cargo".into(),
-                "smart-release".into(),
-                "--execute".into(),
-                "--allow-fully-generated-changelogs".into(),
-                "--no-changelog-preview".into(),
-                "dagger-rs".into(),
-                "dagger-sdk".into(),
-            ],
-            None,
-        );
-    let exit = container.exit_code();
+        .with_exec(vec!["cargo", "install", "cargo-smart-release"])
+        .with_exec(vec![
+            "cargo",
+            "smart-release",
+            "--execute",
+            "--allow-fully-generated-changelogs",
+            "--no-changelog-preview",
+            "dagger-sdk",
+            "dagger-sdk",
+        ]);
+    let exit = container.exit_code().await?;
     if exit != 0 {
         eyre::bail!("container failed with non-zero exit code");
     }
@@ -73,153 +105,123 @@ fn release(client: Arc<Query>, subm: &clap::ArgMatches) -> Result<(), color_eyre
     Ok(())
 }
 
-fn get_dependencies(client: Arc<Query>) -> Container {
-    let cargo_dir = client.host().directory(
-        ".".into(),
-        Some(HostDirectoryOpts {
+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".into(),
-                "**/Cargo.toml".into(),
-                "**/main.rs".into(),
-                "**/lib.rs".into(),
+                "**/Cargo.lock",
+                "**/Cargo.toml",
+                "**/main.rs",
+                "**/lib.rs",
             ]),
-        }),
+        },
     );
 
-    let src_dir = client.host().directory(
-        ".".into(),
-        Some(HostDirectoryOpts {
-            exclude: Some(vec!["target/".into()]),
+    let src_dir = client.host().directory_opts(
+        ".",
+        HostDirectoryOpts {
+            exclude: Some(vec!["target/"]),
             include: None,
-        }),
+        },
     );
 
-    let cache_cargo_index_dir = client.cache_volume("cargo_index".into());
-    let cache_cargo_deps = client.cache_volume("cargo_deps".into());
-    let cache_cargo_bin = client.cache_volume("cargo_bin_cache".into());
+    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".into();
+    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(None)
-        .from("rust:latest".into())
-        .with_workdir("app".into())
-        .with_exec(vec!["apt-get".into(), "update".into()], None)
-        .with_exec(
-            vec![
-                "apt-get".into(),
-                "install".into(),
-                "--yes".into(),
-                "libpq-dev".into(),
-                "wget".into(),
-            ],
-            None,
-        )
-        .with_exec(vec!["wget".into(), minio_url], None)
-        .with_exec(
-            vec![
-                "tar".into(),
-                "xzf".into(),
-                "sccache-v0.3.3-x86_64-unknown-linux-musl.tar.gz".into(),
-            ],
-            None,
-        )
-        .with_exec(
-            vec![
-                "mv".into(),
-                "sccache-v0.3.3-x86_64-unknown-linux-musl/sccache".into(),
-                "/usr/local/bin/sccache".into(),
-            ],
-            None,
-        )
-        .with_exec(
-            vec!["chmod".into(), "+x".into(), "/usr/local/bin/sccache".into()],
-            None,
-        )
-        .with_env_variable("RUSTC_WRAPPER".into(), "/usr/local/bin/sccache".into())
+        .container()
+        .from("rustlang/rust:nightly")
+        .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".into(),
+            "AWS_ACCESS_KEY_ID",
             std::env::var("AWS_ACCESS_KEY_ID").unwrap_or("".into()),
         )
         .with_env_variable(
-            "AWS_SECRET_ACCESS_KEY".into(),
+            "AWS_SECRET_ACCESS_KEY",
             std::env::var("AWS_SECRET_ACCESS_KEY").unwrap_or("".into()),
         )
-        .with_env_variable("SCCACHE_BUCKET".into(), "sccache".into())
-        .with_env_variable("SCCACHE_REGION".into(), "auto".into())
-        .with_env_variable(
-            "SCCACHE_ENDPOINT".into(),
-            "https://api-minio.front.kjuulh.io".into(),
-        )
-        .with_mounted_cache("~/.cargo/bin".into(), cache_cargo_bin.id(), None)
-        .with_mounted_cache("~/.cargo/registry/index".into(), cache_cargo_bin.id(), None)
-        .with_mounted_cache("~/.cargo/registry/cache".into(), cache_cargo_bin.id(), None)
-        .with_mounted_cache("~/.cargo/git/db".into(), cache_cargo_bin.id(), None)
-        .with_mounted_cache("target/".into(), cache_cargo_bin.id(), None)
-        .with_exec(
-            vec!["cargo".into(), "install".into(), "cargo-chef".into()],
-            None,
-        );
+        .with_env_variable("SCCACHE_BUCKET", "sccache")
+        .with_env_variable("SCCACHE_REGION", "auto")
+        .with_env_variable("SCCACHE_ENDPOINT", "https://api-minio.front.kjuulh.io")
+        .with_mounted_cache("~/.cargo/bin", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/registry/index", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/registry/cache", cache_cargo_bin.id().await?)
+        .with_mounted_cache("~/.cargo/git/db", cache_cargo_bin.id().await?)
+        .with_mounted_cache("target/", cache_cargo_bin.id().await?)
+        .with_exec(vec!["cargo", "install", "cargo-chef"]);
 
     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());
+        .with_mounted_directory(".", cargo_dir.id().await?)
+        .with_mounted_cache("~/.cargo/.package-cache", cache_cargo_index_dir.id().await?)
+        .with_exec(vec![
+            "cargo",
+            "chef",
+            "prepare",
+            "--recipe-path",
+            "recipe.json",
+        ])
+        .file("/app/recipe.json");
 
     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,
-        );
+        .with_mounted_file("/app/recipe.json", recipe.id().await?)
+        .with_exec(vec![
+            "cargo",
+            "chef",
+            "cook",
+            "--release",
+            "--workspace",
+            "--recipe-path",
+            "recipe.json",
+        ])
+        .with_directory("/app/", src_dir.id().await?)
+        .with_exec(vec!["cargo", "build", "--all", "--release"]);
 
-    return builder_start;
+    return Ok(builder_start);
 }
 
-fn select_base_image(client: Arc<Query>) -> Container {
-    let src_dir = get_dependencies(client.clone());
+async fn select_base_image(client: Arc<Query>) -> eyre::Result<Container> {
+    let src_dir = get_dependencies(client.clone()).await;
 
     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);
+async fn validate_pr(client: Arc<Query>, container: Container) -> eyre::Result<()> {
+    let exit = container.exit_code().await?;
+    if exit != 0 {
+        eyre::bail!("container failed with non-zero exit code");
+    }
+    let docker_cli = client
+        .container()
+        .from("docker:cli")
+        .file("/usr/local/bin/docker");
+    let socket = client.host().unix_socket("/var/run/docker.sock");
 
-    let exit = container.exit_code();
+    let container = container
+        .with_mounted_file("/usr/bin/docker", docker_cli.id().await?)
+        .with_unix_socket("/var/run/docker.sock", socket.id().await?)
+        .with_exec(vec!["cargo", "test", "--all"]);
+
+    let exit = container.exit_code().await?;
     if exit != 0 {
         eyre::bail!("container failed with non-zero exit code");
     }

crates/dagger-bootstrap/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "dagger-bootstrap"
+version = "0.2.10"
+edition = "2021"
+readme = "README.md"
+license-file = "LICENSE.MIT"
+description = "A dagger sdk for rust, written in rust"
+repository = "https://github.com/kjuulh/dagger-sdk"
+publish = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+dagger-core = { workspace = true }
+dagger-codegen = { workspace = true }
+
+eyre = { workspace = true }
+color-eyre = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+
+clap = "4.1.6"

crates/dagger-bootstrap/src/cli.rs

@@ -13,11 +13,11 @@ impl Cli {
         })
     }
 
-    pub fn execute(self, args: &[&str]) -> eyre::Result<()> {
+    pub async 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)?,
+            Some(("generate", args)) => cli_generate::GenerateCommand::exec(args).await?,
             _ => eyre::bail!("command missing"),
         }
 

crates/dagger-bootstrap/src/cli_generate.rs

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

crates/dagger-bootstrap/src/main.rs

@@ -3,16 +3,15 @@ use cli::Cli;
 pub mod cli;
 mod cli_generate;
 
-fn main() -> eyre::Result<()> {
-    //
-
+#[tokio::main]
+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())?;
+    Cli::new()?.execute(args.as_slice()).await?;
 
     Ok(())
 }

crates/dagger-codegen/CHANGELOG.md

@@ -5,6 +5,225 @@ 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
@@ -15,7 +234,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 1 commit contributed to the release.
+ - 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
 
@@ -26,6 +245,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-rs/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
     - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-rs/commit/6e5f4074329ab0462445b31d4153f8497c483438))
 </details>
 

crates/dagger-codegen/Cargo.toml

@@ -1,21 +1,24 @@
 [package]
 name = "dagger-codegen"
-version = "0.2.2"
+version = "0.2.8"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
 description = "dagger sdk codegen library"
-repository = "https://github.com/kjuulh/dagger-rs"
+repository = "https://github.com/kjuulh/dagger-sdk"
 publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-convert_case = "0.6.0"
-dagger-core = { path = "../dagger-core", version = "^0.2.2" }
+dagger-core = { workspace = true }
+
+eyre = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 
-eyre = "0.6.8"
 genco = "0.17.3"
+convert_case = "0.6.0"
 itertools = "0.10.5"
+
+[dev-dependencies]
 pretty_assertions = "1.3.0"
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = "1.0.93"

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) -> String;
-    fn format_kind_scalar_string(&self, representation: &str) -> String;
+    fn format_kind_list(&self, representation: &str, input: bool, immutable: bool) -> String;
+    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> 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,14 +36,18 @@ impl CommonFunctions {
     }
 
     pub fn format_input_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, true)
+        self.format_type(t, true, false)
     }
 
     pub fn format_output_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, false)
+        self.format_type(t, false, false)
     }
 
-    fn format_type(&self, t: &TypeRef, input: bool) -> String {
+    pub fn format_immutable_input_type(&self, t: &TypeRef) -> 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() {
@@ -57,9 +61,14 @@ impl CommonFunctions {
                             Scalar::Float => self
                                 .format_type_funcs
                                 .format_kind_scalar_float(&mut representation),
-                            Scalar::String => self
-                                .format_type_funcs
-                                .format_kind_scalar_string(&mut representation),
+                            Scalar::String => {
+                                if immutable {
+                                    "&'a str".into()
+                                } else {
+                                    self.format_type_funcs
+                                        .format_kind_scalar_string(&mut representation, input)
+                                }
+                            }
                             Scalar::Boolean => self
                                 .format_type_funcs
                                 .format_kind_scalar_boolean(&mut representation),
@@ -87,12 +96,15 @@ impl CommonFunctions {
                                 .as_ref()
                                 .map(|t| t.clone())
                                 .map(|t| *t)
-                                .map(|t| self.format_type(&t, input))
+                                .map(|t| self.format_type(&t, input, immutable))
                                 .context("could not get inner type of list")
                                 .unwrap();
 
-                            representation =
-                                self.format_type_funcs.format_kind_list(&mut inner_type);
+                            representation = self.format_type_funcs.format_kind_list(
+                                &mut inner_type,
+                                input,
+                                immutable,
+                            );
 
                             return representation;
                         }
@@ -141,6 +153,7 @@ impl From<&TypeRef> for Scalar {
     }
 }
 
+#[allow(dead_code)]
 pub fn get_type_from_name<'t>(types: &'t [FullType], name: &'t str) -> Option<&'t FullType> {
     types
         .into_iter()
@@ -183,6 +196,22 @@ pub fn type_ref_is_scalar(type_ref: &TypeRef) -> bool {
         .unwrap_or(false)
 }
 
+pub fn type_ref_is_enum(type_ref: &TypeRef) -> bool {
+    let mut type_ref = type_ref.clone();
+    if type_ref
+        .kind
+        .pipe(|k| *k == __TypeKind::NON_NULL)
+        .unwrap_or(false)
+    {
+        type_ref = *type_ref.of_type.unwrap().clone();
+    }
+
+    type_ref
+        .kind
+        .pipe(|k| *k == __TypeKind::ENUM)
+        .unwrap_or(false)
+}
+
 pub fn type_ref_is_object(type_ref: &TypeRef) -> bool {
     let mut type_ref = type_ref.clone();
     if type_ref
@@ -246,6 +275,7 @@ pub fn input_values_has_optionals(input_values: &[&InputValue]) -> bool {
         > 0
 }
 
+#[allow(dead_code)]
 pub fn input_values_is_empty(input_values: &[InputValue]) -> bool {
     input_values.len() > 0
 }

crates/dagger-codegen/src/lib.rs

@@ -1,3 +1,5 @@
+#![deny(warnings)]
+
 mod functions;
 mod generator;
 pub mod rust;
@@ -11,7 +13,7 @@ use self::generator::DynGenerator;
 fn set_schema_parents(mut schema: Schema) -> Schema {
     for t in schema.types.as_mut().into_iter().flatten().flatten() {
         let t_parent = t.full_type.clone();
-        for mut field in t.full_type.fields.as_mut().into_iter().flatten() {
+        for field in t.full_type.fields.as_mut().into_iter().flatten() {
             field.parent_type = Some(t_parent.clone());
         }
     }

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

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

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

@@ -1,15 +1,18 @@
 use convert_case::{Case, Casing};
-use dagger_core::introspection::FullTypeFields;
+use dagger_core::introspection::{FullTypeFields, TypeRef};
 use genco::prelude::rust;
 use genco::quote;
 use genco::tokens::quoted;
+use itertools::Itertools;
 
 use crate::functions::{
-    type_field_has_optional, type_ref_is_list_of_objects, type_ref_is_object,
-    type_ref_is_optional, CommonFunctions,
+    type_field_has_optional, type_ref_is_enum, type_ref_is_list, type_ref_is_list_of_objects,
+    type_ref_is_object, type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
 };
 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)
 }
@@ -29,28 +32,83 @@ 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 fn $(field.name.pipe(|n | format_struct_name(n)))
+        pub $(is_async) 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| funcs.format_output_type(t));
+        .pipe(|t| render_output_type(funcs, t));
 
-    Some(quote! {
-        $(signature)(
-            $(args)
-        ) -> $(output_type) {
-            let mut query = self.selection.select($(quoted(field.name.as_ref())));
+    if let Some((args, desc, true)) = args {
+        let required_args = format_required_function_args(funcs, field);
+        Some(quote! {
+            $(field.description.pipe(|d| format_struct_comment(d)))
+            $(&desc)
+            $(&signature)(
+                $(required_args)
+            ) -> $(output_type.as_ref()) {
+                let mut query = self.selection.select($(quoted(field.name.as_ref())));
 
-            $(render_required_args(funcs, field))
-            $(render_optional_args(funcs, field))
+                $(render_required_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> {
@@ -66,8 +124,48 @@ 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_enum(&s.input_value.type_) {
+                        return Some(quote! {
+                            query = query.arg_enum($(quoted(name)), $(n));
+                        })
+                    }
+
+                    if type_ref_is_list(&s.input_value.type_) {
+                        let inner = *s
+                            .input_value
+                            .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)).unwrap();
+                        query = query.arg($(quoted(name)), $(n));
                     })
                 })
             })
@@ -96,9 +194,17 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
                     let n = format_struct_name(&s.input_value.name);
                     let name = &s.input_value.name;
 
+                    if type_ref_is_enum(&s.input_value.type_) {
+                        return Some(quote! {
+                            if let Some($(&n)) = opts.$(&n) {
+                                query = query.arg_enum($(quoted(name)), $(n));
+                            }
+                        });
+                    }
+
                     Some(quote! {
                         if let Some($(&n)) = opts.$(&n) {
-                            query = query.arg($(quoted(name)), $(&n)).unwrap();
+                            query = query.arg($(quoted(name)), $(&n));
                         }
                     })
                 })
@@ -111,9 +217,7 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
         }
 
         let required_args = quote! {
-            if let Some(opts) = opts {
-                $(for arg in args join ($['\r']) => $arg)
-            }
+            $(for arg in args join ($['\r']) => $arg)
         };
 
         Some(required_args)
@@ -122,6 +226,22 @@ 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)
+        };
+    }
+
+    let dagger_error = rust::import("crate::errors", "DaggerError");
+
+    quote! {
+        Result<$output_type, $dagger_error>
+    }
+}
+
 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);
@@ -129,7 +249,7 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
             return $(output_type) {
                 proc: self.proc.clone(),
                 selection: query,
-                conn: self.conn.clone(),
+                graphql_client: self.graphql_client.clone(),
             }
         };
     }
@@ -155,19 +275,97 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
             return vec![$(output_type) {
                 proc: self.proc.clone(),
                 selection: query,
-                conn: self.conn.clone(),
+                graphql_client: self.graphql_client.clone(),
             }]
         };
     }
 
-    let graphql_client = rust::import("crate::client", "graphql_client");
-
     quote! {
-        query.execute(&$graphql_client(&self.conn)).unwrap().unwrap()
+        query.execute(self.graphql_client.clone()).await
     }
 }
 
-fn format_function_args(funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
+fn format_function_args(
+    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()
+            .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);
+
+                    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),
+                    })
+                })
+            })
+            .flatten()
+            .collect::<Vec<_>>();
+        let required_args = quote! {
+            &self,
+            $(for arg in args join ($['\r']) => $arg)
+        };
+
+        if type_field_has_optional(field) {
+            let field_name = field_options_struct_name(field);
+            argument_description.push(quote! {
+                $(field_name.pipe(|_| write_comment_line(&format!("* `opt` - optional argument, see inner type for documentation, use <func>_opts to use"))))
+            });
+
+            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! {
+                $(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()
@@ -192,14 +390,57 @@ fn format_function_args(funcs: &CommonFunctions, field: &FullTypeFields) -> Opti
             $(for arg in args join ($['\r']) => $arg)
         };
 
-        if type_field_has_optional(field) {
-            Some(quote! {
-                $(required_args)
-                opts: Option<$(field_options_struct_name(field))>
-            })
-        } else {
-            Some(required_args)
-        }
+        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_))
+                .sorted_by_key(|val| &val.input_value.name)
+                .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

@@ -1,6 +1,7 @@
 use dagger_core::introspection::FullType;
 use genco::prelude::rust;
 use genco::quote;
+use itertools::Itertools;
 
 fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
     let values = values
@@ -10,6 +11,7 @@ fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
         .map(|values| {
             values
                 .into_iter()
+                .sorted_by_key(|a| &a.name)
                 .map(|val| quote! { $(val.name.as_ref()), })
         })
         .flatten()
@@ -26,9 +28,10 @@ fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
 
 pub fn render_enum(t: &FullType) -> eyre::Result<rust::Tokens> {
     let serialize = rust::import("serde", "Serialize");
+    let deserialize = rust::import("serde", "Deserialize");
 
     Ok(quote! {
-        #[derive($serialize)]
+        #[derive($serialize, $deserialize, Clone, PartialEq, Debug)]
         pub enum $(t.name.as_ref()) {
             $(render_enum_values(t))
         }

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

@@ -1,6 +1,7 @@
 use dagger_core::introspection::{FullType, FullTypeInputFields};
 use genco::prelude::rust;
 use genco::quote;
+use itertools::Itertools;
 
 use crate::functions::CommonFunctions;
 use crate::rust::functions::{format_name, format_struct_name};
@@ -9,7 +10,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)]
+        #[derive($serialize, $deserialize, Debug, PartialEq, Clone)]
         pub struct $(format_name(t.name.as_ref().unwrap())) {
             $(render_input_fields(funcs, t.input_fields.as_ref().unwrap_or(&Vec::new())  ))
         }
@@ -20,7 +21,10 @@ pub fn render_input_fields(
     funcs: &CommonFunctions,
     fields: &[FullTypeInputFields],
 ) -> Option<rust::Tokens> {
-    let rendered_fields = fields.iter().map(|f| render_input_field(funcs, f));
+    let rendered_fields = fields
+        .iter()
+        .sorted_by_key(|val| &val.input_value.name)
+        .map(|f| render_input_field(funcs, f));
 
     if rendered_fields.len() == 0 {
         None
@@ -33,6 +37,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_input_type(&field.input_value.type_)),
+        pub $(format_struct_name(&field.input_value.name)): $(funcs.format_output_type(&field.input_value.type_)),
     }
 }

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

@@ -2,23 +2,25 @@ use dagger_core::introspection::{FullType, FullTypeFields, FullTypeFieldsArgs};
 use genco::prelude::rust;
 use genco::quote;
 
-use crate::functions::{type_ref_is_optional, CommonFunctions};
+use crate::functions::CommonFunctions;
 use crate::rust::functions::{
-    field_options_struct_name, format_function, format_name, format_struct_name,
+    field_options_struct_name, format_function, format_name, format_optional_args,
+    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("std::process", "Child");
-    let conn = rust::import("dagger_core::connect_params", "ConnectParams");
+    let child = rust::import("tokio::process", "Child");
+    let graphql_client = rust::import("dagger_core::graphql_client", "DynGraphQLClient");
     let arc = rust::import("std::sync", "Arc");
 
     Ok(quote! {
+        #[derive(Clone)]
         pub struct $(t.name.pipe(|s| format_name(s))) {
-            pub proc: $arc<$child>,
+            pub proc: Option<$arc<$child>>,
             pub selection: $selection,
-            pub conn: $conn,
+            pub graphql_client: $graphql_client
         }
 
         $(t.fields.pipe(|f| render_optional_args(funcs, f)))
@@ -50,20 +52,17 @@ 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 = 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 fields = format_optional_args(funcs, field);
 
-    if let Some(fields) = fields {
+    let builder = rust::import("derive_builder", "Builder");
+    let _phantom_data = rust::import("std::marker", "PhantomData");
+
+    if let Some((fields, contains_lifetime)) = fields {
         Some(quote! {
-            pub struct $output_type {
+            #[derive($builder, Debug, PartialEq)]
+            pub struct $output_type$(if contains_lifetime => <'a>) {
+                //#[builder(default, setter(skip))]
+                //pub marker: $(phantom_data)<&'a ()>,
                 $fields
             }
         })
@@ -72,22 +71,32 @@ fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
     }
 }
 
-fn render_optional_field_args(
+pub fn render_optional_field_args(
     funcs: &CommonFunctions,
     args: &Vec<&FullTypeFieldsArgs>,
-) -> Option<rust::Tokens> {
+) -> Option<(rust::Tokens, bool)> {
     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! {
-            pub $(format_struct_name(&a.name)): Option<$(funcs.format_output_type(&a.type_))>,
+            $(a.description.pipe(|d| format_struct_comment(d)))
+            #[builder(setter(into, strip_option), default)]
+            pub $(format_struct_name(&a.name)): Option<$(type_)>,
         }
     });
 
-    Some(quote! {
-        $(for arg in rendered_args join ($['\r']) => $arg)
-    })
+    Some((
+        quote! {
+            $(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,19 @@ pub fn render_scalar(t: &FullType) -> eyre::Result<rust::Tokens> {
     let serialize = rust::import("serde", "Serialize");
 
     Ok(quote! {
-        #[derive($serialize, $deserialize)]
-        pub struct $(t.name.pipe(|n|format_name(n)))(String);
+        #[derive($serialize, $deserialize, PartialEq, Debug, Clone)]
+        pub struct $(t.name.pipe(|n|format_name(n)))(pub String);
+
+        impl Into<$(t.name.pipe(|n| format_name(n)))> for &str {
+            fn into(self) -> $(t.name.pipe(|n| format_name(n))) {
+                $(t.name.pipe(|n| format_name(n)))(self.to_string())
+            }
+        }
+
+        impl Into<$(t.name.pipe(|n| format_name(n)))> for String {
+            fn into(self) -> $(t.name.pipe(|n| format_name(n))) {
+                $(t.name.pipe(|n| format_name(n)))(self.clone())
+            }
+        }
     })
 }

crates/dagger-core/CHANGELOG.md

@@ -5,6 +5,282 @@ 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.11 (2023-04-29)
+
+### New Features
+
+ - <csr-id-2a29a66217fa4d6c530ea1ce670c8836383e7051/> dagger-run support
+ - <csr-id-eb7470c604169d1a15976078c0889d5cc7011257/> update to dagger-5.1
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 4 days passed between releases.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - dagger-run support ([`2a29a66`](https://github.com/kjuulh/dagger-sdk/commit/2a29a66217fa4d6c530ea1ce670c8836383e7051))
+    - update to dagger-5.1 ([`eb7470c`](https://github.com/kjuulh/dagger-sdk/commit/eb7470c604169d1a15976078c0889d5cc7011257))
+</details>
+
+## v0.2.10 (2023-04-25)
+
+### Bug Fixes
+
+ - <csr-id-9d3c21d16b4a64eb7a7b1888365a4c4ea56d7225/> delete other files/folder in downloads: #57
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 21 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.10 ([`8011c42`](https://github.com/kjuulh/dagger-sdk/commit/8011c42dc077d101b1bccaf231fac17636dd249d))
+    - delete other files/folder in downloads: #57 ([`9d3c21d`](https://github.com/kjuulh/dagger-sdk/commit/9d3c21d16b4a64eb7a7b1888365a4c4ea56d7225))
+</details>
+
+## v0.2.9 (2023-04-03)
+
+<csr-id-b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8/>
+
+### New Features
+
+ - <csr-id-114f411cdb0e1043071c0ccc1768d344f78d4fcb/> with 0.4.2
+ - <csr-id-b094ae4f539a880b0bde12841b7db1fbfcc0f123/> add musl ci
+   This pr adds musl ci support for #50
+ - <csr-id-2faabb0e502a9b15c88b0bdf5673d1b458198d70/> with multi platform ci
+   This adds the first iteration of multi platform ci. This is the lowest level of testing added: pinned all the way to nightly. Next up will be macos, then musl and arm. And lastly windows. Each will probably require special handling, especially because of how cross and qemu interacts with the dagger-engine and docker.
+ - <csr-id-11d20935c697e28caaa671e8da0e70a99d4310fc/> extract client
+   This extracts the client (strategy pattern), this is so that it is will be possible to test the actual querier, without hitting / requiring the dagger-engine running.
+ - <csr-id-384294b39038123b02c406a1038105b111c3b9be/> rename projects to point to github/kjuulh/dagger-sdk
+ - <csr-id-79d931e908c58a0464fd9cf7d6ef02eb50f14c23/> with loggers
+
+### Refactor
+
+ - <csr-id-b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8/> move dagger-rs and adopt workspace.deps
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 8 commits contributed to the release over the course of 19 calendar days.
+ - 23 days passed between releases.
+ - 7 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 3 unique issues were worked on: [#46](https://github.com/kjuulh/dagger-sdk/issues/46), [#48](https://github.com/kjuulh/dagger-sdk/issues/48), [#51](https://github.com/kjuulh/dagger-sdk/issues/51)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#46](https://github.com/kjuulh/dagger-sdk/issues/46)**
+    - with multi platform ci ([`2faabb0`](https://github.com/kjuulh/dagger-sdk/commit/2faabb0e502a9b15c88b0bdf5673d1b458198d70))
+ * **[#48](https://github.com/kjuulh/dagger-sdk/issues/48)**
+    - extract client ([`11d2093`](https://github.com/kjuulh/dagger-sdk/commit/11d20935c697e28caaa671e8da0e70a99d4310fc))
+ * **[#51](https://github.com/kjuulh/dagger-sdk/issues/51)**
+    - add musl ci ([`b094ae4`](https://github.com/kjuulh/dagger-sdk/commit/b094ae4f539a880b0bde12841b7db1fbfcc0f123))
+ * **Uncategorized**
+    - Release dagger-core v0.2.9, dagger-sdk v0.2.20 ([`f82075c`](https://github.com/kjuulh/dagger-sdk/commit/f82075c23808073d9500df63c1cd347cd9b99cef))
+    - with 0.4.2 ([`114f411`](https://github.com/kjuulh/dagger-sdk/commit/114f411cdb0e1043071c0ccc1768d344f78d4fcb))
+    - rename projects to point to github/kjuulh/dagger-sdk ([`384294b`](https://github.com/kjuulh/dagger-sdk/commit/384294b39038123b02c406a1038105b111c3b9be))
+    - with loggers ([`79d931e`](https://github.com/kjuulh/dagger-sdk/commit/79d931e908c58a0464fd9cf7d6ef02eb50f14c23))
+    - move dagger-rs and adopt workspace.deps ([`b55bcc1`](https://github.com/kjuulh/dagger-sdk/commit/b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8))
+</details>
+
+## v0.2.8 (2023-03-10)
+
+### New Features
+
+ - <csr-id-41b20b6268db9d8defe333694e4d3ec019d7c923/> bump version
+ - <csr-id-5f9b3a19c0ab6988bc335b020052074f3f101305/> set internal warnings as errors
+ - <csr-id-f9e7af931d94fbedacf74f5da9a2f71b1992324b/> introduce tests again
+
+### Bug Fixes
+
+ - <csr-id-ecca036bc644fee93fbcb69bf6da9f29169e473e/> fix builder pattern to actually work with default values
+   In previous versions the builder pattern required all values to be set.
+   This has not been fixed, so that default values are allowed.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 5 commits contributed to the release over the course of 13 calendar days.
+ - 13 days passed between releases.
+ - 4 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.8, dagger-sdk v0.2.16 ([`f390eac`](https://github.com/kjuulh/dagger-sdk/commit/f390eac29f1d041d18d2207a5aa0a8d993aab68c))
+    - bump version ([`41b20b6`](https://github.com/kjuulh/dagger-sdk/commit/41b20b6268db9d8defe333694e4d3ec019d7c923))
+    - set internal warnings as errors ([`5f9b3a1`](https://github.com/kjuulh/dagger-sdk/commit/5f9b3a19c0ab6988bc335b020052074f3f101305))
+    - introduce tests again ([`f9e7af9`](https://github.com/kjuulh/dagger-sdk/commit/f9e7af931d94fbedacf74f5da9a2f71b1992324b))
+    - fix builder pattern to actually work with default values ([`ecca036`](https://github.com/kjuulh/dagger-sdk/commit/ecca036bc644fee93fbcb69bf6da9f29169e473e))
+</details>
+
+## v0.2.7 (2023-02-24)
+
+### New Features
+
+ - <csr-id-3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f/> update to dagger-v0.3.13
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 4 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.7, dagger-sdk v0.2.15 ([`6a9a560`](https://github.com/kjuulh/dagger-sdk/commit/6a9a560cdca097abf23371d44599a2f1b726ae7f))
+    - update to dagger-v0.3.13 ([`3e8ca8d`](https://github.com/kjuulh/dagger-sdk/commit/3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f))
+</details>
+
+## v0.2.6 (2023-02-20)
+
+<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
+
+### Chore
+
+ - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
+
+### Bug Fixes
+
+ - <csr-id-8dfecf976c5537cc2c03881de2b2fd2b2508683a/> cli session keep session alive
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 3 commits contributed to the release.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.6, dagger-codegen v0.2.7, dagger-sdk v0.2.12 ([`7179f8b`](https://github.com/kjuulh/dagger-sdk/commit/7179f8b598ef04e62925e39d3f55740253c01686))
+    - ran clippy ([`1f77d90`](https://github.com/kjuulh/dagger-sdk/commit/1f77d90c0f0ac832a181b2322350ea395612986c))
+    - cli session keep session alive ([`8dfecf9`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/1725c5188e8a81069ec4a4de569484c921a94927))
+    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
+    - remove blocking ([`921e61b`](https://github.com/kjuulh/dagger-sdk/commit/921e61b5e248013cb5fbf4f1bad3eef5a2673145))
+    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-sdk/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
+    - remove blocking ([`8385aa8`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/82de43aa91d6a5e09a247d1959137fdc36a40d35))
+    - Fix async panic on blocking #19 ([`75bc17e`](https://github.com/kjuulh/dagger-sdk/commit/75bc17e57db222492c6ffd2dfe80208d2bda75c9))
+</details>
+
 ## v0.2.2 (2023-02-19)
 
 ### New Features
@@ -15,7 +291,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 1 commit contributed to the release.
+ - 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
 
@@ -26,7 +302,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-rs/commit/6e5f4074329ab0462445b31d4153f8497c483438))
+    - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-sdk/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
+    - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-sdk/commit/6e5f4074329ab0462445b31d4153f8497c483438))
 </details>
 
 ## v0.2.1 (2023-02-18)
@@ -41,7 +318,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
  - 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)
+ - 2 unique issues were worked on: [#5](https://github.com/kjuulh/dagger-sdk/issues/5), [#6](https://github.com/kjuulh/dagger-sdk/issues/6)
 
 ### Commit Details
 
@@ -49,24 +326,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <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))
+ * **[#5](https://github.com/kjuulh/dagger-sdk/issues/5)**
+    - update all dependencies ([`789b0e6`](https://github.com/kjuulh/dagger-sdk/commit/789b0e69c8c53d0e86d9cec89ab5345507aad514))
+ * **[#6](https://github.com/kjuulh/dagger-sdk/issues/6)**
+    - feature/add impl ([`4a4c03f`](https://github.com/kjuulh/dagger-sdk/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))
+    - Release dagger-core v0.2.1, dagger-codegen v0.2.1, dagger-rs v0.2.1 ([`1332bc8`](https://github.com/kjuulh/dagger-sdk/commit/1332bc842ce2ea0254c651419813b63b36ca590c))
+    - add changelogs ([`a064684`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/f4a20fda79063b29829cc899793775ba8cb17214))
+    - with publish ([`989d5bc`](https://github.com/kjuulh/dagger-sdk/commit/989d5bc26036d46a199d939b5cbbe72aff2f8fb1))
+    - with repo ([`e5383b5`](https://github.com/kjuulh/dagger-sdk/commit/e5383b51f3b290a87b729929c377e93bda3873e0))
+    - with readme and license ([`1e26b38`](https://github.com/kjuulh/dagger-sdk/commit/1e26b383d4f6dbcbe20f5f7c19c749e743f6e607))
+    - bump version ([`36b0ecd`](https://github.com/kjuulh/dagger-sdk/commit/36b0ecdabf4c220cffb2d0660fb6480387e3249a))
+    - with println ([`d1726a0`](https://github.com/kjuulh/dagger-sdk/commit/d1726a052a6dc4e57f364864446cab3cbda7e0bf))
+    - context and querier done ([`52a0db3`](https://github.com/kjuulh/dagger-sdk/commit/52a0db3e311f9f88447882f1406701d4cd612b1c))
+    - tested full flow initially ([`7a008be`](https://github.com/kjuulh/dagger-sdk/commit/7a008be59e5ca183809e5840cdfae1d87665aa20))
+    - move code to dagger-core ([`ec0d0b2`](https://github.com/kjuulh/dagger-sdk/commit/ec0d0b22e646c97acb3ce93f3afb3ddb8590e68f))
+    - add fields ([`496a687`](https://github.com/kjuulh/dagger-sdk/commit/496a687bc34f7c58cc86df60c183be741b0b8a9c))
+    - with objects ([`5fef514`](https://github.com/kjuulh/dagger-sdk/commit/5fef5148010f384d0158361d64b8e17d357d4819))
+    - with enum ([`2a1f7c3`](https://github.com/kjuulh/dagger-sdk/commit/2a1f7c3f2666f1f4caebf7c22707709741c2cfad))
 </details>
 

crates/dagger-core/Cargo.toml

@@ -1,31 +1,39 @@
 [package]
 name = "dagger-core"
-version = "0.2.2"
+version = "0.2.11"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
 description = "dagger sdk core library"
-repository = "https://github.com/kjuulh/dagger-rs"
+repository = "https://github.com/kjuulh/dagger-sdk"
 publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "4.1.6"
+eyre = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+thiserror.workspace = true
+
+base64 = "0.21.0"
 dirs = "4.0.0"
-eyre = "0.6.8"
-flate2 = { version = "1.0.25", features = ["zlib"] }
-genco = "0.17.3"
-graphql-introspection-query = "0.2.0"
+flate2 = { version = "1.0.25", features = ["rust_backend"] }
 graphql_client = { version = "0.12.0", features = [
-  "reqwest",
-  "reqwest-blocking",
-] }
+  "reqwest-rustls",
+  "graphql_query_derive",
+], default-features = false }
 hex = "0.4.3"
 hex-literal = "0.3.4"
 platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "blocking", "deflate"] }
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = "1.0.93"
+reqwest = { version = "0.11.14", features = [
+  "stream",
+  "rustls-tls",
+], default-features = false }
+
 sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
+async-trait = "0.1.67"

crates/dagger-core/src/cli_session.rs

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

crates/dagger-core/src/config.rs

@@ -1,15 +1,18 @@
 use std::path::PathBuf;
 
+use crate::logger::DynLogger;
+
 pub struct Config {
     pub workdir_path: Option<PathBuf>,
     pub config_path: Option<PathBuf>,
     pub timeout_ms: u64,
     pub execute_timeout_ms: Option<u64>,
+    pub logger: Option<DynLogger>,
 }
 
 impl Default for Config {
     fn default() -> Self {
-        Self::new(None, None, None, None)
+        Self::new(None, None, None, None, None)
     }
 }
 
@@ -19,12 +22,14 @@ impl Config {
         config_path: Option<PathBuf>,
         timeout_ms: Option<u64>,
         execute_timeout_ms: Option<u64>,
+        logger: Option<DynLogger>,
     ) -> Self {
         Self {
             workdir_path,
             config_path,
             timeout_ms: timeout_ms.unwrap_or(10 * 1000),
             execute_timeout_ms,
+            logger,
         }
     }
 }

crates/dagger-core/src/downloader.rs

@@ -1,6 +1,6 @@
 use std::{
     fs::File,
-    io::{copy, Read, Write},
+    io::{copy, Write},
     os::unix::prelude::PermissionsExt,
     path::PathBuf,
 };
@@ -27,6 +27,7 @@ impl Platform {
         let normalize_arch = match arch.as_str() {
             "x86_64" => "amd64",
             "aarch" => "arm64",
+            "aarch64" => "arm64",
             arch => arch,
         };
 
@@ -119,7 +120,7 @@ impl Downloader {
         Ok(path)
     }
 
-    pub fn get_cli(&self) -> eyre::Result<PathBuf> {
+    pub async 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}"));
@@ -130,26 +131,18 @@ impl Downloader {
         if !cli_bin_path.exists() {
             cli_bin_path = self
                 .download(cli_bin_path)
+                .await
                 .context("failed to download CLI from archive")?;
         }
 
-        for file in self.cache_dir()?.read_dir()? {
-            if let Ok(entry) = file {
-                let path = entry.path();
-                if path != cli_bin_path {
-                    std::fs::remove_file(path)?;
-                }
-            }
-        }
-
         Ok(cli_bin_path)
     }
 
-    fn download(&self, path: PathBuf) -> eyre::Result<PathBuf> {
-        let expected_checksum = self.expected_checksum()?;
+    async fn download(&self, path: PathBuf) -> eyre::Result<PathBuf> {
+        let expected_checksum = self.expected_checksum().await?;
 
         let mut bytes = vec![];
-        let actual_hash = self.extract_cli_archive(&mut bytes)?;
+        let actual_hash = self.extract_cli_archive(&mut bytes).await?;
 
         if expected_checksum != actual_hash {
             eyre::bail!("downloaded CLI binary checksum doesn't match checksum from checksums.txt")
@@ -165,15 +158,15 @@ impl Downloader {
         Ok(path)
     }
 
-    fn expected_checksum(&self) -> eyre::Result<String> {
+    async 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::blocking::get(self.checksum_url())?;
+        let resp = reqwest::get(self.checksum_url()).await?;
         let resp = resp.error_for_status()?;
-        for line in resp.text()?.lines() {
+        for line in resp.text().await?.lines() {
             let mut content = line.split_whitespace();
             let checksum = content
                 .next()
@@ -190,26 +183,20 @@ impl Downloader {
         eyre::bail!("could not find a matching version or binary in checksums.txt")
     }
 
-    pub fn extract_cli_archive(&self, dest: &mut Vec<u8>) -> eyre::Result<String> {
+    pub async fn extract_cli_archive(&self, dest: &mut Vec<u8>) -> eyre::Result<String> {
         let archive_url = self.archive_url();
-        let resp = reqwest::blocking::get(&archive_url)?;
-        let mut resp = resp.error_for_status()?;
-        let mut bytes = vec![];
-        let lines = resp.read_to_end(&mut bytes)?;
-        if lines == 0 {
-            eyre::bail!("nothing was downloaded")
-        }
+        let resp = reqwest::get(&archive_url).await?;
+        let resp = resp.error_for_status()?;
+        let bytes = resp.bytes().await?;
         let mut hasher = sha2::Sha256::new();
-        hasher.update(bytes.as_slice());
+        hasher.update(&bytes);
         let res = hasher.finalize();
 
-        println!("{}", hex::encode(&res));
-
         if archive_url.ends_with(".zip") {
             // TODO:  Nothing for now
             todo!()
         } else {
-            self.extract_from_tar(bytes.as_slice(), dest)?;
+            self.extract_from_tar(&bytes, dest)?;
         }
 
         Ok(hex::encode(res))
@@ -223,8 +210,6 @@ impl Downloader {
             let mut entry = entry?;
             let path = entry.path()?;
 
-            println!("path: {:?}", path);
-
             if path.ends_with("dagger") {
                 copy(&mut entry, output)?;
 
@@ -240,9 +225,13 @@ impl Downloader {
 mod test {
     use super::Downloader;
 
-    #[test]
-    fn download() {
-        let cli_path = Downloader::new("0.3.10".into()).unwrap().get_cli().unwrap();
+    #[tokio::test]
+    async fn download() {
+        let cli_path = Downloader::new("0.3.10".into())
+            .unwrap()
+            .get_cli()
+            .await
+            .unwrap();
 
         assert_eq!(
             Some("dagger-0.3.10"),

crates/dagger-core/src/engine.rs

@@ -1,5 +1,4 @@
-use std::process::Child;
-
+use crate::DAGGER_ENGINE_VERSION;
 use crate::{
     cli_session::CliSession, config::Config, connect_params::ConnectParams, downloader::Downloader,
 };
@@ -11,38 +10,38 @@ impl Engine {
         Self {}
     }
 
-    fn from_cli(&self, cfg: &Config) -> eyre::Result<(ConnectParams, Child)> {
-        let cli = Downloader::new("0.3.12".into())?.get_cli()?;
+    async fn from_cli(&self, cfg: &Config) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+        let cli = Downloader::new(DAGGER_ENGINE_VERSION.into())?
+            .get_cli()
+            .await?;
 
         let cli_session = CliSession::new();
 
-        Ok(cli_session.connect(cfg, &cli)?)
+        Ok(cli_session.connect(cfg, &cli).await?)
     }
 
-    pub fn start(&self, cfg: &Config) -> eyre::Result<(ConnectParams, Child)> {
-        // TODO: Add from existing session as well
-        self.from_cli(cfg)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{config::Config, connect_params::ConnectParams};
-
-    use super::Engine;
-
-    // TODO: these tests potentially have a race condition
-    #[test]
-    fn engine_can_start() {
-        let engine = Engine::new();
-        let params = engine.start(&Config::new(None, None, None, None)).unwrap();
-
-        assert_ne!(
-            params.0,
-            ConnectParams {
-                port: 123,
-                session_token: "123".into()
-            }
-        )
+    pub async fn start(
+        &self,
+        cfg: &Config,
+    ) -> eyre::Result<(ConnectParams, Option<tokio::process::Child>)> {
+        tracing::info!("starting dagger-engine");
+
+        if let Ok(conn) = self.from_session_env().await {
+            return Ok((conn, None));
+        }
+
+        let (conn, proc) = self.from_cli(cfg).await?;
+
+        Ok((conn, Some(proc)))
+    }
+
+    async fn from_session_env(&self) -> eyre::Result<ConnectParams> {
+        let port = std::env::var("DAGGER_SESSION_PORT").map(|p| p.parse::<u64>())??;
+        let token = std::env::var("DAGGER_SESSION_TOKEN")?;
+
+        Ok(ConnectParams {
+            port,
+            session_token: token,
+        })
     }
 }

crates/dagger-core/src/gql_client.rs

@@ -0,0 +1,375 @@
+use reqwest::Error;
+use reqwest::{Client, Url};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::fmt::{self, Formatter};
+use std::str::FromStr;
+
+#[derive(Clone)]
+pub struct GraphQLError {
+    message: String,
+    json: Option<Vec<GraphQLErrorMessage>>,
+}
+
+// https://spec.graphql.org/June2018/#sec-Errors
+#[derive(Deserialize, Debug, Clone)]
+#[allow(dead_code)]
+pub struct GraphQLErrorMessage {
+    pub message: String,
+    locations: Option<Vec<GraphQLErrorLocation>>,
+    extensions: Option<HashMap<String, String>>,
+    path: Option<Vec<GraphQLErrorPathParam>>,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+#[allow(dead_code)]
+pub struct GraphQLErrorLocation {
+    line: u32,
+    column: u32,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+#[serde(untagged)]
+pub enum GraphQLErrorPathParam {
+    String(String),
+    Number(u32),
+}
+
+impl GraphQLError {
+    pub fn with_text(message: impl AsRef<str>) -> Self {
+        Self {
+            message: message.as_ref().to_string(),
+            json: None,
+        }
+    }
+
+    pub fn with_message_and_json(message: impl AsRef<str>, json: Vec<GraphQLErrorMessage>) -> Self {
+        Self {
+            message: message.as_ref().to_string(),
+            json: Some(json),
+        }
+    }
+
+    pub fn with_json(json: Vec<GraphQLErrorMessage>) -> Self {
+        Self::with_message_and_json("Look at json field for more details", json)
+    }
+
+    pub fn message(&self) -> &str {
+        &self.message
+    }
+
+    pub fn json(&self) -> Option<Vec<GraphQLErrorMessage>> {
+        self.json.clone()
+    }
+}
+
+fn format(err: &GraphQLError, f: &mut Formatter<'_>) -> fmt::Result {
+    // Print the main error message
+    writeln!(f, "\nGQLClient Error: {}", err.message)?;
+
+    // Check if query errors have been received
+    if err.json.is_none() {
+        return Ok(());
+    }
+
+    let errors = err.json.as_ref();
+
+    for err in errors.unwrap() {
+        writeln!(f, "Message: {}", err.message)?;
+    }
+
+    Ok(())
+}
+
+impl fmt::Display for GraphQLError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        format(self, f)
+    }
+}
+
+impl fmt::Debug for GraphQLError {
+    #[allow(clippy::needless_borrow)]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        format(&self, f)
+    }
+}
+
+impl From<Error> for GraphQLError {
+    fn from(error: Error) -> Self {
+        Self {
+            message: error.to_string(),
+            json: None,
+        }
+    }
+}
+
+/// GQL client config
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ClientConfig {
+    /// the endpoint about graphql server
+    pub endpoint: String,
+    /// gql query timeout, unit: seconds
+    pub timeout: Option<u64>,
+    /// additional request header
+    pub headers: Option<HashMap<String, String>>,
+    /// request proxy
+    pub proxy: Option<GQLProxy>,
+}
+
+/// proxy type
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum ProxyType {
+    Http,
+    Https,
+    All,
+}
+
+/// proxy auth, basic_auth
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ProxyAuth {
+    pub username: String,
+    pub password: String,
+}
+
+/// request proxy
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct GQLProxy {
+    /// schema, proxy url
+    pub schema: String,
+    /// proxy type
+    pub type_: ProxyType,
+    /// auth
+    pub auth: Option<ProxyAuth>,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl TryFrom<GQLProxy> for reqwest::Proxy {
+    type Error = GraphQLError;
+
+    fn try_from(gql_proxy: GQLProxy) -> Result<Self, Self::Error> {
+        let proxy = match gql_proxy.type_ {
+            ProxyType::Http => reqwest::Proxy::http(gql_proxy.schema),
+            ProxyType::Https => reqwest::Proxy::https(gql_proxy.schema),
+            ProxyType::All => reqwest::Proxy::all(gql_proxy.schema),
+        }
+        .map_err(|e| Self::Error::with_text(format!("{:?}", e)))?;
+        Ok(proxy)
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct GQLClient {
+    config: ClientConfig,
+}
+
+#[derive(Serialize)]
+struct RequestBody<T: Serialize> {
+    query: String,
+    variables: T,
+}
+
+#[derive(Deserialize, Debug)]
+struct GraphQLResponse<T> {
+    data: Option<T>,
+    errors: Option<Vec<GraphQLErrorMessage>>,
+}
+
+impl GQLClient {
+    fn client(&self) -> Result<Client, GraphQLError> {
+        let mut builder = Client::builder().timeout(std::time::Duration::from_secs(
+            self.config.timeout.unwrap_or(5),
+        ));
+        if let Some(proxy) = &self.config.proxy {
+            builder = builder.proxy(proxy.clone().try_into()?);
+        }
+        builder
+            .build()
+            .map_err(|e| GraphQLError::with_text(format!("Can not create client: {:?}", e)))
+    }
+}
+
+impl GQLClient {
+    pub fn new(endpoint: impl AsRef<str>) -> Self {
+        Self {
+            config: ClientConfig {
+                endpoint: endpoint.as_ref().to_string(),
+                timeout: None,
+                headers: Default::default(),
+                proxy: None,
+            },
+        }
+    }
+
+    pub fn new_with_headers(
+        endpoint: impl AsRef<str>,
+        headers: HashMap<impl ToString, impl ToString>,
+    ) -> Self {
+        let _headers: HashMap<String, String> = headers
+            .iter()
+            .map(|(name, value)| (name.to_string(), value.to_string()))
+            .into_iter()
+            .collect();
+        Self {
+            config: ClientConfig {
+                endpoint: endpoint.as_ref().to_string(),
+                timeout: None,
+                headers: Some(_headers),
+                proxy: None,
+            },
+        }
+    }
+
+    pub fn new_with_config(config: ClientConfig) -> Self {
+        Self { config }
+    }
+}
+
+impl GQLClient {
+    pub async fn query<K>(&self, query: &str) -> Result<Option<K>, GraphQLError>
+    where
+        K: for<'de> Deserialize<'de>,
+    {
+        self.query_with_vars::<K, ()>(query, ()).await
+    }
+
+    pub async fn query_unwrap<K>(&self, query: &str) -> Result<K, GraphQLError>
+    where
+        K: for<'de> Deserialize<'de>,
+    {
+        self.query_with_vars_unwrap::<K, ()>(query, ()).await
+    }
+
+    pub async fn query_with_vars_unwrap<K, T: Serialize>(
+        &self,
+        query: &str,
+        variables: T,
+    ) -> Result<K, GraphQLError>
+    where
+        K: for<'de> Deserialize<'de>,
+    {
+        match self.query_with_vars(query, variables).await? {
+            Some(v) => Ok(v),
+            None => Err(GraphQLError::with_text(format!(
+                "No data from graphql server({}) for this query",
+                self.config.endpoint
+            ))),
+        }
+    }
+
+    pub async fn query_with_vars<K, T: Serialize>(
+        &self,
+        query: &str,
+        variables: T,
+    ) -> Result<Option<K>, GraphQLError>
+    where
+        K: for<'de> Deserialize<'de>,
+    {
+        self.query_with_vars_by_endpoint(&self.config.endpoint, query, variables)
+            .await
+    }
+
+    async fn query_with_vars_by_endpoint<K, T: Serialize>(
+        &self,
+        endpoint: impl AsRef<str>,
+        query: &str,
+        variables: T,
+    ) -> Result<Option<K>, GraphQLError>
+    where
+        K: for<'de> Deserialize<'de>,
+    {
+        let mut times = 1;
+        let mut endpoint = endpoint.as_ref().to_string();
+        let endpoint_url = Url::from_str(&endpoint).map_err(|e| {
+            GraphQLError::with_text(format!("Wrong endpoint: {}. {:?}", endpoint, e))
+        })?;
+        let schema = endpoint_url.scheme();
+        let host = endpoint_url
+            .host()
+            .ok_or_else(|| GraphQLError::with_text(format!("Wrong endpoint: {}", endpoint)))?;
+
+        let client: Client = self.client()?;
+        let body = RequestBody {
+            query: query.to_string(),
+            variables,
+        };
+
+        loop {
+            if times > 10 {
+                return Err(GraphQLError::with_text(format!(
+                    "Many redirect location: {}",
+                    endpoint
+                )));
+            }
+
+            let mut request = client.post(&endpoint).json(&body);
+            if let Some(headers) = &self.config.headers {
+                if !headers.is_empty() {
+                    for (name, value) in headers {
+                        request = request.header(name, value);
+                    }
+                }
+            }
+
+            let raw_response = request.send().await?;
+            if let Some(location) = raw_response.headers().get(reqwest::header::LOCATION) {
+                let redirect_url = location.to_str().map_err(|e| {
+                    GraphQLError::with_text(format!(
+                        "Failed to parse response header: Location. {:?}",
+                        e
+                    ))
+                })?;
+
+                // if the response location start with http:// or https://
+                if redirect_url.starts_with("http://") || redirect_url.starts_with("https://") {
+                    times += 1;
+                    endpoint = redirect_url.to_string();
+                    continue;
+                }
+
+                // without schema
+                endpoint = if redirect_url.starts_with('/') {
+                    format!("{}://{}{}", schema, host, redirect_url)
+                } else {
+                    format!("{}://{}/{}", schema, host, redirect_url)
+                };
+                times += 1;
+                continue;
+            }
+
+            let status = raw_response.status();
+            let response_body_text = raw_response
+                .text()
+                .await
+                .map_err(|e| GraphQLError::with_text(format!("Can not get response: {:?}", e)))?;
+
+            let json: GraphQLResponse<K> =
+                serde_json::from_str(&response_body_text).map_err(|e| {
+                    GraphQLError::with_text(format!(
+                        "Failed to parse response: {:?}. The response body is: {}",
+                        e, response_body_text
+                    ))
+                })?;
+
+            if !status.is_success() {
+                return Err(GraphQLError::with_message_and_json(
+                    format!("The response is [{}]", status.as_u16()),
+                    json.errors.unwrap_or_default(),
+                ));
+            }
+
+            // Check if error messages have been received
+            if json.errors.is_some() {
+                return Err(GraphQLError::with_json(json.errors.unwrap_or_default()));
+            }
+            if json.data.is_none() {
+                tracing::warn!(
+                    target = "gql-client",
+                    response_text = response_body_text,
+                    "The deserialized data is none, the response",
+                );
+            }
+
+            return Ok(json.data);
+        }
+    }
+}

crates/dagger-core/src/graphql_client.rs

@@ -0,0 +1,90 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use base64::engine::general_purpose;
+use base64::Engine;
+use thiserror::Error;
+
+use crate::connect_params::ConnectParams;
+use crate::gql_client::{ClientConfig, GQLClient};
+
+#[async_trait]
+pub trait GraphQLClient {
+    async fn query(&self, query: &str) -> Result<Option<serde_json::Value>, GraphQLError>;
+}
+
+pub type DynGraphQLClient = Arc<dyn GraphQLClient + Send + Sync>;
+
+#[derive(Debug)]
+pub struct DefaultGraphQLClient {
+    client: GQLClient,
+}
+
+impl DefaultGraphQLClient {
+    pub fn new(conn: &ConnectParams) -> Self {
+        let token = general_purpose::URL_SAFE.encode(format!("{}:", conn.session_token));
+
+        let mut headers = HashMap::new();
+        headers.insert("Authorization".to_string(), format!("Basic {}", token));
+
+        Self {
+            client: GQLClient::new_with_config(ClientConfig {
+                endpoint: conn.url(),
+                timeout: Some(1000),
+                headers: Some(headers),
+                proxy: None,
+            }),
+        }
+    }
+}
+
+#[async_trait]
+impl GraphQLClient for DefaultGraphQLClient {
+    async fn query(&self, query: &str) -> Result<Option<serde_json::Value>, GraphQLError> {
+        let res: Option<serde_json::Value> =
+            self.client.query(&query).await.map_err(map_graphql_error)?;
+
+        return Ok(res);
+    }
+}
+
+fn map_graphql_error(gql_error: crate::gql_client::GraphQLError) -> GraphQLError {
+    let message = gql_error.message().to_string();
+    let json = gql_error.json();
+
+    if let Some(json) = json {
+        if !json.is_empty() {
+            return GraphQLError::DomainError {
+                message,
+                fields: GraphqlErrorMessages(json.into_iter().map(|e| e.message).collect()),
+            };
+        }
+    }
+
+    GraphQLError::HttpError(message)
+}
+
+#[derive(Error, Debug)]
+pub enum GraphQLError {
+    #[error("http error: {0}")]
+    HttpError(String),
+    #[error("domain error:\n{message}\n{fields}")]
+    DomainError {
+        message: String,
+        fields: GraphqlErrorMessages,
+    },
+}
+
+#[derive(Debug, Clone)]
+pub struct GraphqlErrorMessages(Vec<String>);
+
+impl std::fmt::Display for GraphqlErrorMessages {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for error in self.0.iter() {
+            f.write_fmt(format_args!("{error}\n"))?;
+        }
+
+        Ok(())
+    }
+}

crates/dagger-core/src/introspection.rs

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

crates/dagger-core/src/lib.rs

@@ -1,9 +1,16 @@
+#![deny(warnings)]
+
+pub const DAGGER_ENGINE_VERSION: &'static str = "0.5.1";
+
 pub mod cli_session;
 pub mod config;
 pub mod connect_params;
 pub mod downloader;
 pub mod engine;
+pub mod gql_client;
+pub mod graphql_client;
 pub mod introspection;
+pub mod logger;
 pub mod schema;
 pub mod session;
 

crates/dagger-core/src/logger.rs

@@ -0,0 +1,8 @@
+use std::sync::Arc;
+
+pub trait Logger {
+    fn stdout(&self, output: &str) -> eyre::Result<()>;
+    fn stderr(&self, output: &str) -> eyre::Result<()>;
+}
+
+pub type DynLogger = Arc<dyn Logger + Send + Sync>;

crates/dagger-core/src/schema.rs

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

crates/dagger-core/src/session.rs

@@ -1,7 +1,7 @@
 use graphql_client::GraphQLQuery;
 use reqwest::{
-    blocking::{Client, RequestBuilder},
     header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE},
+    Client, RequestBuilder,
 };
 
 use crate::{config::Config, connect_params::ConnectParams, introspection::IntrospectionResponse};
@@ -37,14 +37,14 @@ impl Session {
         Ok(req_builder)
     }
 
-    pub fn schema(&self, req_builder: RequestBuilder) -> eyre::Result<IntrospectionResponse> {
+    pub async 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()?;
+        let res = req_builder.json(&request_body).send().await?;
 
         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() {
+            let error_message = match res.text().await {
                 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()?;
+        let json: IntrospectionResponse = res.json().await?;
 
         Ok(json)
     }

crates/dagger-sdk/CHANGELOG.md

@@ -3,17 +3,541 @@
 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).
+and this project adheres to
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.2 (2023-02-19)
+## v0.2.22 (2023-04-29)
 
 ### New Features
 
- - <csr-id-6e5f4074329ab0462445b31d4153f8497c483438/> update to dagger v0.3.12
+ - <csr-id-2a29a66217fa4d6c530ea1ce670c8836383e7051/> dagger-run support
+ - <csr-id-eb7470c604169d1a15976078c0889d5cc7011257/> update to dagger-5.1
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 4 days passed between releases.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - dagger-run support ([`2a29a66`](https://github.com/kjuulh/dagger-sdk/commit/2a29a66217fa4d6c530ea1ce670c8836383e7051))
+    - update to dagger-5.1 ([`eb7470c`](https://github.com/kjuulh/dagger-sdk/commit/eb7470c604169d1a15976078c0889d5cc7011257))
+</details>
+
+## v0.2.21 (2023-04-25)
+
+<csr-id-09881ee39bdfb9201d104e4679a51c3b76b5fe27/>
+
+### Chore
+
+ - <csr-id-09881ee39bdfb9201d104e4679a51c3b76b5fe27/> add new dagger-core-version
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 21 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-sdk v0.2.21 ([`6937ef0`](https://github.com/kjuulh/dagger-sdk/commit/6937ef0ace797315013513aa7e2af39a9206a738))
+    - add new dagger-core-version ([`09881ee`](https://github.com/kjuulh/dagger-sdk/commit/09881ee39bdfb9201d104e4679a51c3b76b5fe27))
+</details>
+
+## v0.2.20 (2023-04-03)
+
+<csr-id-ea27fa8168cc54b20fac87c016f479061c6eda91/>
+<csr-id-6ef4bdf587e4aea290b722e7a0aed3184e72d6bb/>
+<csr-id-b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8/>
+
+### Chore
+
+ - <csr-id-ea27fa8168cc54b20fac87c016f479061c6eda91/> fmt
+
+### New Features
+
+ - <csr-id-9ea18700e78a7ee09f43e6976b0339dfc2747458/> with gen
+ - <csr-id-11d20935c697e28caaa671e8da0e70a99d4310fc/> extract client
+   This extracts the client (strategy pattern), this is so that it is will be possible to test the actual querier, without hitting / requiring the dagger-engine running.
+ - <csr-id-384294b39038123b02c406a1038105b111c3b9be/> rename projects to point to github/kjuulh/dagger-sdk
+ - <csr-id-79d931e908c58a0464fd9cf7d6ef02eb50f14c23/> with loggers
 
 ### Bug Fixes
 
- - <csr-id-10bc6f3846b65cc82c2fb343d8cfe921784bef1b/> fixed fmt errors
+ - <csr-id-696007cf45ccbdfc1b8eb45e726940a040f52494/> update rust crate futures to 0.3.28
+ - <csr-id-756a0805336d477f33e7868570a89a86fc14c1dd/> stable input fields and args
+ - <csr-id-71f98d0293a773df3917f13174273c536854a197/> stable enum entries
+
+### Refactor
+
+ - <csr-id-6ef4bdf587e4aea290b722e7a0aed3184e72d6bb/> add basic cargo make gen command
+ - <csr-id-b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8/> move dagger-rs and adopt workspace.deps
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 11 commits contributed to the release over the course of 19 calendar days.
+ - 20 days passed between releases.
+ - 10 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#48](https://github.com/kjuulh/dagger-sdk/issues/48)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#48](https://github.com/kjuulh/dagger-sdk/issues/48)**
+    - extract client ([`11d2093`](https://github.com/kjuulh/dagger-sdk/commit/11d20935c697e28caaa671e8da0e70a99d4310fc))
+ * **Uncategorized**
+    - Release dagger-core v0.2.9, dagger-sdk v0.2.20 ([`f82075c`](https://github.com/kjuulh/dagger-sdk/commit/f82075c23808073d9500df63c1cd347cd9b99cef))
+    - with gen ([`9ea1870`](https://github.com/kjuulh/dagger-sdk/commit/9ea18700e78a7ee09f43e6976b0339dfc2747458))
+    - update rust crate futures to 0.3.28 ([`696007c`](https://github.com/kjuulh/dagger-sdk/commit/696007cf45ccbdfc1b8eb45e726940a040f52494))
+    - rename projects to point to github/kjuulh/dagger-sdk ([`384294b`](https://github.com/kjuulh/dagger-sdk/commit/384294b39038123b02c406a1038105b111c3b9be))
+    - with loggers ([`79d931e`](https://github.com/kjuulh/dagger-sdk/commit/79d931e908c58a0464fd9cf7d6ef02eb50f14c23))
+    - stable input fields and args ([`756a080`](https://github.com/kjuulh/dagger-sdk/commit/756a0805336d477f33e7868570a89a86fc14c1dd))
+    - fmt ([`ea27fa8`](https://github.com/kjuulh/dagger-sdk/commit/ea27fa8168cc54b20fac87c016f479061c6eda91))
+    - stable enum entries ([`71f98d0`](https://github.com/kjuulh/dagger-sdk/commit/71f98d0293a773df3917f13174273c536854a197))
+    - add basic cargo make gen command ([`6ef4bdf`](https://github.com/kjuulh/dagger-sdk/commit/6ef4bdf587e4aea290b722e7a0aed3184e72d6bb))
+    - move dagger-rs and adopt workspace.deps ([`b55bcc1`](https://github.com/kjuulh/dagger-sdk/commit/b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8))
+</details>
+
+## v0.2.19 (2023-03-14)
+
+<csr-id-6629d2db4fbc7cdba9b2e4a241e4b0a2592cf384/>
+
+### Chore
+
+ - <csr-id-6629d2db4fbc7cdba9b2e4a241e4b0a2592cf384/> fix release version
+
+### Bug Fixes
+
+ - <csr-id-8fd6bb983ef00b1aa2cf1ba3088028329033c38f/> serialization of enum args for graphql
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 3 commits contributed to the release.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#34](https://github.com/kjuulh/dagger-sdk/issues/34)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#34](https://github.com/kjuulh/dagger-sdk/issues/34)**
+    - serialization of enum args for graphql ([`8fd6bb9`](https://github.com/kjuulh/dagger-sdk/commit/8fd6bb983ef00b1aa2cf1ba3088028329033c38f))
+ * **Uncategorized**
+    - Release dagger-sdk v0.2.19 ([`76fab3f`](https://github.com/kjuulh/dagger-sdk/commit/76fab3f4662020c33af9b57daed715f6f65a8c7c))
+    - fix release version ([`6629d2d`](https://github.com/kjuulh/dagger-sdk/commit/6629d2db4fbc7cdba9b2e4a241e4b0a2592cf384))
+</details>
+
+## v0.2.17 (2023-03-13)
+
+<csr-id-f67928155f02076cbb41abd4010523879ff3caf1/>
+<csr-id-2cc0231c5f29993081f0f7e15e44cac95a7d6086/>
+<csr-id-9ba01396cb44ee02cf7a16008e3f0bdae9f78754/>
+<csr-id-e9e35edb1cb67eee8cc033212aba3b1888def78f/>
+
+### Bug Fixes
+
+ - <csr-id-1bfd084cd28e2b984c61de7f3f9a065cc41be007/> make sure tests have a command to execute
+ - <csr-id-5593fce2e16e0aa97a2e6843f15d3bb1121048f5/> remove unused imports
+ - <csr-id-c025d1742482d701946c292dcf104421d3cade8e/> add support for String as well
+ - <csr-id-d7317e5cf34ee84a7b092357f5fbb15cd2bae2e3/> add public tuple field and into func
+ - <csr-id-44fa0240f8197f49fdf942b5c3d89079b59195d1/> update rust crate futures to 0.3.27
+
+### Other
+
+ - <csr-id-f67928155f02076cbb41abd4010523879ff3caf1/> initial issue
+
+### Refactor
+
+ - <csr-id-2cc0231c5f29993081f0f7e15e44cac95a7d6086/> remove export and instead use exitcode
+ - <csr-id-9ba01396cb44ee02cf7a16008e3f0bdae9f78754/> move issues to actual tests and refactor
+ - <csr-id-e9e35edb1cb67eee8cc033212aba3b1888def78f/> move issues to another folder
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 10 commits contributed to the release over the course of 2 calendar days.
+ - 2 days passed between releases.
+ - 9 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-sdk v0.2.17 ([`a8e6dde`](https://github.com/kjuulh/dagger-sdk/commit/a8e6dde615029d9a94d159ed84b5373121cd201f))
+    - make sure tests have a command to execute ([`1bfd084`](https://github.com/kjuulh/dagger-sdk/commit/1bfd084cd28e2b984c61de7f3f9a065cc41be007))
+    - remove unused imports ([`5593fce`](https://github.com/kjuulh/dagger-sdk/commit/5593fce2e16e0aa97a2e6843f15d3bb1121048f5))
+    - remove export and instead use exitcode ([`2cc0231`](https://github.com/kjuulh/dagger-sdk/commit/2cc0231c5f29993081f0f7e15e44cac95a7d6086))
+    - move issues to actual tests and refactor ([`9ba0139`](https://github.com/kjuulh/dagger-sdk/commit/9ba01396cb44ee02cf7a16008e3f0bdae9f78754))
+    - add support for String as well ([`c025d17`](https://github.com/kjuulh/dagger-sdk/commit/c025d1742482d701946c292dcf104421d3cade8e))
+    - move issues to another folder ([`e9e35ed`](https://github.com/kjuulh/dagger-sdk/commit/e9e35edb1cb67eee8cc033212aba3b1888def78f))
+    - add public tuple field and into func ([`d7317e5`](https://github.com/kjuulh/dagger-sdk/commit/d7317e5cf34ee84a7b092357f5fbb15cd2bae2e3))
+    - initial issue ([`f679281`](https://github.com/kjuulh/dagger-sdk/commit/f67928155f02076cbb41abd4010523879ff3caf1))
+    - update rust crate futures to 0.3.27 ([`44fa024`](https://github.com/kjuulh/dagger-sdk/commit/44fa0240f8197f49fdf942b5c3d89079b59195d1))
+</details>
+
+## v0.2.16 (2023-03-10)
+
+<csr-id-e642778d9028726dfb07217814e15ad1dd3b83f2/>
+
+### Chore
+
+ - <csr-id-e642778d9028726dfb07217814e15ad1dd3b83f2/> fix tasks
+
+### Documentation
+
+ - <csr-id-13b7805e7e6fcf47e0a1318adcc25b4ab773a3c9/> fix missing await in connect
+
+### New Features
+
+ - <csr-id-7133bfae9508bc5977548e373c49342a1248d6e4/> with dagger-engine v.0.4.0
+ - <csr-id-4381af029521c2cbac9325278d261db79a994657/> add tests to sdk
+ - <csr-id-5f9b3a19c0ab6988bc335b020052074f3f101305/> set internal warnings as errors
+
+### Bug Fixes
+
+ - <csr-id-ecca036bc644fee93fbcb69bf6da9f29169e473e/> fix builder pattern to actually work with default values
+   In previous versions the builder pattern required all values to be set.
+   This has not been fixed, so that default values are allowed.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 7 commits contributed to the release over the course of 13 calendar days.
+ - 13 days passed between releases.
+ - 6 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.8, dagger-sdk v0.2.16 ([`f390eac`](https://github.com/kjuulh/dagger-sdk/commit/f390eac29f1d041d18d2207a5aa0a8d993aab68c))
+    - fix tasks ([`e642778`](https://github.com/kjuulh/dagger-sdk/commit/e642778d9028726dfb07217814e15ad1dd3b83f2))
+    - with dagger-engine v.0.4.0 ([`7133bfa`](https://github.com/kjuulh/dagger-sdk/commit/7133bfae9508bc5977548e373c49342a1248d6e4))
+    - fix missing await in connect ([`13b7805`](https://github.com/kjuulh/dagger-sdk/commit/13b7805e7e6fcf47e0a1318adcc25b4ab773a3c9))
+    - add tests to sdk ([`4381af0`](https://github.com/kjuulh/dagger-sdk/commit/4381af029521c2cbac9325278d261db79a994657))
+    - set internal warnings as errors ([`5f9b3a1`](https://github.com/kjuulh/dagger-sdk/commit/5f9b3a19c0ab6988bc335b020052074f3f101305))
+    - fix builder pattern to actually work with default values ([`ecca036`](https://github.com/kjuulh/dagger-sdk/commit/ecca036bc644fee93fbcb69bf6da9f29169e473e))
+</details>
+
+## v0.2.15 (2023-02-24)
+
+### New Features
+
+ - <csr-id-3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f/> update to dagger-v0.3.13
+
+### Bug Fixes
+
+ - <csr-id-e578b0e371e13bc30ada793b7cd6ebe75ba83a07/> set deserialize on enums as well
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 3 commits contributed to the release.
+ - 2 days passed between releases.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.7, dagger-sdk v0.2.15 ([`6a9a560`](https://github.com/kjuulh/dagger-sdk/commit/6a9a560cdca097abf23371d44599a2f1b726ae7f))
+    - set deserialize on enums as well ([`e578b0e`](https://github.com/kjuulh/dagger-sdk/commit/e578b0e371e13bc30ada793b7cd6ebe75ba83a07))
+    - update to dagger-v0.3.13 ([`3e8ca8d`](https://github.com/kjuulh/dagger-sdk/commit/3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f))
+</details>
+
+## v0.2.14 (2023-02-22)
+
+<csr-id-e331ca003546f4ebe00f33b65c3b45c6b0586514/>
+
+### Chore
+
+ - <csr-id-e331ca003546f4ebe00f33b65c3b45c6b0586514/> fix whitespace
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-sdk v0.2.14 ([`88b055c`](https://github.com/kjuulh/dagger-sdk/commit/88b055cb47d3d474e2c37d8fa8259df5faad9da5))
+    - fix whitespace ([`e331ca0`](https://github.com/kjuulh/dagger-sdk/commit/e331ca003546f4ebe00f33b65c3b45c6b0586514))
+</details>
+
+## v0.2.13 (2023-02-22)
+
+<csr-id-7c3654d276bb5f66e692a210cb60cdf46b19e226/>
+<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
+
+### Chore
+
+ - <csr-id-7c3654d276bb5f66e692a210cb60cdf46b19e226/> ran clippy
+ - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
+
+### New Features
+
+ - <csr-id-266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c/> with clone
+
+### Bug Fixes
+
+ - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 7 commits contributed to the release over the course of 2 calendar days.
+ - 2 days passed between releases.
+ - 4 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-codegen v0.2.8, dagger-sdk v0.2.13 ([`456f483`](https://github.com/kjuulh/dagger-sdk/commit/456f48389b5514d7f743a600a7732fb02dd87418))
+    - ran clippy ([`7c3654d`](https://github.com/kjuulh/dagger-sdk/commit/7c3654d276bb5f66e692a210cb60cdf46b19e226))
+    - with clone ([`266ad32`](https://github.com/kjuulh/dagger-sdk/commit/266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c))
+    - Release dagger-core v0.2.6, dagger-codegen v0.2.7, dagger-sdk v0.2.12 ([`7179f8b`](https://github.com/kjuulh/dagger-sdk/commit/7179f8b598ef04e62925e39d3f55740253c01686))
+    - ran clippy ([`1f77d90`](https://github.com/kjuulh/dagger-sdk/commit/1f77d90c0f0ac832a181b2322350ea395612986c))
+    - Release dagger-core v0.2.5, dagger-sdk v0.2.12, dagger-codegen v0.2.7 ([`1725c51`](https://github.com/kjuulh/dagger-sdk/commit/1725c5188e8a81069ec4a4de569484c921a94927))
+    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
+    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-sdk/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
+    - ran clippy ([`803cfc4`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/5cb97296b61677fb37e4bdb8519d30a484f93621))
+    - changelog ([`b100285`](https://github.com/kjuulh/dagger-sdk/commit/b100285312df522218bfd4bc00bbf41b857a81bf))
+    - Adjusting changelogs prior to release of dagger-sdk v0.2.10 ([`8ed0647`](https://github.com/kjuulh/dagger-sdk/commit/8ed06476e56f3290a419d2a67e7f25da575c63ad))
+    - update changelog ([`09aa658`](https://github.com/kjuulh/dagger-sdk/commit/09aa658b6fb3c1e9a2de668c4a69bbe5be13202f))
+    - Adjusting changelogs prior to release of dagger-sdk v0.2.10 ([`b436f27`](https://github.com/kjuulh/dagger-sdk/commit/b436f27a535f085bb8a4e66c7c4b3df461e74c21))
+    - Adjusting changelogs prior to release of dagger-sdk v0.2.10, dagger-rs v0.2.10 ([`577a293`](https://github.com/kjuulh/dagger-sdk/commit/577a293c6777b9305a4f5fc7c3abee4aff4d74b5))
+    - Adjusting changelogs prior to release of dagger-sdk v0.2.10, dagger-rs v0.2.10 ([`76bb1fc`](https://github.com/kjuulh/dagger-sdk/commit/76bb1fcedd03bd2d3b1e0f841f10325e4a85e108))
+    - Release dagger-rs v0.2.10 ([`dc3487b`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/82de43aa91d6a5e09a247d1959137fdc36a40d35))
+    - Fix async panic on blocking #19 ([`75bc17e`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/04990247ba8e9d0555847f582fef14849dbedebf))
+    - add documentation strings ([`978ede6`](https://github.com/kjuulh/dagger-sdk/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
 
@@ -30,9 +554,191 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-rs/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
-    - 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))
+    - Release dagger-sdk v0.2.7 ([`a1887af`](https://github.com/kjuulh/dagger-sdk/commit/a1887afc8b51f61491ba7f13c5e7a5b7619623c4))
+    - change to await syntax ([`93f40b3`](https://github.com/kjuulh/dagger-sdk/commit/93f40b356c48f14e910968516bed9487912095c1))
+    - Use async runtime instead of blocking. ([`9be6f43`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/c312bc57ad3e5380b6a2a927f3bb758aa5344efd))
+    - fix readme ([`04e70ce`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/f72731807d8358fdb3d80432136b7a08bb7b1773))
+    - cargo clippy ([`c627595`](https://github.com/kjuulh/dagger-sdk/commit/c627595fd2695e236924175d137c42f1480ccd6b))
+    - without Some in _opts functions ([`f29ff83`](https://github.com/kjuulh/dagger-sdk/commit/f29ff836cfd72d5e051ca6a71a230ba1e9933091))
+    - with _opts methods ([`9762da8`](https://github.com/kjuulh/dagger-sdk/commit/9762da895a164e30c5dc60e89a83e934ceae47ab))
+    - without phantom data ([`02006d4`](https://github.com/kjuulh/dagger-sdk/commit/02006d40fc2c0383e0412c15c36db9af7eda991f))
+    - move to &str instead of String and introduce builder. ([`94336d0`](https://github.com/kjuulh/dagger-sdk/commit/94336d06378f035464e233b921dc3858070f582d))
+    - dependencies ([`6e2292c`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/cc81124f899f44f80c1ee7d1e23a7e02d8cc4b7c))
+    - readme dagger-rs -> dagger-sdk ([`7d04ab1`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/92350306b3f0da40b4fc6dcaffcd90b891e83f70))
+    - re-export through lib.rs ([`19ed6c2`](https://github.com/kjuulh/dagger-sdk/commit/19ed6c267f779b72430422c463ceed553f6fc618))
+    - with return result instead of unwrap ([`de063ea`](https://github.com/kjuulh/dagger-sdk/commit/de063eae858eb3335d2558a57ee6a88689635200))
+    - remove unnecessary option returns ([`5d66736`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/e921ba13638987ccf5beaa48c4be9be5fd879bd0))
+    - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-sdk/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
+    - fixed fmt errors ([`10bc6f3`](https://github.com/kjuulh/dagger-sdk/commit/10bc6f3846b65cc82c2fb343d8cfe921784bef1b))
+    - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-sdk/commit/6e5f4074329ab0462445b31d4153f8497c483438))
 </details>
 
 ## v0.2.1 (2023-02-18)
@@ -47,7 +753,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
  - 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)
+ - 2 unique issues were worked on: [#5](https://github.com/kjuulh/dagger-sdk/issues/5), [#6](https://github.com/kjuulh/dagger-sdk/issues/6)
 
 ### Commit Details
 
@@ -55,48 +761,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <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))
+ * **[#5](https://github.com/kjuulh/dagger-sdk/issues/5)**
+    - update all dependencies ([`789b0e6`](https://github.com/kjuulh/dagger-sdk/commit/789b0e69c8c53d0e86d9cec89ab5345507aad514))
+ * **[#6](https://github.com/kjuulh/dagger-sdk/issues/6)**
+    - feature/add impl ([`4a4c03f`](https://github.com/kjuulh/dagger-sdk/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))
+    - Release dagger-sdk v0.2.1 ([`aa0c397`](https://github.com/kjuulh/dagger-sdk/commit/aa0c397b15566840eb59ca6186c083f631cc460b))
+    - add dagger-sdk changelog ([`11a5247`](https://github.com/kjuulh/dagger-sdk/commit/11a5247933736bc6a4c5300c29599c88597fefb7))
+    - Release dagger-rs v0.2.7, dagger-sdk v0.2.1 ([`20c7118`](https://github.com/kjuulh/dagger-sdk/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-sdk/commit/f4a20fda79063b29829cc899793775ba8cb17214))
+    - with actual versions ([`7153c24`](https://github.com/kjuulh/dagger-sdk/commit/7153c24f0105a05f170efd10ef2535d83ce0c87e))
+    - with publish ([`989d5bc`](https://github.com/kjuulh/dagger-sdk/commit/989d5bc26036d46a199d939b5cbbe72aff2f8fb1))
+    - with repo ([`e5383b5`](https://github.com/kjuulh/dagger-sdk/commit/e5383b51f3b290a87b729929c377e93bda3873e0))
+    - with wildcard version ([`533b9df`](https://github.com/kjuulh/dagger-sdk/commit/533b9dfef0165c514127a8437d08daf52adf5739))
+    - cargo version 0.2.0 ([`bec62de`](https://github.com/kjuulh/dagger-sdk/commit/bec62de62ff5638428174e232a36eee3ddd0f5ef))
+    - bump version ([`36b0ecd`](https://github.com/kjuulh/dagger-sdk/commit/36b0ecdabf4c220cffb2d0660fb6480387e3249a))
+    - document usage ([`578c2a6`](https://github.com/kjuulh/dagger-sdk/commit/578c2a68830eb40da888823a8770af4a764ed4c7))
+    - fix all clippy ([`6be8482`](https://github.com/kjuulh/dagger-sdk/commit/6be8482b461e098384bbf1371ed7d67b259197fa))
+    - add with dockerfile ([`0cbd179`](https://github.com/kjuulh/dagger-sdk/commit/0cbd1790b0b4030c68f0a0dd619325da26f14f60))
+    - with caching ([`728840c`](https://github.com/kjuulh/dagger-sdk/commit/728840ca8e48b8bec66da4e5fa677bfa60d1d147))
+    - add more quickstart ([`59e2572`](https://github.com/kjuulh/dagger-sdk/commit/59e2572173872c8091a0613a387a01e0cccc51bf))
+    - build the application ([`d894def`](https://github.com/kjuulh/dagger-sdk/commit/d894def70c85ff2fc567bf614e3be6f4134965e2))
+    - add test-the-application ([`cb9a4dd`](https://github.com/kjuulh/dagger-sdk/commit/cb9a4dd84fc13ef03ca3ad539646e95c3c047676))
+    - with println ([`d1726a0`](https://github.com/kjuulh/dagger-sdk/commit/d1726a052a6dc4e57f364864446cab3cbda7e0bf))
+    - unpack response ([`3b5b59b`](https://github.com/kjuulh/dagger-sdk/commit/3b5b59ba1c20cc68218dc5c0af18ff7a78f6953d))
+    - tested full flow initially ([`7a008be`](https://github.com/kjuulh/dagger-sdk/commit/7a008be59e5ca183809e5840cdfae1d87665aa20))
+    - move code to dagger-core ([`ec0d0b2`](https://github.com/kjuulh/dagger-sdk/commit/ec0d0b22e646c97acb3ce93f3afb3ddb8590e68f))
+    - with selection impl default ([`9f0021b`](https://github.com/kjuulh/dagger-sdk/commit/9f0021b7086046c80b3f455f205149e03eb72da2))
+    - fix warnings ([`2b49f9c`](https://github.com/kjuulh/dagger-sdk/commit/2b49f9c19098d96df2bb735253710774b0831c94))
+    - fix test ([`03366b7`](https://github.com/kjuulh/dagger-sdk/commit/03366b7c5b3cce5ec42b5c7655843170236c56a1))
+    - test marshaller ([`c5dfceb`](https://github.com/kjuulh/dagger-sdk/commit/c5dfcebaad9c255b10ba8c6e4d4dba00821c8941))
+    - test marshaller ([`c4ec6f0`](https://github.com/kjuulh/dagger-sdk/commit/c4ec6f0c976ce0af2e05e818731b5e2bed7f0522))
+    - implement sort by name and type ([`d9b51c1`](https://github.com/kjuulh/dagger-sdk/commit/d9b51c1ac90c00fb3af24332b6140e1201bc9be7))
+    - fix optional types for real ([`26069a8`](https://github.com/kjuulh/dagger-sdk/commit/26069a82a69ec7265216c8ddaceb37228dd0fb81))
+    - fix description ([`f4581ba`](https://github.com/kjuulh/dagger-sdk/commit/f4581ba4cd1693a906eaf6c58054398ceae3bfac))
+    - with proper optional types ([`f4a812a`](https://github.com/kjuulh/dagger-sdk/commit/f4a812a7d24e9e09cb4e3cbde56ee0b3ac774b62))
+    - set proper option type ([`8549cfc`](https://github.com/kjuulh/dagger-sdk/commit/8549cfc3a7d9f831febaeadc22db36604e465ea8))
+    - add fields ([`496a687`](https://github.com/kjuulh/dagger-sdk/commit/496a687bc34f7c58cc86df60c183be741b0b8a9c))
+    - add input_fields ([`d2cddff`](https://github.com/kjuulh/dagger-sdk/commit/d2cddff365c636feceb3f20a73df812fcab11a19))
+    - with objects ([`5fef514`](https://github.com/kjuulh/dagger-sdk/commit/5fef5148010f384d0158361d64b8e17d357d4819))
+    - with enum ([`2a1f7c3`](https://github.com/kjuulh/dagger-sdk/commit/2a1f7c3f2666f1f4caebf7c22707709741c2cfad))
+    - with codegen output ([`0bf6b0e`](https://github.com/kjuulh/dagger-sdk/commit/0bf6b0e91ecc31c1f6b51338234137eb185810a0))
+    - split out codegen parts ([`3263f1d`](https://github.com/kjuulh/dagger-sdk/commit/3263f1d589aee78065401c666533cb0cbadd06ce))
+    - add dagger-sdk ([`9dccb83`](https://github.com/kjuulh/dagger-sdk/commit/9dccb83d94a720dd58deffe9f3e5aaea784336f3))
 </details>
 

crates/dagger-sdk/Cargo.toml

@@ -1,27 +1,31 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.2"
+version = "0.2.22"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
 description = "A dagger sdk for rust, written in rust"
-repository = "https://github.com/kjuulh/dagger-rs"
+repository = "https://github.com/kjuulh/dagger-sdk"
 publish = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-base64 = "0.21.0"
-dagger-core = { path = "../dagger-core", version = "^0.2.2" }
-eyre = "0.6.8"
-futures = "0.3.26"
+dagger-core = { workspace = true, version = "^0.2.11" }
 
-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"] }
+eyre = { workspace = true }
+tokio = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tracing.workspace = true
+tracing-subscriber.workspace = true
+thiserror.workspace = true
+
+futures = "0.3.28"
+derive_builder = "0.12.0"
 
 [dev-dependencies]
+pretty_assertions = "1.3.0"
 rand = "0.8.5"
+genco = "0.17.3"
+tracing-test = "0.2.4"

crates/dagger-sdk/README.md

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

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

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

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

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

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

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

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

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

crates/dagger-sdk/examples/logging/app/.gitignore

@@ -0,0 +1,25 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+build-*

crates/dagger-sdk/examples/logging/app/README.md

@@ -0,0 +1,17 @@
+# React Build
+
+This is based on the [Getting Started guide for Nodejs](https://docs.dagger.io/sdk/nodejs/783645/get-started#step-5-test-against-multiple-nodejs-versions)
+
+A simple react app is created with `create-react-app` which is built and tested by `build.js` or `build.ts`.
+
+Run:
+
+`npm install`
+
+and then:
+
+`node --loader ts-node/esm ./build.ts`
+
+or
+
+`node ./build.js`

crates/dagger-sdk/examples/logging/app/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "react-build",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^13.5.0",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^16.18.6",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-scripts": "5.0.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.3",
+    "web-vitals": "^2.1.4"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "type": "module",
+  "devDependencies": {
+    "@dagger.io/dagger": "^0.3.2"
+  }
+}

crates/dagger-sdk/examples/logging/app/public/index.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

crates/dagger-sdk/examples/logging/app/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

crates/dagger-sdk/examples/logging/app/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

crates/dagger-sdk/examples/logging/app/src/App.css

@@ -0,0 +1,38 @@
+.App {
+  text-align: center;
+}
+
+.App-logo {
+  height: 40vmin;
+  pointer-events: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  .App-logo {
+    animation: App-logo-spin infinite 20s linear;
+  }
+}
+
+.App-header {
+  background-color: #282c34;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}
+
+@keyframes App-logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}

crates/dagger-sdk/examples/logging/app/src/App.test.tsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+  render(<App />);
+  const linkElement = screen.getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});

crates/dagger-sdk/examples/logging/app/src/App.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import logo from './logo.svg';
+import './App.css';
+
+function App() {
+  return (
+    <div className="App">
+      <header className="App-header">
+        <img src={logo} className="App-logo" alt="logo" />
+        <p>
+          Edit <code>src/App.tsx</code> and save to reload.
+        </p>
+        <a
+          className="App-link"
+          href="https://reactjs.org"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Learn React
+        </a>
+      </header>
+    </div>
+  );
+}
+
+export default App;

crates/dagger-sdk/examples/logging/app/src/index.css

@@ -0,0 +1,13 @@
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}

crates/dagger-sdk/examples/logging/app/src/index.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import App from './App';
+import reportWebVitals from './reportWebVitals';
+
+const root = ReactDOM.createRoot(
+  document.getElementById('root') as HTMLElement
+);
+root.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>
+);
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();

crates/dagger-sdk/examples/logging/app/src/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

crates/dagger-sdk/examples/logging/app/src/react-app-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="react-scripts" />

crates/dagger-sdk/examples/logging/app/src/reportWebVitals.ts

@@ -0,0 +1,15 @@
+import { ReportHandler } from 'web-vitals';
+
+const reportWebVitals = (onPerfEntry?: ReportHandler) => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;

crates/dagger-sdk/examples/logging/app/src/setupTests.ts

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';

crates/dagger-sdk/examples/logging/app/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": [
+    "src"
+  ]
+}

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

@@ -0,0 +1,49 @@
+use std::sync::Arc;
+
+use dagger_sdk::logging::TracingLogger;
+use dagger_sdk::HostDirectoryOpts;
+
+#[tokio::main]
+async fn main() -> eyre::Result<()> {
+    dagger_sdk::logging::default_logging()?;
+
+    let client = dagger_sdk::connect_opts(dagger_sdk::Config {
+        workdir_path: None,
+        config_path: None,
+        timeout_ms: 1000,
+        execute_timeout_ms: None,
+        logger: Some(Arc::new(TracingLogger::default())),
+    })
+    .await?;
+
+    let host_source_dir = client.host().directory_opts(
+        "examples/build-the-application/app",
+        HostDirectoryOpts {
+            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
+            include: None,
+        },
+    );
+
+    let source = client
+        .container()
+        .from("node:16")
+        .with_mounted_directory("/src", host_source_dir.id().await?);
+
+    let runner = source
+        .with_workdir("/src")
+        .with_exec(vec!["npm", "install"]);
+
+    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
+
+    let build_dir = test
+        .with_exec(vec!["npm", "run", "build"])
+        .directory("./build");
+
+    let _ = build_dir.export("./build");
+
+    let entries = build_dir.entries().await;
+
+    println!("build dir contents: \n {:?}", entries);
+
+    Ok(())
+}

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

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

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

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

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

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

crates/dagger-sdk/src/client.rs

@@ -1,41 +1,34 @@
-use std::collections::HashMap;
 use std::sync::Arc;
 
-use base64::engine::general_purpose;
-use base64::Engine;
-use dagger_core::config::Config;
-use dagger_core::connect_params::ConnectParams;
-use dagger_core::engine::Engine as DaggerEngine;
-use gql_client::ClientConfig;
+use dagger_core::graphql_client::DefaultGraphQLClient;
 
+use dagger_core::config::Config;
+use dagger_core::engine::Engine as DaggerEngine;
+
+use crate::errors::ConnectError;
 use crate::gen::Query;
+use crate::logging::StdLogger;
 use crate::querybuilder::query;
 
 pub type DaggerConn = Arc<Query>;
 
-pub fn connect() -> eyre::Result<DaggerConn> {
-    let cfg = Config::default();
-    let (conn, proc) = DaggerEngine::new().start(&cfg)?;
+pub async fn connect() -> Result<DaggerConn, ConnectError> {
+    let cfg = Config::new(None, None, None, None, Some(Arc::new(StdLogger::default())));
 
-    Ok(Arc::new(Query {
-        conn,
-        proc: Arc::new(proc),
-        selection: query(),
-    }))
+    connect_opts(cfg).await
 }
 
-pub fn graphql_client(conn: &ConnectParams) -> gql_client::Client {
-    let token = general_purpose::URL_SAFE.encode(format!("{}:", conn.session_token));
+pub async fn connect_opts(cfg: Config) -> Result<DaggerConn, ConnectError> {
+    let (conn, proc) = DaggerEngine::new()
+        .start(&cfg)
+        .await
+        .map_err(ConnectError::FailedToConnect)?;
 
-    let mut headers = HashMap::new();
-    headers.insert("Authorization".to_string(), format!("Basic {}", token));
-
-    gql_client::Client::new_with_config(ClientConfig {
-        endpoint: conn.url(),
-        timeout: Some(1000),
-        headers: Some(headers),
-        proxy: None,
-    })
+    Ok(Arc::new(Query {
+        proc: proc.map(|p| Arc::new(p)),
+        selection: query(),
+        graphql_client: Arc::new(DefaultGraphQLClient::new(&conn)),
+    }))
 }
 
 // Conn will automatically close on drop of proc
@@ -44,8 +37,8 @@ pub fn graphql_client(conn: &ConnectParams) -> gql_client::Client {
 mod test {
     use super::connect;
 
-    #[test]
-    fn test_connect() {
-        let _ = connect().unwrap();
+    #[tokio::test]
+    async fn test_connect() {
+        let _ = connect().await.unwrap();
     }
 }

crates/dagger-sdk/src/errors.rs

@@ -0,0 +1,27 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum ConnectError {
+    #[error("failed to connect to dagger engine")]
+    FailedToConnect(#[source] eyre::Error),
+}
+
+#[derive(Error, Debug)]
+pub enum DaggerError {
+    #[error("failed to build dagger internal graph")]
+    Build(#[source] eyre::Error),
+    #[error("failed to parse input type")]
+    Serialize(#[source] eyre::Error),
+    #[error("failed to query dagger engine: {0}")]
+    Query(#[source] dagger_core::graphql_client::GraphQLError),
+    #[error("failed to unpack response")]
+    Unpack(#[source] DaggerUnpackError),
+}
+
+#[derive(Error, Debug)]
+pub enum DaggerUnpackError {
+    #[error("Too many nested objects inside graphql response")]
+    TooManyNestedObjects,
+    #[error("failed to deserialize response")]
+    Deserialize(#[source] serde_json::Error),
+}

crates/dagger-sdk/src/lib.rs

@@ -1,18 +1,11 @@
-pub mod client;
-pub mod gen;
+#![deny(warnings)]
+
+mod client;
+pub mod errors;
+mod gen;
+pub mod logging;
 mod querybuilder;
 
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}
+pub use client::*;
+pub use dagger_core::config::Config;
+pub use gen::*;

crates/dagger-sdk/src/logging.rs

@@ -0,0 +1,81 @@
+use dagger_core::logger::{DynLogger, Logger};
+use tracing::Level;
+
+pub fn default_logging() -> eyre::Result<()> {
+    tracing_subscriber::fmt().with_max_level(Level::INFO).init();
+    Ok(())
+}
+
+pub struct StdLogger {}
+
+impl Default for StdLogger {
+    fn default() -> Self {
+        Self {}
+    }
+}
+
+impl Logger for StdLogger {
+    fn stdout(&self, output: &str) -> eyre::Result<()> {
+        println!("{}", output);
+
+        Ok(())
+    }
+
+    fn stderr(&self, output: &str) -> eyre::Result<()> {
+        eprintln!("{}", output);
+
+        Ok(())
+    }
+}
+
+pub struct TracingLogger {}
+
+impl Default for TracingLogger {
+    fn default() -> Self {
+        Self {}
+    }
+}
+
+impl Logger for TracingLogger {
+    fn stdout(&self, output: &str) -> eyre::Result<()> {
+        tracing::info!(output = output, "dagger-sdk");
+
+        Ok(())
+    }
+
+    fn stderr(&self, output: &str) -> eyre::Result<()> {
+        tracing::warn!(output = output, "dagger-sdk");
+
+        Ok(())
+    }
+}
+
+pub struct AggregateLogger {
+    pub loggers: Vec<DynLogger>,
+}
+
+impl Default for AggregateLogger {
+    fn default() -> Self {
+        Self {
+            loggers: Vec::new(),
+        }
+    }
+}
+
+impl Logger for AggregateLogger {
+    fn stdout(&self, output: &str) -> eyre::Result<()> {
+        for logger in &self.loggers {
+            logger.stdout(output).unwrap()
+        }
+
+        Ok(())
+    }
+
+    fn stderr(&self, output: &str) -> eyre::Result<()> {
+        for logger in &self.loggers {
+            logger.stderr(output).unwrap()
+        }
+
+        Ok(())
+    }
+}

crates/dagger-sdk/src/querybuilder.rs

@@ -1,8 +1,10 @@
 use std::{collections::HashMap, ops::Add, sync::Arc};
 
-use eyre::Context;
+use dagger_core::graphql_client::DynGraphQLClient;
 use serde::{Deserialize, Serialize};
 
+use crate::errors::{DaggerError, DaggerUnpackError};
+
 pub fn query() -> Selection {
     Selection::default()
 }
@@ -46,13 +48,13 @@ impl Selection {
         }
     }
 
-    pub fn arg<S>(&self, name: &str, value: S) -> eyre::Result<Selection>
+    pub fn arg<S>(&self, name: &str, value: S) -> Selection
     where
         S: Serialize,
     {
         let mut s = self.clone();
 
-        let val = serde_json::to_string(&value)?;
+        let val = serde_json::to_string(&value).unwrap();
 
         match s.args.as_mut() {
             Some(args) => {
@@ -65,10 +67,33 @@ impl Selection {
             }
         }
 
-        Ok(s)
+        s
     }
 
-    pub fn build(&self) -> eyre::Result<String> {
+    pub fn arg_enum<S>(&self, name: &str, value: S) -> Selection
+    where
+        S: Serialize,
+    {
+        let mut s = self.clone();
+
+        let val = serde_json::to_string(&value).unwrap();
+        let val = val[1..val.len() - 1].to_string();
+
+        match s.args.as_mut() {
+            Some(args) => {
+                let _ = args.insert(name.to_string(), val);
+            }
+            None => {
+                let mut hm = HashMap::new();
+                let _ = hm.insert(name.to_string(), val);
+                s.args = Some(hm);
+            }
+        }
+
+        s
+    }
+
+    pub fn build(&self) -> Result<String, DaggerError> {
         let mut fields = vec!["query".to_string()];
 
         for sel in self.path() {
@@ -76,7 +101,7 @@ impl Selection {
                 if let Some(args) = sel.args {
                     let actualargs = args
                         .iter()
-                        .map(|(name, arg)| format!("{name}:{arg}"))
+                        .map(|(name, arg)| format!("{name}:{}", arg.as_str()))
                         .collect::<Vec<_>>();
 
                     query = query.add(&format!("({})", actualargs.join(", ")));
@@ -93,25 +118,22 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    pub fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<Option<D>>
+    pub async fn execute<D>(&self, gql_client: DynGraphQLClient) -> Result<D, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
         let query = self.build()?;
 
-        let basic = tokio::runtime::Builder::new_current_thread()
-            .enable_all()
-            .build()
-            .unwrap();
+        tracing::trace!(query = query.as_str(), "dagger-query");
 
-        let resp: Option<serde_json::Value> = match basic.block_on(gql_client.query(&query)) {
+        let resp: Option<serde_json::Value> = match gql_client.query(&query).await {
             Ok(r) => r,
-            Err(e) => eyre::bail!(e),
+            Err(e) => return Err(DaggerError::Query(e)),
         };
 
         let resp: Option<D> = self.unpack_resp(resp)?;
 
-        Ok(resp)
+        Ok(resp.unwrap())
     }
 
     fn path(&self) -> Vec<Selection> {
@@ -130,7 +152,10 @@ impl Selection {
         selections
     }
 
-    pub(crate) fn unpack_resp<D>(&self, resp: Option<serde_json::Value>) -> eyre::Result<Option<D>>
+    pub(crate) fn unpack_resp<D>(
+        &self,
+        resp: Option<serde_json::Value>,
+    ) -> Result<Option<D>, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
@@ -140,21 +165,23 @@ impl Selection {
         }
     }
 
-    fn unpack_resp_value<D>(&self, r: serde_json::Value) -> eyre::Result<D>
+    fn unpack_resp_value<D>(&self, r: serde_json::Value) -> Result<D, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
         if let Some(o) = r.as_object() {
             let keys = o.keys();
             if keys.len() != 1 {
-                eyre::bail!("too many nested objects inside graphql response")
+                return Err(DaggerError::Unpack(DaggerUnpackError::TooManyNestedObjects));
             }
 
             let first = keys.into_iter().next().unwrap();
             return self.unpack_resp_value(o.get(first).unwrap().clone());
         }
 
-        serde_json::from_value::<D>(r).context("could not deserialize response")
+        serde_json::from_value::<D>(r)
+            .map_err(DaggerUnpackError::Deserialize)
+            .map_err(DaggerError::Unpack)
     }
 }
 
@@ -171,10 +198,8 @@ mod tests {
             .select("core")
             .select("image")
             .arg("ref", "alpine")
-            .unwrap()
             .select("file")
-            .arg("path", "/etc/alpine-release")
-            .unwrap();
+            .arg("path", "/etc/alpine-release");
 
         let query = root.build().unwrap();
 
@@ -190,10 +215,8 @@ mod tests {
             .select("core")
             .select("image")
             .arg("ref", "alpine")
-            .unwrap()
             .select_with_alias("foo", "file")
-            .arg("path", "/etc/alpine-release")
-            .unwrap();
+            .arg("path", "/etc/alpine-release");
 
         let query = root.build().unwrap();
 
@@ -208,10 +231,8 @@ mod tests {
         let root = query()
             .select("a")
             .arg("arg", "one")
-            .unwrap()
             .select("b")
-            .arg("arg", "two")
-            .unwrap();
+            .arg("arg", "two");
 
         let query = root.build().unwrap();
 
@@ -222,7 +243,7 @@ mod tests {
     fn test_vec_arg() {
         let input = vec!["some-string"];
 
-        let root = query().select("a").arg("arg", input).unwrap();
+        let root = query().select("a").arg("arg", input);
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:["some-string"])}"#.to_string())
@@ -232,7 +253,7 @@ mod tests {
     fn test_ref_slice_arg() {
         let input = &["some-string"];
 
-        let root = query().select("a").arg("arg", input).unwrap();
+        let root = query().select("a").arg("arg", input);
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:["some-string"])}"#.to_string())
@@ -242,7 +263,7 @@ mod tests {
     fn test_stringb_arg() {
         let input = "some-string".to_string();
 
-        let root = query().select("a").arg("arg", input).unwrap();
+        let root = query().select("a").arg("arg", input);
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:"some-string")}"#.to_string())
@@ -275,7 +296,7 @@ mod tests {
             })),
         };
 
-        let root = query().select("a").arg("arg", input).unwrap();
+        let root = query().select("a").arg("arg", input);
         let query = root.build().unwrap();
 
         assert_eq!(

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

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

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

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

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

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

crates/dagger-sdk/tests/mod.rs

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