From e67c4baa97d02fc0312990bc1669e24c4c34de77 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Fri, 29 Dec 2023 19:55:10 +0100 Subject: [PATCH] feat: extract cuddle_please Signed-off-by: kjuulh --- ci/src/main.rs | 2 +- crates/cuddle-ci/src/cuddle_please.rs | 38 +++++++++++++++++++++++++ crates/cuddle-ci/src/lib.rs | 41 +-------------------------- 3 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 crates/cuddle-ci/src/cuddle_please.rs diff --git a/ci/src/main.rs b/ci/src/main.rs index cef62ad..59d8515 100644 --- a/ci/src/main.rs +++ b/ci/src/main.rs @@ -120,7 +120,7 @@ mod please_release { cuddle_image: args .cuddle_please_image .clone() - .unwrap_or("kasperhermansen/cuddle-please:main-1691504183".into()), + .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"), diff --git a/crates/cuddle-ci/src/cuddle_please.rs b/crates/cuddle-ci/src/cuddle_please.rs new file mode 100644 index 0000000..82c00ad --- /dev/null +++ b/crates/cuddle-ci/src/cuddle_please.rs @@ -0,0 +1,38 @@ +use async_trait::async_trait; +use dagger_cuddle_please::{ + models::CuddlePleaseSrcArgs, DaggerCuddlePlease, DaggerCuddlePleaseAction, +}; + +use crate::{MainAction, PullRequestAction}; + +pub struct CuddlePlease { + client: dagger_sdk::Query, +} + +impl CuddlePlease { + pub fn new(client: dagger_sdk::Query) -> Self { + Self { client } + } +} + +#[async_trait] +impl MainAction for CuddlePlease { + async fn execute_main(&self) -> eyre::Result<()> { + let client = self.client.clone(); + + let action = DaggerCuddlePlease::new(client); + + action + .cuddle_please_src(&CuddlePleaseSrcArgs { + cuddle_image: "kasperhermansen/cuddle-please:main-1691504183".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(()) + } +} diff --git a/crates/cuddle-ci/src/lib.rs b/crates/cuddle-ci/src/lib.rs index f1e1c1f..d0ae2d3 100644 --- a/crates/cuddle-ci/src/lib.rs +++ b/crates/cuddle-ci/src/lib.rs @@ -2,47 +2,8 @@ pub mod cli; pub mod leptos_service; pub use cli::*; +pub mod cuddle_please; pub mod dagger_middleware; pub mod node_service; pub mod rust_lib; pub mod rust_service; -pub mod cuddle_please { - use async_trait::async_trait; - use dagger_cuddle_please::{ - models::CuddlePleaseSrcArgs, DaggerCuddlePlease, DaggerCuddlePleaseAction, - }; - - use crate::{MainAction, PullRequestAction}; - - pub struct CuddlePlease { - client: dagger_sdk::Query, - } - - impl CuddlePlease { - pub fn new(client: dagger_sdk::Query) -> Self { - Self { client } - } - } - - #[async_trait] - impl MainAction for CuddlePlease { - async fn execute_main(&self) -> eyre::Result<()> { - let client = self.client.clone(); - - let action = DaggerCuddlePlease::new(client); - - action - .cuddle_please_src(&CuddlePleaseSrcArgs { - cuddle_image: "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(()) - } - } -}