Merge branch 'main' into feat/add-tests-to-sdk

In previous versions the builder pattern required all values to be set.
This has not been fixed, so that default values are allowed.

Cargo.lock

@@ -114,7 +114,7 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "color-eyre",
- "dagger-sdk 0.2.9",
+ "dagger-sdk",
  "eyre",
  "tokio",
 ]
@@ -246,10 +246,10 @@ dependencies = [
 
 [[package]]
 name = "dagger-codegen"
-version = "0.2.5"
+version = "0.2.8"
 dependencies = [
  "convert_case",
- "dagger-core 0.2.3",
+ "dagger-core",
  "eyre",
  "genco",
  "itertools",
@@ -260,32 +260,7 @@ dependencies = [
 
 [[package]]
 name = "dagger-core"
-version = "0.2.3"
-dependencies = [
- "clap",
- "dirs",
- "eyre",
- "flate2",
- "genco",
- "graphql-introspection-query",
- "graphql_client",
- "hex",
- "hex-literal",
- "platform-info",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tar",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "dagger-core"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18641c2b159006cab7d750c05d3272f0cabfe9532df20b47076353aa73bf1e"
+version = "0.2.7"
 dependencies = [
  "clap",
  "dirs",
@@ -313,7 +288,7 @@ dependencies = [
  "clap",
  "color-eyre",
  "dagger-codegen",
- "dagger-core 0.2.3",
+ "dagger-core",
  "dirs",
  "eyre",
  "flate2",
@@ -334,27 +309,10 @@ dependencies = [
 
 [[package]]
 name = "dagger-sdk"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8480af5a914d5ada1ff7fb8665b99b393e076acf8138af982170b2071cb3a9e3"
+version = "0.2.15"
 dependencies = [
  "base64",
- "dagger-core 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_builder",
- "eyre",
- "futures",
- "gql_client",
- "serde",
- "serde_json",
- "tokio",
-]
-
-[[package]]
-name = "dagger-sdk"
-version = "0.2.10"
-dependencies = [
- "base64",
- "dagger-core 0.2.3",
+ "dagger-core",
  "derive_builder",
  "eyre",
  "futures",

Cargo.toml

@@ -20,7 +20,7 @@ members = [
 
 [dependencies]
 dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" }
-dagger-core = { path = "crates/dagger-core", version = "^0.2.3" }
+dagger-core = { path = "crates/dagger-core", version = "^0.2.7" }
 
 clap = "4.1.6"
 dirs = "4.0.0"
@@ -28,14 +28,11 @@ 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",
-] }
+graphql_client = { version = "0.12.0", features = ["reqwest"] }
 hex = "0.4.3"
 hex-literal = "0.3.4"
 platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "blocking", "deflate"] }
+reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 sha2 = "0.10.6"

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

ci/src/main.rs

@@ -12,7 +12,7 @@ async fn main() -> eyre::Result<()> {
         .subcommand(clap::Command::new("release"))
         .get_matches();
 
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::connect().await?;
 
     match matches.subcommand() {
         Some(("pr", _)) => {
@@ -165,8 +165,21 @@ async fn select_base_image(client: Arc<Query>) -> eyre::Result<Container> {
     src_dir
 }
 
-async fn validate_pr(_client: Arc<Query>, container: Container) -> eyre::Result<()> {
-    //let container = container.with_exec(vec!["cargo", "test", "--all"], 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 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 {

crates/dagger-codegen/CHANGELOG.md

@@ -5,6 +5,85 @@ 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
@@ -15,21 +94,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    
    ```rust
    fn main() -> eyre::Result<()> {
-     // ...
+   // ...
    
-     client.container().from("rust").publish("somewhere")?;
+   client.container().from("rust").publish("somewhere")?;
    
-     // ...
+   // ...
    }
    
    // to
    
    async fn main() -> eyre::Result<()> {
-     // ...
+   // ...
    
-     client.container().from("rust").publish("somewhere").await?;
+   client.container().from("rust").publish("somewhere").await?;
    
-     // ...
+   // ...
    }
    ```
 
@@ -37,7 +116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 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
 
@@ -48,6 +127,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release dagger-sdk v0.2.8, dagger-codegen v0.2.5 ([`0499024`](https://github.com/kjuulh/dagger-rs/commit/04990247ba8e9d0555847f582fef14849dbedebf))
     - add documentation strings ([`978ede6`](https://github.com/kjuulh/dagger-rs/commit/978ede68ae52f5b5150a2aa45b8d6e1fbbbee2f4))
     - Use async runtime instead of blocking. ([`9be6f43`](https://github.com/kjuulh/dagger-rs/commit/9be6f435d9ea39f31a8906e55dbd3e8b1e5ec598))
 </details>

crates/dagger-codegen/Cargo.toml

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

crates/dagger-codegen/src/functions.rs

@@ -153,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()
@@ -258,6 +259,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;

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

@@ -26,9 +26,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, Clone, PartialEq, Debug)]
+        #[derive($serialize, $deserialize, Clone, PartialEq, Debug)]
         pub enum $(t.name.as_ref()) {
             $(render_enum_values(t))
         }

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

@@ -1,9 +1,8 @@
 use dagger_core::introspection::{FullType, FullTypeFields, FullTypeFieldsArgs};
 use genco::prelude::rust;
 use genco::quote;
-use itertools::Itertools;
 
-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_optional_args,
     format_struct_comment, format_struct_name,
@@ -12,11 +11,12 @@ 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 child = rust::import("tokio::process", "Child");
     let conn = rust::import("dagger_core::connect_params", "ConnectParams");
     let arc = rust::import("std::sync", "Arc");
 
     Ok(quote! {
+        #[derive(Debug, Clone)]
         pub struct $(t.name.pipe(|s| format_name(s))) {
             pub proc: $arc<$child>,
             pub selection: $selection,
@@ -86,7 +86,7 @@ pub fn render_optional_field_args(
         }
         quote! {
             $(a.description.pipe(|d| format_struct_comment(d)))
-            #[builder(setter(into, strip_option))]
+            #[builder(setter(into, strip_option), default)]
             pub $(format_struct_name(&a.name)): Option<$(type_)>,
         }
     });

crates/dagger-core/CHANGELOG.md

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

crates/dagger-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-core"
-version = "0.2.3"
+version = "0.2.7"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -16,14 +16,11 @@ 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",
-] }
+graphql_client = { version = "0.12.0", features = ["reqwest"] }
 hex = "0.4.3"
 hex-literal = "0.3.4"
 platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "blocking", "deflate"] }
+reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 sha2 = "0.10.6"

crates/dagger-core/src/cli_session.rs

@@ -1,10 +1,6 @@
-use std::{
-    fs::canonicalize,
-    io::{BufRead, BufReader},
-    path::PathBuf,
-    process::{Child, Stdio},
-    sync::Arc,
-};
+use std::{fs::canonicalize, path::PathBuf, process::Stdio, sync::Arc};
+
+use tokio::io::AsyncBufReadExt;
 
 use crate::{config::Config, connect_params::ConnectParams};
 
@@ -24,7 +20,7 @@ impl CliSession {
         &self,
         config: &Config,
         cli_path: &PathBuf,
-    ) -> eyre::Result<(ConnectParams, Child)> {
+    ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
         self.inner.connect(config, cli_path).await
     }
 }
@@ -37,13 +33,13 @@ impl InnerCliSession {
         &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).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"))?,
@@ -72,8 +68,8 @@ impl InnerCliSession {
 
     async fn get_conn(
         &self,
-        mut proc: std::process::Child,
-    ) -> eyre::Result<(ConnectParams, std::process::Child)> {
+        mut proc: tokio::process::Child,
+    ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
         let stdout = proc
             .stdout
             .take()
@@ -87,29 +83,26 @@ impl InnerCliSession {
         let (sender, mut receiver) = tokio::sync::mpsc::channel(1);
 
         tokio::spawn(async 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) {
+            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();
                 }
-                if let Ok(line) = line {
-                    println!("dagger: {}", line);
-                }
+
+                println!("dagger: {}", line);
             }
         });
 
         tokio::spawn(async move {
-            let stderr_bufr = BufReader::new(stderr);
-            for line in stderr_bufr.lines() {
-                if let Ok(line) = line {
-                    println!("dagger: {}", line);
-                }
-                //panic!("could not start dagger session: {}", out)
+            let mut stdout_bufr = tokio::io::BufReader::new(stderr).lines();
+            while let Ok(Some(line)) = stdout_bufr.next_line().await {
+                println!("dagger: {}", line);
             }
         });
 
-        let conn = receiver.recv().await.ok_or(eyre::anyhow!("could not receive ok signal from dagger-engine"))?;
+        let conn = receiver.recv().await.ok_or(eyre::anyhow!(
+            "could not receive ok signal from dagger-engine"
+        ))?;
 
         Ok((conn, proc))
     }

crates/dagger-core/src/downloader.rs

@@ -1,6 +1,6 @@
 use std::{
     fs::File,
-    io::{copy, 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,
         };
 
@@ -129,7 +130,8 @@ impl Downloader {
 
         if !cli_bin_path.exists() {
             cli_bin_path = self
-                .download(cli_bin_path).await
+                .download(cli_bin_path)
+                .await
                 .context("failed to download CLI from archive")?;
         }
 
@@ -137,6 +139,10 @@ impl Downloader {
             if let Ok(entry) = file {
                 let path = entry.path();
                 if path != cli_bin_path {
+                    println!(
+                        "deleting client: path: {:?} vs cli_bin_path: {:?}",
+                        path, cli_bin_path
+                    );
                     std::fs::remove_file(path)?;
                 }
             }
@@ -149,7 +155,7 @@ impl Downloader {
         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")
@@ -190,26 +196,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 +223,6 @@ impl Downloader {
             let mut entry = entry?;
             let path = entry.path()?;
 
-            println!("path: {:?}", path);
-
             if path.ends_with("dagger") {
                 copy(&mut entry, output)?;
 
@@ -242,7 +240,11 @@ mod test {
 
     #[tokio::test]
     async fn download() {
-        let cli_path = Downloader::new("0.3.10".into()).unwrap().get_cli().await.unwrap();
+        let cli_path = Downloader::new("0.3.10".into())
+            .unwrap()
+            .get_cli()
+            .await
+            .unwrap();
 
         assert_eq!(
             Some("dagger-0.3.10"),

crates/dagger-core/src/engine.rs

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

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,3 +1,5 @@
+#![deny(warnings)]
+
 pub mod cli_session;
 pub mod config;
 pub mod connect_params;

crates/dagger-core/src/schema.rs

@@ -12,13 +12,3 @@ pub async fn get_schema() -> eyre::Result<IntrospectionResponse> {
 
     Ok(schema)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::get_schema;
-
-    #[tokio::test]
-    async fn can_get_schema() {
-        let _ = get_schema().await.unwrap();
-    }
-}

crates/dagger-sdk/CHANGELOG.md

@@ -6,6 +6,146 @@ 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.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/>
+
+ - 2 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**
+    - set deserialize on enums as well ([`e578b0e`](https://github.com/kjuulh/dagger-rs/commit/e578b0e371e13bc30ada793b7cd6ebe75ba83a07))
+    - update to dagger-v0.3.13 ([`3e8ca8d`](https://github.com/kjuulh/dagger-rs/commit/3e8ca8d86eafdc1f9d5e8b69f14fb60509549e0f))
+</details>
+
+## v0.2.14 (2023-02-22)
+
+<csr-id-e331ca003546f4ebe00f33b65c3b45c6b0586514/>
+
+### Chore
+
+ - <csr-id-e331ca003546f4ebe00f33b65c3b45c6b0586514/> fix whitespace
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits contributed to the release.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-sdk v0.2.14 ([`88b055c`](https://github.com/kjuulh/dagger-rs/commit/88b055cb47d3d474e2c37d8fa8259df5faad9da5))
+    - fix whitespace ([`e331ca0`](https://github.com/kjuulh/dagger-rs/commit/e331ca003546f4ebe00f33b65c3b45c6b0586514))
+</details>
+
+## v0.2.13 (2023-02-22)
+
+<csr-id-7c3654d276bb5f66e692a210cb60cdf46b19e226/>
+<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
+
+### Chore
+
+ - <csr-id-7c3654d276bb5f66e692a210cb60cdf46b19e226/> ran clippy
+ - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
+
+### New Features
+
+ - <csr-id-266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c/> with clone
+
+### Bug Fixes
+
+ - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 7 commits contributed to the release over the course of 2 calendar days.
+ - 2 days passed between releases.
+ - 4 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-codegen v0.2.8, dagger-sdk v0.2.13 ([`456f483`](https://github.com/kjuulh/dagger-rs/commit/456f48389b5514d7f743a600a7732fb02dd87418))
+    - ran clippy ([`7c3654d`](https://github.com/kjuulh/dagger-rs/commit/7c3654d276bb5f66e692a210cb60cdf46b19e226))
+    - with clone ([`266ad32`](https://github.com/kjuulh/dagger-rs/commit/266ad32dff4c8957c7cdd291f9ef6f8a8c1d055c))
+    - Release dagger-core v0.2.6, dagger-codegen v0.2.7, dagger-sdk v0.2.12 ([`7179f8b`](https://github.com/kjuulh/dagger-rs/commit/7179f8b598ef04e62925e39d3f55740253c01686))
+    - ran clippy ([`1f77d90`](https://github.com/kjuulh/dagger-rs/commit/1f77d90c0f0ac832a181b2322350ea395612986c))
+    - Release dagger-core v0.2.5, dagger-sdk v0.2.12, dagger-codegen v0.2.7 ([`1725c51`](https://github.com/kjuulh/dagger-rs/commit/1725c5188e8a81069ec4a4de569484c921a94927))
+    - race condition in process ([`a13a2a9`](https://github.com/kjuulh/dagger-rs/commit/a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de))
+</details>
+
+## v0.2.12 (2023-02-20)
+
+<csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/>
+
+### Chore
+
+ - <csr-id-1f77d90c0f0ac832a181b2322350ea395612986c/> ran clippy
+
+### Bug Fixes
+
+ - <csr-id-a13a2a9ecbfdfac80ed8eb0cbb9e9db317da65de/> race condition in process
+
+## v0.2.11 (2023-02-20)
+
+<csr-id-803cfc4f8c4d72ab7d011be5523b3bfc6039de39/>
+
+### Chore
+
+ - <csr-id-803cfc4f8c4d72ab7d011be5523b3bfc6039de39/> ran clippy
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 3 commits contributed to the release.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`f869e57`](https://github.com/kjuulh/dagger-rs/commit/f869e574dd788cd60e5b1b5d502bec68e300694c))
+    - Release dagger-core v0.2.4, dagger-codegen v0.2.6, dagger-sdk v0.2.11 ([`17ec62a`](https://github.com/kjuulh/dagger-rs/commit/17ec62a5d58232ff57391523b9851fb7b07d02ab))
+    - ran clippy ([`803cfc4`](https://github.com/kjuulh/dagger-rs/commit/803cfc4f8c4d72ab7d011be5523b3bfc6039de39))
+</details>
+
 ## v0.2.10 (2023-02-20)
 
 Alignment release
@@ -18,7 +158,7 @@ Alignment release
 
 <csr-read-only-do-not-edit/>
 
- - 7 commits contributed to the release.
+ - 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
 
@@ -29,6 +169,7 @@ Alignment release
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release dagger-sdk v0.2.10 ([`5cb9729`](https://github.com/kjuulh/dagger-rs/commit/5cb97296b61677fb37e4bdb8519d30a484f93621))
     - changelog ([`b100285`](https://github.com/kjuulh/dagger-rs/commit/b100285312df522218bfd4bc00bbf41b857a81bf))
     - Adjusting changelogs prior to release of dagger-sdk v0.2.10 ([`8ed0647`](https://github.com/kjuulh/dagger-rs/commit/8ed06476e56f3290a419d2a67e7f25da575c63ad))
     - update changelog ([`09aa658`](https://github.com/kjuulh/dagger-rs/commit/09aa658b6fb3c1e9a2de668c4a69bbe5be13202f))

crates/dagger-sdk/Cargo.toml

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

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

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

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

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

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

@@ -6,7 +6,8 @@ async fn main() -> eyre::Result<()> {
         .container()
         .from("golang:1.19")
         .with_exec(vec!["go", "version"])
-        .stdout().await?;
+        .stdout()
+        .await?;
 
     println!("Hello from Dagger and {}", version.trim());
 

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

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

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

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

crates/dagger-sdk/src/lib.rs

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

crates/dagger-sdk/tests/mod.rs

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