Merge branch 'main' into feat/lint-pr

.github/workflows/ci.yaml

@@ -8,7 +8,6 @@ env:
   CARGO_TERM_COLOR: always
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  _EXPERIMENTAL_DAGGER_CACHE_CONFIG: type=gha;mode=max
 jobs:
   deploy:
     runs-on: ubuntu-latest

README.md

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

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

@@ -1,12 +1,12 @@
 use convert_case::{Case, Casing};
-use dagger_core::introspection::{FullTypeFields, TypeRef};
+use dagger_core::introspection::FullTypeFields;
 use genco::prelude::rust;
 use genco::quote;
 use genco::tokens::quoted;
 
 use crate::functions::{
-    type_field_has_optional, type_ref_is_list_of_objects, type_ref_is_object, type_ref_is_optional,
+    type_field_has_optional, type_ref_is_list_of_objects, type_ref_is_object,
-    CommonFunctions,
+    type_ref_is_optional, CommonFunctions,
 };
 use crate::utility::OptionExt;
 
@@ -37,7 +37,7 @@ pub fn format_function(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
     let output_type = field
         .type_
         .pipe(|t| &t.type_ref)
-        .pipe(|t| render_output_type(funcs, t));
+        .pipe(|t| funcs.format_output_type(t));
 
     Some(quote! {
         $(signature)(
@@ -67,7 +67,7 @@ fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
                     let name = &s.input_value.name;
 
                     Some(quote! {
-                        query = query.arg($(quoted(name)), $(n));
+                        query = query.arg($(quoted(name)), $(n)).unwrap();
                     })
                 })
             })
@@ -98,7 +98,7 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
 
                     Some(quote! {
                         if let Some($(&n)) = opts.$(&n) {
-                            query = query.arg($(quoted(name)), $(&n));
+                            query = query.arg($(quoted(name)), $(&n)).unwrap();
                         }
                     })
                 })
@@ -122,20 +122,6 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
     }
 }
 
-fn render_output_type(funcs: &CommonFunctions, type_ref: &TypeRef) -> rust::Tokens {
-    let output_type = funcs.format_output_type(type_ref);
-
-    if type_ref_is_object(type_ref) || type_ref_is_list_of_objects(type_ref) {
-        return quote! {
-            $(output_type)
-        };
-    }
-
-    quote! {
-        eyre::Result<$output_type>
-    }
-}
-
 fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::Tokens {
     if let Some(true) = field.type_.pipe(|t| type_ref_is_object(&t.type_ref)) {
         let output_type = funcs.format_output_type(&field.type_.as_ref().unwrap().type_ref);
@@ -177,7 +163,7 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
     let graphql_client = rust::import("crate::client", "graphql_client");
 
     quote! {
-        query.execute(&$graphql_client(&self.conn))
+        query.execute(&$graphql_client(&self.conn)).unwrap().unwrap()
     }
 }
 

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

@@ -1,7 +1,7 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 
 fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
 
     let host_source_dir = client.host().directory(
         "examples/build-the-application/app".into(),
@@ -14,7 +14,7 @@ fn main() -> eyre::Result<()> {
     let source = client
         .container(None)
         .from("node:16".into())
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
         .with_workdir("/src".into())

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

@@ -1,8 +1,8 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 use rand::Rng;
 
 fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
 
     let host_source_dir = client.host().directory(
         "./examples/caching/app".into(),
@@ -12,12 +12,12 @@ fn main() -> eyre::Result<()> {
         }),
     );
 
-    let node_cache = client.cache_volume("node".into()).id()?;
+    let node_cache = client.cache_volume("node".into()).id();
 
     let source = client
         .container(None)
         .from("node:16".into())
-        .with_mounted_directory("/src".into(), host_source_dir.id()?)
+        .with_mounted_directory("/src".into(), host_source_dir.id())
         .with_mounted_cache("/src/node_modules".into(), node_cache, None);
 
     let runner = source
@@ -43,11 +43,11 @@ fn main() -> eyre::Result<()> {
     let ref_ = client
         .container(None)
         .from("nginx".into())
-        .with_directory("/usr/share/nginx/html".into(), build_dir.id()?, None)
+        .with_directory("/usr/share/nginx/html".into(), build_dir.id(), None)
         .publish(
             format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
             None,
-        )?;
+        );
 
     println!("published image to: {}", ref_);
 

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

@@ -1,9 +1,10 @@
+
 use rand::Rng;
 
 fn main() -> eyre::Result<()> {
     let mut rng = rand::thread_rng();
 
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
 
     let context_dir = client
         .host()
@@ -11,11 +12,11 @@ fn main() -> eyre::Result<()> {
 
     let ref_ = client
         .container(None)
-        .build(context_dir.id()?, None)
+        .build(context_dir.id(), None)
         .publish(
             format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
             None,
-        )?;
+        );
 
     println!("published image to: {}", ref_);
 

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

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

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

@@ -1,8 +1,8 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 use rand::Rng;
 
 fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
 
     let host_source_dir = client.host().directory(
         "examples/publish-the-application/app".into(),
@@ -15,7 +15,7 @@ fn main() -> eyre::Result<()> {
     let source = client
         .container(None)
         .from("node:16".into())
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
         .with_workdir("/src".into())
@@ -40,11 +40,11 @@ fn main() -> eyre::Result<()> {
     let ref_ = client
         .container(None)
         .from("nginx".into())
-        .with_directory("/usr/share/nginx/html".into(), build_dir.id()?, None)
+        .with_directory("/usr/share/nginx/html".into(), build_dir.id(), None)
         .publish(
             format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
             None,
-        )?;
+        );
 
     println!("published image to: {}", ref_);
 

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

@@ -1,8 +1,8 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 use rand::Rng;
 
 fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
     let output = "examples/publish-the-application/app/build";
 
     let host_source_dir = client.host().directory(
@@ -16,7 +16,7 @@ fn main() -> eyre::Result<()> {
     let source = client
         .container(None)
         .from("node:16".into())
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
         .with_workdir("/src".into())
@@ -44,13 +44,13 @@ fn main() -> eyre::Result<()> {
         .from("nginx".into())
         .with_directory(
             "/usr/share/nginx/html".into(),
-            client.host().directory(output.into(), None).id()?,
+            client.host().directory(output.into(), None).id(),
             None,
         )
         .publish(
             format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
             None,
-        )?;
+        );
 
     println!("published image to: {}", ref_);
 

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

@@ -1,7 +1,7 @@
-use dagger_sdk::HostDirectoryOpts;
+use dagger_sdk::gen::HostDirectoryOpts;
 
 fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
 
     let host_source_dir = client.host().directory(
         "examples/test-the-application/app".into(),
@@ -14,7 +14,7 @@ fn main() -> eyre::Result<()> {
     let source = client
         .container(None)
         .from("node:16".into())
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src".into(), host_source_dir.id());
 
     let runner = source
         .with_workdir("/src".into())
@@ -30,7 +30,7 @@ fn main() -> eyre::Result<()> {
             ],
             None,
         )
-        .stderr()?;
+        .stderr();
 
     println!("{}", out);
 

crates/dagger-sdk/src/lib.rs

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

crates/dagger-sdk/src/querybuilder.rs

@@ -46,13 +46,13 @@ impl Selection {
         }
     }
 
-    pub fn arg<S>(&self, name: &str, value: S) -> Selection
+    pub fn arg<S>(&self, name: &str, value: S) -> eyre::Result<Selection>
     where
         S: Serialize,
     {
         let mut s = self.clone();
 
-        let val = serde_json::to_string(&value).unwrap();
+        let val = serde_json::to_string(&value)?;
 
         match s.args.as_mut() {
             Some(args) => {
@@ -65,7 +65,7 @@ impl Selection {
             }
         }
 
-        s
+        Ok(s)
     }
 
     pub fn build(&self) -> eyre::Result<String> {
@@ -93,7 +93,7 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    pub fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<D>
+    pub fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<Option<D>>
     where
         D: for<'de> Deserialize<'de>,
     {
@@ -111,7 +111,7 @@ impl Selection {
 
         let resp: Option<D> = self.unpack_resp(resp)?;
 
-        Ok(resp.unwrap())
+        Ok(resp)
     }
 
     fn path(&self) -> Vec<Selection> {
@@ -171,8 +171,10 @@ mod tests {
             .select("core")
             .select("image")
             .arg("ref", "alpine")
+            .unwrap()
             .select("file")
-            .arg("path", "/etc/alpine-release");
+            .arg("path", "/etc/alpine-release")
+            .unwrap();
 
         let query = root.build().unwrap();
 
@@ -188,8 +190,10 @@ mod tests {
             .select("core")
             .select("image")
             .arg("ref", "alpine")
+            .unwrap()
             .select_with_alias("foo", "file")
-            .arg("path", "/etc/alpine-release");
+            .arg("path", "/etc/alpine-release")
+            .unwrap();
 
         let query = root.build().unwrap();
 
@@ -204,8 +208,10 @@ mod tests {
         let root = query()
             .select("a")
             .arg("arg", "one")
+            .unwrap()
             .select("b")
-            .arg("arg", "two");
+            .arg("arg", "two")
+            .unwrap();
 
         let query = root.build().unwrap();
 
@@ -216,7 +222,7 @@ mod tests {
     fn test_vec_arg() {
         let input = vec!["some-string"];
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:["some-string"])}"#.to_string())
@@ -226,7 +232,7 @@ mod tests {
     fn test_ref_slice_arg() {
         let input = &["some-string"];
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:["some-string"])}"#.to_string())
@@ -236,7 +242,7 @@ mod tests {
     fn test_stringb_arg() {
         let input = "some-string".to_string();
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(query, r#"query{a(arg:"some-string")}"#.to_string())
@@ -269,7 +275,7 @@ mod tests {
             })),
         };
 
-        let root = query().select("a").arg("arg", input);
+        let root = query().select("a").arg("arg", input).unwrap();
         let query = root.build().unwrap();
 
         assert_eq!(

crates/dagger-sdk/tests/mod.rs

@@ -1,4 +1,5 @@
-use dagger_sdk::{connect, ContainerExecOpts};
+use dagger_sdk::client::connect;
+use dagger_sdk::gen::ContainerExecOpts;
 
 #[test]
 fn test_example_container() {
@@ -14,8 +15,7 @@ fn test_example_container() {
             redirect_stderr: None,
             experimental_privileged_nesting: None,
         }))
-        .stdout()
+        .stdout();
-        .unwrap();
 
     assert_eq!(out, "3.16.2\n".to_string())
 }

src/main.rs

@@ -4,6 +4,8 @@ pub mod cli;
 mod cli_generate;
 
 fn main() -> eyre::Result<()> {
+    //
+
     color_eyre::install().unwrap();
 
     let args = std::env::args();