diff --git a/backend/windmill-api/src/gcp_triggers_oss.rs b/backend/windmill-api/src/gcp_triggers_oss.rs index 9eff8ba540..b18e61db95 100644 --- a/backend/windmill-api/src/gcp_triggers_oss.rs +++ b/backend/windmill-api/src/gcp_triggers_oss.rs @@ -2,22 +2,23 @@ #[allow(unused)] pub use crate::gcp_triggers_ee::*; +use serde_json::value::RawValue; +use sqlx::prelude::FromRow; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; +use sqlx::types::Json as SqlxJson; +use windmill_common::worker::to_raw_value; +use windmill_common::triggers::TriggerKind; +use crate::trigger_helpers::TriggerJobArgs; + #[cfg(not(feature = "private"))] use { crate::db::{ApiAuthed, DB}, - crate::trigger_helpers::TriggerJobArgs, axum::{extract::Request, Router}, http::HeaderMap, - serde::{Deserialize, Serialize}, - serde_json::value::RawValue, - sqlx::prelude::FromRow, - sqlx::types::Json as SqlxJson, - std::collections::HashMap, windmill_common::db::UserDB, - windmill_common::worker::to_raw_value, windmill_common::{ error::{Error as WindmillError, Result as WindmillResult}, - triggers::TriggerKind, utils::empty_as_none, }, }; @@ -134,7 +135,6 @@ pub fn gcp_push_route_handler() -> Router { } #[derive(FromRow, Deserialize, Serialize, Debug)] -#[cfg(not(feature = "private"))] pub struct GcpTrigger { pub gcp_resource_path: String, pub subscription_id: String, @@ -163,7 +163,7 @@ pub struct GcpTrigger { #[serde(skip_serializing_if = "Option::is_none")] pub auto_acknowledge_msg: Option, } -#[cfg(not(feature = "private"))] + impl TriggerJobArgs for GcpTrigger { fn v1_payload_fn(payload: String) -> HashMap> { HashMap::from([("payload".to_string(), to_raw_value(&payload))]) @@ -172,4 +172,4 @@ impl TriggerJobArgs for GcpTrigger { fn trigger_kind() -> TriggerKind { TriggerKind::Gcp } -} +} \ No newline at end of file