feat: with loggers

Cargo.lock

@@ -36,17 +36,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "async-trait"
-version = "0.1.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.0",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -252,11 +241,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
-name = "dagger-bootstrap"
+name = "dagger-codegen"
+version = "0.2.8"
+dependencies = [
+ "convert_case",
+ "dagger-core",
+ "eyre",
+ "genco",
+ "itertools",
+ "pretty_assertions",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "dagger-core"
+version = "0.2.8"
+dependencies = [
+ "dirs",
+ "eyre",
+ "flate2",
+ "graphql-introspection-query",
+ "graphql_client",
+ "hex",
+ "hex-literal",
+ "platform-info",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tar",
+ "tempfile",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "dagger-rs"
 version = "0.2.10"
 dependencies = [
  "clap",
@@ -280,55 +306,17 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "dagger-codegen"
-version = "0.2.8"
-dependencies = [
- "convert_case",
- "dagger-core",
- "eyre",
- "genco",
- "itertools",
- "pretty_assertions",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "dagger-core"
-version = "0.2.8"
-dependencies = [
- "async-trait",
- "base64",
- "dirs",
- "eyre",
- "flate2",
- "gql_client",
- "graphql-introspection-query",
- "graphql_client",
- "hex",
- "hex-literal",
- "platform-info",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tar",
- "tempfile",
- "tokio",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "dagger-sdk"
 version = "0.2.19"
 dependencies = [
+ "base64",
  "dagger-core",
  "derive_builder",
  "eyre",
  "futures",
  "genco",
+ "gql_client",
  "pretty_assertions",
  "rand",
  "serde",
@@ -360,7 +348,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -371,7 +359,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -392,7 +380,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -402,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
 dependencies = [
  "derive_builder_core",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -605,7 +593,7 @@ checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -657,7 +645,7 @@ checksum = "c85fd34848b1f708e6344a4af6f7bfc05172ae20ce4b35c8e417efffb4f306aa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -744,7 +732,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -755,7 +743,7 @@ checksum = "d52fc9cde811f44b15ec0692b31e56a3067f6f431c5ace712f286e47c1dacc98"
 dependencies = [
  "graphql_client_codegen",
  "proc-macro2",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1146,7 +1134,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1489,7 +1477,7 @@ checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1586,17 +1574,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cff13bb1732bccfe3b246f3fdb09edfd51c01d6f5299b7ccd9457c2e4e37774"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "tar"
 version = "0.4.38"
@@ -1647,7 +1624,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1703,7 +1680,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1757,7 +1734,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1829,7 +1806,7 @@ checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08"
 dependencies = [
  "lazy_static",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -1952,7 +1929,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -1986,7 +1963,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

Cargo.toml

@@ -3,14 +3,14 @@ members = [
   "crates/dagger-codegen",
   "crates/dagger-sdk",
   "crates/dagger-core",
-  "crates/dagger-bootstrap",
+  "crates/dagger-rs",
   "ci",
 ]
 
 [workspace.dependencies]
 dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" }
 dagger-core = { path = "crates/dagger-core", version = "^0.2.8" }
-dagger-bootstrap = { path = "crates/dagger-bootstrap", version = "^0.2.10" }
+dagger-rs = { path = "crates/dagger-rs", version = "^0.2.10" }
 dagger-sdk = { path = "crates/dagger-sdk", version = "^0.2.19" }
 
 eyre = "0.6.8"

Makefile.toml

@@ -8,7 +8,7 @@ command = "cargo"
 args = [
   "run",
   "-p",
-  "dagger-bootstrap",
+  "dagger-rs",
   "--",
   "generate",
   "--output",

ci/src/main.rs

@@ -90,7 +90,7 @@ async fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), col
             "--execute",
             "--allow-fully-generated-changelogs",
             "--no-changelog-preview",
-            "dagger-sdk",
+            "dagger-rs",
             "dagger-sdk",
         ]);
     let exit = container.exit_code().await?;

crates/dagger-codegen/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
 description = "dagger sdk codegen library"
-repository = "https://github.com/kjuulh/dagger-sdk"
+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
 

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

@@ -247,7 +247,7 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
             return $(output_type) {
                 proc: self.proc.clone(),
                 selection: query,
-                graphql_client: self.graphql_client.clone(),
+                conn: self.conn.clone(),
             }
         };
     }
@@ -273,13 +273,15 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
             return vec![$(output_type) {
                 proc: self.proc.clone(),
                 selection: query,
-                graphql_client: self.graphql_client.clone(),
+                conn: self.conn.clone(),
             }]
         };
     }
 
+    let graphql_client = rust::import("crate::client", "graphql_client");
+
     quote! {
-        query.execute(self.graphql_client.clone()).await
+        query.execute(&$graphql_client(&self.conn)).await
     }
 }
 

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

@@ -12,15 +12,15 @@ use crate::utility::OptionExt;
 pub fn render_object(funcs: &CommonFunctions, t: &FullType) -> eyre::Result<rust::Tokens> {
     let selection = rust::import("crate::querybuilder", "Selection");
     let child = rust::import("tokio::process", "Child");
-    let graphql_client = rust::import("dagger_core::graphql_client", "DynGraphQLClient");
+    let conn = rust::import("dagger_core::connect_params", "ConnectParams");
     let arc = rust::import("std::sync", "Arc");
 
     Ok(quote! {
-        #[derive(Clone)]
+        #[derive(Debug, Clone)]
         pub struct $(t.name.pipe(|s| format_name(s))) {
             pub proc: $arc<$child>,
             pub selection: $selection,
-            pub graphql_client: $graphql_client
+            pub conn: $conn,
         }
 
         $(t.fields.pipe(|f| render_optional_args(funcs, f)))

crates/dagger-core/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
 description = "dagger sdk core library"
-repository = "https://github.com/kjuulh/dagger-sdk"
+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
 
@@ -17,8 +17,6 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 
-base64 = "0.21.0"
-gql_client = "1.0.7"
 dirs = "4.0.0"
 flate2 = { version = "1.0.25", features = ["zlib"] }
 graphql-introspection-query = "0.2.0"
@@ -30,4 +28,3 @@ reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
 sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
-async-trait = "0.1.67"

crates/dagger-core/src/graphql_client.rs

@@ -1,52 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use base64::engine::general_purpose;
-use base64::Engine;
-use gql_client::ClientConfig;
-
-use crate::connect_params::ConnectParams;
-
-#[async_trait]
-pub trait GraphQLClient {
-    async fn query(&self, query: &str) -> eyre::Result<Option<serde_json::Value>>;
-}
-
-pub type DynGraphQLClient = Arc<dyn GraphQLClient + Send + Sync>;
-
-#[derive(Debug)]
-pub struct DefaultGraphQLClient {
-    client: gql_client::Client,
-}
-
-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: gql_client::Client::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) -> eyre::Result<Option<serde_json::Value>> {
-        let res: Option<serde_json::Value> = self
-            .client
-            .query(&query)
-            .await
-            .map_err(|r| eyre::anyhow!(r.to_string()))?;
-
-        return Ok(res);
-    }
-}

crates/dagger-core/src/lib.rs

@@ -7,7 +7,6 @@ pub mod config;
 pub mod connect_params;
 pub mod downloader;
 pub mod engine;
-pub mod graphql_client;
 pub mod introspection;
 pub mod logger;
 pub mod schema;

crates/dagger-rs/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "dagger-bootstrap"
+name = "dagger-rs"
 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"
+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

crates/dagger-sdk/Cargo.toml

@@ -5,7 +5,7 @@ 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"
+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
@@ -20,7 +20,9 @@ serde_json = { workspace = true }
 tracing.workspace = true
 tracing-subscriber.workspace = true
 
+base64 = "0.21.0"
 futures = "0.3.27"
+gql_client = "1.0.7"
 derive_builder = "0.12.0"
 
 [dev-dependencies]

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

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

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

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

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

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

crates/dagger-sdk/src/client.rs

@@ -1,8 +1,12 @@
+use std::collections::HashMap;
 use std::sync::Arc;
 
-use dagger_core::graphql_client::DefaultGraphQLClient;
+use base64::engine::general_purpose;
+use base64::Engine;
+use gql_client::ClientConfig;
 
 use dagger_core::config::Config;
+use dagger_core::connect_params::ConnectParams;
 use dagger_core::engine::Engine as DaggerEngine;
 
 use crate::gen::Query;
@@ -21,12 +25,26 @@ pub async fn connect_opts(cfg: Config) -> eyre::Result<DaggerConn> {
     let (conn, proc) = DaggerEngine::new().start(&cfg).await?;
 
     Ok(Arc::new(Query {
+        conn,
         proc: Arc::new(proc),
         selection: query(),
-        graphql_client: Arc::new(DefaultGraphQLClient::new(&conn)),
     }))
 }
 
+pub fn graphql_client(conn: &ConnectParams) -> gql_client::Client {
+    let token = general_purpose::URL_SAFE.encode(format!("{}:", conn.session_token));
+
+    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,
+    })
+}
+
 // Conn will automatically close on drop of proc
 
 #[cfg(test)]

crates/dagger-sdk/src/querybuilder.rs

@@ -1,6 +1,5 @@
 use std::{collections::HashMap, ops::Add, sync::Arc};
 
-use dagger_core::graphql_client::DynGraphQLClient;
 use eyre::Context;
 use serde::{Deserialize, Serialize};
 
@@ -117,7 +116,7 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    pub async fn execute<D>(&self, gql_client: DynGraphQLClient) -> eyre::Result<D>
+    pub async fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<D>
     where
         D: for<'de> Deserialize<'de>,
     {