feat: upgrade to dagger 1.18.3

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

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["crates/*", "examples/*", "ci"]
+members = ["crates/*", "examples/*"]
 resolver = "2"
 
 [workspace.package]
@@ -15,9 +15,8 @@ cuddle-components = { path = "crates/cuddle-components" }
 dagger-components = { path = "crates/dagger-components" }
 dagger-cuddle-please = { path = "crates/dagger-cuddle-please" }
 dagger-rust = { path = "crates/dagger-rust" }
-ci = { path = "ci" }
 
-dagger-sdk = "0.13.7"
+dagger-sdk = "0.18.3"
 eyre = "0.6"
 tokio = "1"
 dotenv = "0.15.0"

ci/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "ci"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-dagger-cuddle-please.workspace = true
-dagger-rust.workspace = true
-dagger-sdk.workspace = true
-
-eyre = "*"
-color-eyre = "*"
-tokio = "1"
-clap = { version = "4", features = ["derive"] }
-futures = "0.3"
-async-scoped = { version = "0.9.0", features = ["tokio", "use-tokio"] }
-dotenv.workspace = true

ci/src/main.rs

@@ -1,158 +0,0 @@
-use std::path::PathBuf;
-
-use clap::Args;
-use clap::Parser;
-use clap::Subcommand;
-use clap::ValueEnum;
-
-use crate::please_release::run_release_please;
-
-#[derive(Parser, Clone)]
-#[command(author, version, about, long_about = None, subcommand_required = true)]
-pub struct Command {
-    #[command(subcommand)]
-    commands: Commands,
-
-    #[command(flatten)]
-    global: GlobalArgs,
-}
-
-#[derive(Subcommand, Clone)]
-pub enum Commands {
-    #[command(subcommand_required = true)]
-    Local {
-        #[command(subcommand)]
-        command: LocalCommands,
-    },
-    PullRequest {},
-    Main {},
-    Release,
-}
-
-#[derive(Subcommand, Clone)]
-pub enum LocalCommands {
-    Test,
-    PleaseRelease,
-}
-
-#[derive(Debug, Clone, ValueEnum)]
-pub enum BuildProfile {
-    Debug,
-    Release,
-}
-
-#[derive(Debug, Clone, Args)]
-pub struct GlobalArgs {
-    #[arg(long, global = true, help_heading = "Global")]
-    dry_run: bool,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    rust_builder_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    cuddle_please_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    source: Option<PathBuf>,
-}
-
-#[tokio::main]
-async fn main() -> eyre::Result<()> {
-    let _ = dotenv::dotenv();
-    let _ = color_eyre::install();
-
-    let cli = Command::parse();
-
-    dagger_sdk::connect(|client| async move {
-        match &cli.commands {
-            Commands::Local { command } => match command {
-                LocalCommands::Test => {
-                    test::execute(client, &cli.global).await?;
-                }
-                LocalCommands::PleaseRelease => todo!(),
-            },
-            Commands::PullRequest {} => {
-                async fn test(client: dagger_sdk::Query, cli: &Command) {
-                    let args = &cli.global;
-
-                    test::execute(client.clone(), args).await.unwrap();
-                }
-
-                tokio::join!(test(client.clone(), &cli),);
-            }
-            Commands::Main {} => {
-                async fn test(client: dagger_sdk::Query, cli: &Command) {
-                    let args = &cli.global;
-
-                    test::execute(client.clone(), args).await.unwrap();
-                }
-
-                async fn cuddle_please(client: dagger_sdk::Query, cli: &Command) {
-                    run_release_please(client.clone(), &cli.global)
-                        .await
-                        .unwrap();
-                }
-
-                tokio::join!(
-                    test(client.clone(), &cli),
-                    cuddle_please(client.clone(), &cli)
-                );
-            }
-            Commands::Release => {}
-        }
-
-        Ok(())
-    })
-    .await?;
-
-    Ok(())
-}
-
-mod please_release {
-
-    use dagger_cuddle_please::{models::CuddlePleaseSrcArgs, DaggerCuddlePleaseAction};
-
-    use crate::GlobalArgs;
-
-    pub async fn run_release_please(
-        client: dagger_sdk::Query,
-        args: &GlobalArgs,
-    ) -> eyre::Result<()> {
-        DaggerCuddlePleaseAction::dagger(client)
-            .execute_src(&CuddlePleaseSrcArgs {
-                cuddle_image: args
-                    .cuddle_please_image
-                    .clone()
-                    .unwrap_or("kasperhermansen/cuddle-please:latest".into()),
-                server: dagger_cuddle_please::models::SrcServer::Gitea {
-                    token: std::env::var("CUDDLE_PLEASE_TOKEN")
-                        .expect("CUDDLE_PLEASE_TOKEN to be present"),
-                },
-                log_level: Some(dagger_cuddle_please::models::LogLevel::Debug),
-            })
-            .await?;
-
-        Ok(())
-    }
-}
-
-mod test {
-    use std::path::PathBuf;
-
-    use dagger_rust::build::RustVersion;
-
-    use crate::GlobalArgs;
-
-    pub async fn execute(client: dagger_sdk::Query, _args: &GlobalArgs) -> eyre::Result<()> {
-        dagger_rust::test::RustTest::new(client)
-            .test(
-                None::<PathBuf>,
-                RustVersion::Nightly,
-                &["crates/*", "examples/*", "ci"],
-                &[],
-            )
-            .await?;
-
-        Ok(())
-    }
-}

crates/cuddle-ci/src/cli.rs

@@ -63,8 +63,12 @@ impl CuddleCI {
         self
     }
 
-    pub fn with_release(&mut self, release: Box<dyn ReleaseAction + Send + Sync>) -> &mut Self {
+    pub fn with_release<T>(&mut self, release: &T) -> &mut Self
-        self.release_action.push(release);
+    where
+        T: ReleaseAction + Send + Sync + 'static,
+        T: ToOwned<Owned = T>,
+    {
+        self.release_action.push(Box::new(release.to_owned()));
 
         self
     }

crates/cuddle-ci/src/cuddle_file.rs

@@ -56,9 +56,19 @@ pub struct CuddleVars {
     pub service: String,
     pub registry: String,
 
+    pub rust: Option<CuddleRustVars>,
+
     pub clusters: Option<CuddleClusters>,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct CuddleRustVars {
+    pub publish: Option<CuddleRustPublishVars>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct CuddleRustPublishVars {}
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct CuddleDeployment {
     pub registry: String,
@@ -168,6 +178,7 @@ scripts:
                 service: "infrastructure-example".into(),
                 registry: "kasperhermansen".into(),
                 clusters: Some(CuddleClusters(clusters)),
+                rust: None,
             },
             deployment: Some(crate::cuddle_file::CuddleDeployment {
                 registry: "git@git.front.kjuulh.io:kjuulh/clank-clusters".into(),
@@ -215,6 +226,7 @@ components:
                 service: "infrastructure-example".into(),
                 registry: "kasperhermansen".into(),
                 clusters: None,
+                rust: None,
             },
             deployment: None,
             components: Some(CuddleComponents {
@@ -253,6 +265,7 @@ components:
                 service: "infrastructure-example".into(),
                 registry: "kasperhermansen".into(),
                 clusters: None,
+                rust: None,
             },
             deployment: None,
             components: Some(CuddleComponents {

crates/cuddle-ci/src/cuddle_please.rs

@@ -23,7 +23,7 @@ impl MainAction for CuddlePlease {
 
         action
             .cuddle_please_src(&CuddlePleaseSrcArgs {
-                cuddle_image: "kasperhermansen/cuddle-please:main-1712698022".into(),
+                cuddle_image: "kasperhermansen/cuddle-please:main-1736464837".into(),
                 server: dagger_cuddle_please::models::SrcServer::Gitea {
                     token: std::env::var("CUDDLE_PLEASE_TOKEN")
                         .expect("CUDDLE_PLEASE_TOKEN to be present"),

crates/cuddle-ci/src/rust_service.rs

@@ -7,7 +7,7 @@ use futures::{stream, StreamExt};
 
 use crate::{
     dagger_middleware::{DaggerMiddleware, DynMiddleware},
-    Context, MainAction, PullRequestAction,
+    Context, MainAction, PullRequestAction, ReleaseAction,
 };
 
 use self::architecture::{Architecture, Os};
@@ -348,6 +348,32 @@ impl PullRequestAction for RustService {
     }
 }
 
+#[async_trait]
+impl ReleaseAction for RustService {
+    async fn execute_release(&self, ctx: &mut Context) -> eyre::Result<()> {
+        self.build_test().await?;
+
+        let container = self.build_release().await?;
+
+        let tag = {
+            if let Ok(tag) = std::env::var("RELEASE_TAG") {
+                tag
+            } else if let Ok(tag) = std::env::var("DRONE_TAG") {
+                tag
+            } else {
+                eyre::bail!("failed to find a valid tag");
+            }
+        };
+
+        let tag = format!("docker.io/kasperhermansen/{}:{}", self.bin_name, tag);
+
+        container.publish(&tag).await?;
+        ctx.set_image_tag(tag)?;
+
+        Ok(())
+    }
+}
+
 const IMAGE_TAG: &str = "RUST_SERVICE_IMAGE_TAG";
 
 pub trait RustServiceContext {
@@ -488,8 +514,6 @@ pub mod extensions {
 #[cfg(test)]
 mod test {
 
-    
-
     #[tokio::test]
     #[cfg(any(feature = "dagger", feature = "integration"))]
     async fn test_can_build_rust() -> eyre::Result<()> {

crates/dagger-cuddle-please/src/lib.rs

@@ -186,12 +186,11 @@ impl DaggerCuddlePlease {
             self.client
                 .git_opts(
                     &repo_url,
-                    dagger_sdk::QueryGitOpts {
+                    dagger_sdk::QueryGitOptsBuilder::default()
-                        experimental_service_host: None,
+                        .keep_git_dir(true)
-                        keep_git_dir: Some(true),
+                        .ssh_auth_socket(socket.id().await?)
-                        ssh_auth_socket: Some(socket.id().await?),
+                        .build()
-                        ssh_known_hosts: None,
+                        .unwrap(),
-                    },
                 )
                 .branch("main")
                 .tree()
@@ -199,12 +198,10 @@ impl DaggerCuddlePlease {
             self.client
                 .git_opts(
                     &repo_url,
-                    dagger_sdk::QueryGitOpts {
+                    dagger_sdk::QueryGitOptsBuilder::default()
-                        experimental_service_host: None,
+                        .keep_git_dir(true)
-                        keep_git_dir: Some(true),
+                        .build()
-                        ssh_auth_socket: None,
+                        .unwrap(),
-                        ssh_known_hosts: None,
-                    },
                 )
                 .branch("main")
                 .tree()