fix(deps): update rust crate toml to 0.9.0

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

CHANGELOG.md

@@ -6,23 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.4.0] - 2024-12-22
-
-### Added
-- remove deps
-- remove ci
-
-### Fixed
-- *(deps)* update rust crate chrono to v0.4.39
-- *(deps)* update rust crate tracing to v0.1.41
-
-### Other
-- *(deps)* update rust crate serde_json to v1.0.134
-- *(deps)* update rust crate serde to v1.0.216
-- *(deps)* update rust crate clap to v4.5.23
-- *(deps)* update all dependencies
-- *(deps)* update rust crate serde_json to v1.0.133
-
 ## [0.3.0] - 2024-11-16
 
 ### Added

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*", "examples/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.4.0"
+version = "0.3.0"
 edition = "2021"
 license = "MIT"
 authors = ["kjuulh <contact@kjuulh.io>"]
@@ -16,7 +16,7 @@ dagger-components = { path = "crates/dagger-components" }
 dagger-cuddle-please = { path = "crates/dagger-cuddle-please" }
 dagger-rust = { path = "crates/dagger-rust" }
 
-dagger-sdk = "0.13.7"
+dagger-sdk = "0.18.3"
 eyre = "0.6"
 tokio = "1"
 dotenv = "0.15.0"

crates/cuddle-ci/Cargo.toml

@@ -24,7 +24,7 @@ serde_yaml.workspace = true
 serde.workspace = true
 tracing = {version = "0.1.40", features = ["log"]}
 chrono = {version = "0.4.38"}
-toml = "0.8.12"
+toml = "0.9.0"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

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 {
-        self.release_action.push(release);
+    pub fn with_release<T>(&mut self, release: &T) -> &mut Self
+    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 {
-                        experimental_service_host: None,
-                        keep_git_dir: Some(true),
-                        ssh_auth_socket: Some(socket.id().await?),
-                        ssh_known_hosts: None,
-                    },
+                    dagger_sdk::QueryGitOptsBuilder::default()
+                        .keep_git_dir(true)
+                        .ssh_auth_socket(socket.id().await?)
+                        .build()
+                        .unwrap(),
                 )
                 .branch("main")
                 .tree()
@@ -199,12 +198,10 @@ impl DaggerCuddlePlease {
             self.client
                 .git_opts(
                     &repo_url,
-                    dagger_sdk::QueryGitOpts {
-                        experimental_service_host: None,
-                        keep_git_dir: Some(true),
-                        ssh_auth_socket: None,
-                        ssh_known_hosts: None,
-                    },
+                    dagger_sdk::QueryGitOptsBuilder::default()
+                        .keep_git_dir(true)
+                        .build()
+                        .unwrap(),
                 )
                 .branch("main")
                 .tree()