fix: make sure tests have a command to execute

Cargo.lock

@@ -309,7 +309,7 @@ dependencies = [
 
 [[package]]
 name = "dagger-sdk"
-version = "0.2.18"
+version = "0.2.16"
 dependencies = [
  "base64",
  "dagger-core",

README.md

@@ -1,55 +0,0 @@
-# dagger-sdk
-
-A dagger sdk written in rust for rust.
-
-## Examples
-
-See [examples](./crates/dagger-sdk/examples/)
-
-Run them like so
-
-```bash
-cargo run --example first-pipeline
-```
-
-The examples match the folder name in each directory in examples
-
-## Install
-
-Simply install like:
-
-```bash
-cargo add dagger-sdk
-```
-
-### Usage
-
-```rust
-#[tokio::main]
-async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
-
-    let version = client
-        .container()
-        .from("golang:1.19")
-        .with_exec(vec!["go", "version"])
-        .stdout()
-        .await?;
-
-    println!("Hello from Dagger and {}", version.trim());
-
-    Ok(())
-}
-```
-
-And run it like a normal application:
-
-```bash
-cargo run
-```
-
-### Contributing
-
-See [CONTRIBUTING](./CONTRIBUTING.md)
-
-or just cargo make codegen

README.md

@@ -0,0 +1 @@
+crates/dagger-sdk/README.md

ci/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 clap = "4.1.6"
 color-eyre = "0.6.2"
-dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.18" }
+dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.16" }
 eyre = "0.6.8"
 tokio = { version = "1.25.0", features = ["full"] }

crates/dagger-codegen/src/functions.rs

@@ -196,22 +196,6 @@ 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

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

@@ -5,8 +5,8 @@ use genco::quote;
 use genco::tokens::quoted;
 
 use crate::functions::{
-    type_field_has_optional, type_ref_is_enum, type_ref_is_list, type_ref_is_list_of_objects,
+    type_field_has_optional, type_ref_is_list, type_ref_is_list_of_objects, type_ref_is_object,
-    type_ref_is_object, type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
+    type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
 };
 use crate::utility::OptionExt;
 
@@ -133,12 +133,6 @@ fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
                         }
                     }
 
-                    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
@@ -193,14 +187,6 @@ 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));

crates/dagger-sdk/CHANGELOG.md

@@ -6,87 +6,8 @@ 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.18 (2023-03-14)
-
-### New Features
-
- - <csr-id-2c04387c3dd4cfd097a8f142570c58bc756c8ab7/> fix serialization of enum args for graphql
-
-### 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 serialization of enum args for graphql ([`2c04387`](https://github.com/kjuulh/dagger-rs/commit/2c04387c3dd4cfd097a8f142570c58bc756c8ab7))
-</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-rs/commit/a8e6dde615029d9a94d159ed84b5373121cd201f))
-    - make sure tests have a command to execute ([`1bfd084`](https://github.com/kjuulh/dagger-rs/commit/1bfd084cd28e2b984c61de7f3f9a065cc41be007))
-    - remove unused imports ([`5593fce`](https://github.com/kjuulh/dagger-rs/commit/5593fce2e16e0aa97a2e6843f15d3bb1121048f5))
-    - remove export and instead use exitcode ([`2cc0231`](https://github.com/kjuulh/dagger-rs/commit/2cc0231c5f29993081f0f7e15e44cac95a7d6086))
-    - move issues to actual tests and refactor ([`9ba0139`](https://github.com/kjuulh/dagger-rs/commit/9ba01396cb44ee02cf7a16008e3f0bdae9f78754))
-    - add support for String as well ([`c025d17`](https://github.com/kjuulh/dagger-rs/commit/c025d1742482d701946c292dcf104421d3cade8e))
-    - move issues to another folder ([`e9e35ed`](https://github.com/kjuulh/dagger-rs/commit/e9e35edb1cb67eee8cc033212aba3b1888def78f))
-    - add public tuple field and into func ([`d7317e5`](https://github.com/kjuulh/dagger-rs/commit/d7317e5cf34ee84a7b092357f5fbb15cd2bae2e3))
-    - initial issue ([`f679281`](https://github.com/kjuulh/dagger-rs/commit/f67928155f02076cbb41abd4010523879ff3caf1))
-    - update rust crate futures to 0.3.27 ([`44fa024`](https://github.com/kjuulh/dagger-rs/commit/44fa0240f8197f49fdf942b5c3d89079b59195d1))
-</details>
-
 ## v0.2.16 (2023-03-10)
 
-<csr-id-e642778d9028726dfb07217814e15ad1dd3b83f2/>
-
 ### Chore
 
  - <csr-id-e642778d9028726dfb07217814e15ad1dd3b83f2/> fix tasks
@@ -111,7 +32,7 @@ and this project adheres to
 
 <csr-read-only-do-not-edit/>
 
- - 7 commits contributed to the release over the course of 13 calendar days.
+ - 6 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
@@ -123,7 +44,6 @@ and this project adheres to
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-core v0.2.8, dagger-sdk v0.2.16 ([`f390eac`](https://github.com/kjuulh/dagger-rs/commit/f390eac29f1d041d18d2207a5aa0a8d993aab68c))
     - fix tasks ([`e642778`](https://github.com/kjuulh/dagger-rs/commit/e642778d9028726dfb07217814e15ad1dd3b83f2))
     - with dagger-engine v.0.4.0 ([`7133bfa`](https://github.com/kjuulh/dagger-rs/commit/7133bfae9508bc5977548e373c49342a1248d6e4))
     - fix missing await in connect ([`13b7805`](https://github.com/kjuulh/dagger-rs/commit/13b7805e7e6fcf47e0a1318adcc25b4ab773a3c9))

crates/dagger-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.18"
+version = "0.2.16"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -18,7 +18,7 @@ eyre = "0.6.8"
 futures = "0.3.27"
 gql_client = "1.0.7"
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.93", features = ["raw_value"] }
+serde_json = "1.0.93"
 tokio = { version = "1.25.0", features = ["full"] }
 derive_builder = "0.12.0"
 

crates/dagger-sdk/src/gen.rs

@@ -955,7 +955,7 @@ impl Container {
 
         query = query.arg("port", port);
         if let Some(protocol) = opts.protocol {
-            query = query.arg_enum("protocol", protocol);
+            query = query.arg("protocol", protocol);
         }
         if let Some(description) = opts.description {
             query = query.arg("description", description);
@@ -1085,7 +1085,7 @@ impl Container {
             query = query.arg("source", source);
         }
         if let Some(sharing) = opts.sharing {
-            query = query.arg_enum("sharing", sharing);
+            query = query.arg("sharing", sharing);
         }
 
         return Container {
@@ -1395,7 +1395,7 @@ impl Container {
 
         query = query.arg("port", port);
         if let Some(protocol) = opts.protocol {
-            query = query.arg_enum("protocol", protocol);
+            query = query.arg("protocol", protocol);
         }
 
         return Container {
@@ -2848,9 +2848,9 @@ impl Socket {
 }
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
 pub enum CacheSharingMode {
-    LOCKED,
     SHARED,
     PRIVATE,
+    LOCKED,
 }
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
 pub enum NetworkProtocol {

crates/dagger-sdk/src/querybuilder.rs

@@ -68,32 +68,6 @@ impl Selection {
         s
     }
 
-    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();
-
-        println!("test");
-        println!("{}", val);
-
-        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) -> eyre::Result<String> {
         let mut fields = vec!["query".to_string()];
 
@@ -102,7 +76,7 @@ impl Selection {
                 if let Some(args) = sel.args {
                     let actualargs = args
                         .iter()
-                        .map(|(name, arg)| format!("{name}:{}", arg.as_str()))
+                        .map(|(name, arg)| format!("{name}:{arg}"))
                         .collect::<Vec<_>>();
 
                     query = query.add(&format!("({})", actualargs.join(", ")));
@@ -125,9 +99,6 @@ impl Selection {
     {
         let query = self.build()?;
 
-        let qbs = query.as_str();
-        println!("{}", qbs);
-
         let resp: Option<serde_json::Value> = match gql_client.query(&query).await {
             Ok(r) => r,
             Err(e) => eyre::bail!(e),

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

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

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