ee changes

This commit is contained in:
Alexander Petric
2025-01-21 19:19:50 -05:00
parent 1cd347df77
commit 06847e54da
4 changed files with 16 additions and 4 deletions
+11 -1
View File
@@ -437,7 +437,17 @@ pub async fn run_server(
jobs::workspace_unauthed_service().layer(cors.clone()),
)
.route("/slack", post(slack_approvals::slack_app_callback_handler))
.nest("/teams", teams_ee::teams_service())
.nest("/teams", {
#[cfg(feature = "enterprise")]
{
teams_ee::teams_service()
}
#[cfg(not(feature = "enterprise"))]
{
Router::new()
}
})
.route(
"/w/:workspace_id/jobs/slack_approval/:job_id",
get(slack_approvals::request_slack_approval),
+2 -1
View File
@@ -80,9 +80,10 @@ pub struct AllClients {
}
#[cfg(feature = "oauth2")]
pub fn build_oauth_clients(
pub async fn build_oauth_clients(
_base_url: &str,
_oauths_from_config: Option<HashMap<String, OAuthClient>>,
_db: &DB,
) -> anyhow::Result<AllClients> {
// Implementation is not open source
return Ok(AllClients {
+1
View File
@@ -0,0 +1 @@
/Users/alex/windmill/dev/repos/windmill/../windmill-ee-private//windmill-api/src/teams_ee.rs
+2 -2
View File
@@ -36,8 +36,8 @@ pub mod job_s3_helpers_ee;
pub mod jobs;
pub mod more_serde;
pub mod oauth2;
#[cfg(feature = "enterprise")]
pub mod teams_ee;
// #[cfg(feature = "enterprise")]
// pub mod teams_ee;
pub mod otel_ee;
pub mod queue;
pub mod s3_helpers;