mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-19 08:01:25 +00:00
95d4c6a94d
* feat(cli): non-interactive Slack connect/disconnect
Extract create_slack_workspace_artifacts / create_slack_instance_artifacts
from the browser OAuth callbacks and expose them via two new endpoints that
accept a pre-minted xoxb bot token:
- POST /w/{workspace}/workspaces/connect_slack (admin)
- POST /oauth/connect_slack_instance (super-admin)
Both produce bit-for-bit identical DB state to the UI browser flow.
Wire three CLI commands as thin wrappers:
- wmill workspace connect-slack
- wmill workspace disconnect-slack
- wmill instance connect-slack
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(cli): round-trip stability for workspace settings handlers
wmill sync push was destroying UI-configured error_handler/success_handler
state on every deploy. Two orthogonal bugs:
(a) pushWorkspaceSettings called editErrorHandler with `path: undefined`
when the YAML lacked the handler block, which the backend treats as a
clear — so syncing settings.yaml that didn't mention the handler wiped
the DB row. Fix: skip the call entirely when absent from YAML.
(b) edit_error_handler omitted muted_on_cancel / muted_on_user_path when
false, but the CLI always sends them, causing perpetual deepEqual
drift and a spurious editErrorHandler call on every sync push. Fix:
always persist both booleans.
migrateToGroupedFormat now preserves explicit `null` on
error_handler / success_handler as a "clear remote" signal distinct from
absence. Widen ErrorHandlerConfig | null / SuccessHandlerConfig | null to
make this explicit in the type.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(cli): sync support for workspace-level Slack OAuth override
Add slack_oauth_client_id and slack_oauth_client_secret to the v2 tarball
export and to pushWorkspaceSettings, so the workspace-level OAuth override
is now fully managed as code through settings.yaml.
Semantics:
- both defined and truthy → setWorkspaceSlackOauthConfig (upsert)
- both defined but falsy (e.g. empty strings) and remote has a value
→ deleteWorkspaceSlackOauthConfig
- either omitted → leave remote alone ("not managed by git")
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(cli): normalize workspace settings sync to "omit = clear"
Earlier commits on this branch introduced an "omit = keep" rule for
error_handler / success_handler / slack_oauth_client_{id,secret} that
diverged from every other workspace setting (webhook, deploy_to, etc. all
treat YAML as canonical: absence = clear). Normalize:
- v2 tarball always emits these 4 fields (null when remote is NULL) so
round-trip is bijective and settings.yaml is a complete snapshot.
- pushWorkspaceSettings drops the absent-from-YAML guards; YAML is
canonical. Absence and explicit null both clear the remote — same rule
as every other field.
- set_slack_oauth_config / delete_slack_oauth_config now fire
handle_deployment_metadata so UI mutations reach git-sync-enabled
workspaces' committed settings.yaml.
Policy for users: pull before push (same as every other setting). On first
post-upgrade pull, explicit `null` keys appear for any workspace whose
handlers / oauth override are unset — one-time YAML diff, no semantic
change.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(cli): add unit + integration coverage for Slack settings sync
Unit tests (settings_unit.test.ts): cover migrateToGroupedFormat preserving
explicit `null` on error_handler / success_handler, and passthrough of
slack_oauth_client_id / _secret (both populated and null values).
Integration tests (slack_settings_sync.test.ts, skipped on CI per the same
convention as datatable_settings_sync.test.ts): exercise the full backend
via withTestBackend to verify
1. pull emits null for unset error_handler / success_handler /
slack_oauth_client_id / _secret;
2. round-trip with all-null handlers is idempotent;
3. push of populated slack_oauth_config upserts;
4. omitting the slack_oauth keys from YAML clears remote (universal
"omit = clear" rule);
5. explicit null error_handler in YAML clears remote;
6. round-trip preserves a populated error_handler exactly, including the
always-persisted muted_on_cancel / muted_on_user_path booleans.
Also feature-gates `use crate::oauth2_oss::workspace_connect_slack` and its
route registration behind `cfg(feature = "oauth2")`: the import caused a
build failure on subsets of the workspace without the oauth2 feature,
surfaced by the integration test harness.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: bump ee-repo-ref to 59b6123
Pins windmill-ee-private to the tip of branch alp/slack_cli, which
contains the companion EE changes (helper extraction, non-interactive
Slack connect handlers, git-sync for Slack settings mutations).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Update SQLx metadata
* chore: regenerate system prompts for new slack CLI commands
Captures the new workspace connect-slack, workspace disconnect-slack,
and instance connect-slack commands in the auto-generated files that
CI enforces via system_prompts/check-freshness.sh.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: update ee-repo-ref to b4a5ca11e3b96ff03793c2bd396dbc1fe6ea1022
This commit updates the EE repository reference after PR #550 was merged in windmill-ee-private.
Previous ee-repo-ref: d7e44d0519327ec9077625130365e887826f324b
New ee-repo-ref: b4a5ca11e3b96ff03793c2bd396dbc1fe6ea1022
Automated by sync-ee-ref workflow.
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
313 lines
9.5 KiB
Rust
313 lines
9.5 KiB
Rust
/*
|
|
* Author: Ruben Fiszel
|
|
* Copyright: Windmill Labs, Inc 2022
|
|
* This file and its contents are licensed under the AGPLv3 License.
|
|
* Please see the included NOTICE for copyright information and
|
|
* LICENSE-AGPL for a copy of the license.
|
|
*/
|
|
|
|
// Re-export everything from windmill-api-workspaces
|
|
pub use windmill_api_workspaces::workspaces::*;
|
|
use windmill_api_workspaces::workspaces::{build_copilot_settings_state, InstanceAISummary};
|
|
|
|
use crate::ai::{invalidate_ai_request_cache_for_workspace, AIConfig};
|
|
use crate::db::ApiAuthed;
|
|
#[cfg(feature = "oauth2")]
|
|
use crate::oauth2_oss::workspace_connect_slack;
|
|
use crate::teams_oss::{
|
|
connect_teams, edit_teams_command, run_teams_message_test_job,
|
|
workspaces_list_available_teams_channels, workspaces_list_available_teams_ids,
|
|
};
|
|
|
|
use axum::{
|
|
extract::{Extension, Path},
|
|
routing::{get, post},
|
|
Json, Router,
|
|
};
|
|
use windmill_audit::audit_oss::audit_log;
|
|
use windmill_audit::ActionKind;
|
|
use windmill_common::{
|
|
error::{Error, JsonResult},
|
|
utils::require_admin,
|
|
DB,
|
|
};
|
|
use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
|
|
|
|
#[cfg(feature = "enterprise")]
|
|
use axum::extract::Query;
|
|
#[cfg(feature = "enterprise")]
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
#[cfg(feature = "enterprise")]
|
|
use windmill_common::error::Result;
|
|
#[cfg(feature = "enterprise")]
|
|
use windmill_common::utils::require_admin_or_devops;
|
|
|
|
/// Wraps the subcrate's workspaced_service with routes that depend on windmill-api internals.
|
|
pub fn workspaced_service() -> Router {
|
|
let router = windmill_api_workspaces::workspaces::workspaced_service()
|
|
.route("/edit_teams_command", post(edit_teams_command))
|
|
.route(
|
|
"/available_teams_ids",
|
|
get(workspaces_list_available_teams_ids),
|
|
)
|
|
.route(
|
|
"/available_teams_channels",
|
|
get(workspaces_list_available_teams_channels),
|
|
)
|
|
.route("/connect_teams", post(connect_teams))
|
|
.route(
|
|
"/run_teams_message_test_job",
|
|
post(run_teams_message_test_job),
|
|
)
|
|
.route("/tarball", get(crate::workspaces_export::tarball_workspace))
|
|
.route("/edit_copilot_config", post(edit_copilot_config))
|
|
.route("/get_copilot_info", get(get_copilot_info))
|
|
.route("/critical_alerts", get(get_critical_alerts))
|
|
.route(
|
|
"/critical_alerts/{id}/acknowledge",
|
|
post(acknowledge_critical_alert),
|
|
)
|
|
.route(
|
|
"/critical_alerts/acknowledge_all",
|
|
post(acknowledge_all_critical_alerts),
|
|
)
|
|
.route("/critical_alerts/mute", post(mute_critical_alerts));
|
|
|
|
#[cfg(feature = "oauth2")]
|
|
let router = router.route("/connect_slack", post(workspace_connect_slack));
|
|
|
|
#[cfg(all(feature = "stripe", feature = "enterprise"))]
|
|
{
|
|
crate::stripe_oss::add_stripe_routes(router)
|
|
}
|
|
|
|
#[cfg(not(feature = "stripe"))]
|
|
router
|
|
}
|
|
|
|
async fn edit_copilot_config(
|
|
authed: ApiAuthed,
|
|
Extension(db): Extension<DB>,
|
|
Path(w_id): Path<String>,
|
|
ApiAuthed { is_admin, username, .. }: ApiAuthed,
|
|
Json(ai_config): Json<AIConfig>,
|
|
) -> JsonResult<EditCopilotConfigResponse> {
|
|
require_admin(is_admin, &username)?;
|
|
|
|
if let Some(ref custom_prompts) = ai_config.custom_prompts {
|
|
for (mode, prompt) in custom_prompts.iter() {
|
|
if prompt.len() > MAX_CUSTOM_PROMPT_LENGTH {
|
|
return Err(Error::BadRequest(format!(
|
|
"Custom prompt for mode '{}' exceeds maximum length of {} characters (current: {})",
|
|
mode,
|
|
MAX_CUSTOM_PROMPT_LENGTH,
|
|
prompt.len()
|
|
)));
|
|
}
|
|
}
|
|
}
|
|
|
|
let mut tx = db.begin().await?;
|
|
|
|
sqlx::query!(
|
|
"UPDATE workspace_settings SET ai_config = $1 WHERE workspace_id = $2",
|
|
sqlx::types::Json(&ai_config) as sqlx::types::Json<&AIConfig>,
|
|
&w_id
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
|
|
invalidate_ai_request_cache_for_workspace(&w_id);
|
|
|
|
audit_log(
|
|
&mut *tx,
|
|
&authed,
|
|
"workspaces.edit_copilot_config",
|
|
ActionKind::Update,
|
|
&w_id,
|
|
Some(&authed.email),
|
|
Some([("ai_config", &format!("{:?}", ai_config)[..])].into()),
|
|
)
|
|
.await?;
|
|
tx.commit().await?;
|
|
|
|
handle_deployment_metadata(
|
|
&authed.email,
|
|
&authed.username,
|
|
&db,
|
|
&w_id,
|
|
DeployedObject::Settings { setting_type: "ai_config".to_string() },
|
|
Some("AI configuration updated".to_string()),
|
|
false,
|
|
None,
|
|
)
|
|
.await?;
|
|
|
|
let workspace_has_config = ai_config.has_providers();
|
|
let instance_ai_config =
|
|
sqlx::query_scalar!("SELECT value FROM global_settings WHERE name = 'ai_config'")
|
|
.fetch_optional(&db)
|
|
.await?;
|
|
let settings_state =
|
|
build_copilot_settings_state(workspace_has_config, instance_ai_config.as_ref());
|
|
let effective_ai_config = if workspace_has_config {
|
|
ai_config
|
|
} else if let Some(instance_ai_config) = instance_ai_config {
|
|
serde_json::from_value::<AIConfig>(instance_ai_config).unwrap_or_default()
|
|
} else {
|
|
AIConfig::default()
|
|
};
|
|
|
|
Ok(Json(EditCopilotConfigResponse {
|
|
effective_ai_config,
|
|
has_instance_ai_config: settings_state.has_instance_ai_config,
|
|
uses_instance_ai_config: settings_state.uses_instance_ai_config,
|
|
instance_ai_summary: settings_state.instance_ai_summary,
|
|
}))
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct EditCopilotConfigResponse {
|
|
effective_ai_config: AIConfig,
|
|
has_instance_ai_config: bool,
|
|
uses_instance_ai_config: bool,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
instance_ai_summary: Option<InstanceAISummary>,
|
|
}
|
|
|
|
async fn get_copilot_info(
|
|
Extension(db): Extension<DB>,
|
|
Path(w_id): Path<String>,
|
|
) -> JsonResult<AIConfig> {
|
|
let workspace_ai_config = sqlx::query_scalar!(
|
|
"SELECT ai_config as \"ai_config: sqlx::types::Json<AIConfig>\" FROM workspace_settings WHERE workspace_id = $1",
|
|
&w_id
|
|
)
|
|
.fetch_one(&db)
|
|
.await
|
|
.map_err(|e| {
|
|
Error::internal_err(format!(
|
|
"getting ai config: {e:#}"
|
|
))
|
|
})?;
|
|
|
|
if let Some(workspace_ai_config) = workspace_ai_config.filter(|c| c.0.has_providers()) {
|
|
Ok(Json(workspace_ai_config.0))
|
|
} else if let Some(instance_config) =
|
|
sqlx::query_scalar!("SELECT value FROM global_settings WHERE name = 'ai_config'")
|
|
.fetch_optional(&db)
|
|
.await?
|
|
{
|
|
Ok(Json(
|
|
serde_json::from_value::<AIConfig>(instance_config).unwrap_or_default(),
|
|
))
|
|
} else {
|
|
Ok(Json(AIConfig::default()))
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "enterprise")]
|
|
pub async fn get_critical_alerts(
|
|
Extension(db): Extension<DB>,
|
|
Path(w_id): Path<String>,
|
|
authed: ApiAuthed,
|
|
Query(params): Query<crate::utils::AlertQueryParams>,
|
|
) -> JsonResult<serde_json::Value> {
|
|
require_admin_or_devops(authed.is_admin, &authed.username, &authed.email, &db).await?;
|
|
|
|
crate::utils::get_critical_alerts(db, params, Some(w_id)).await
|
|
}
|
|
|
|
#[cfg(not(feature = "enterprise"))]
|
|
pub async fn get_critical_alerts() -> Error {
|
|
Error::NotFound("Critical Alerts require EE".to_string())
|
|
}
|
|
|
|
#[cfg(feature = "enterprise")]
|
|
pub async fn acknowledge_critical_alert(
|
|
Extension(db): Extension<DB>,
|
|
Path((w_id, id)): Path<(String, i32)>,
|
|
authed: ApiAuthed,
|
|
) -> Result<String> {
|
|
require_admin_or_devops(authed.is_admin, &authed.username, &authed.email, &db).await?;
|
|
crate::utils::acknowledge_critical_alert(db, Some(w_id), id).await
|
|
}
|
|
|
|
#[cfg(not(feature = "enterprise"))]
|
|
pub async fn acknowledge_critical_alert() -> Error {
|
|
Error::NotFound("Critical Alerts require EE".to_string())
|
|
}
|
|
|
|
#[cfg(feature = "enterprise")]
|
|
pub async fn acknowledge_all_critical_alerts(
|
|
Extension(db): Extension<DB>,
|
|
Path(w_id): Path<String>,
|
|
authed: ApiAuthed,
|
|
) -> Result<String> {
|
|
require_admin(authed.is_admin, &authed.username)?;
|
|
crate::utils::acknowledge_all_critical_alerts(db, Some(w_id)).await
|
|
}
|
|
|
|
#[cfg(not(feature = "enterprise"))]
|
|
pub async fn acknowledge_all_critical_alerts() -> Error {
|
|
Error::NotFound("Critical Alerts require EE".to_string())
|
|
}
|
|
|
|
#[cfg(feature = "enterprise")]
|
|
#[derive(Deserialize)]
|
|
pub struct MuteCriticalAlertRequest {
|
|
pub mute_critical_alerts: Option<bool>,
|
|
}
|
|
|
|
#[cfg(feature = "enterprise")]
|
|
async fn mute_critical_alerts(
|
|
Extension(db): Extension<DB>,
|
|
Path(w_id): Path<String>,
|
|
authed: ApiAuthed,
|
|
Json(m_r): Json<MuteCriticalAlertRequest>,
|
|
) -> Result<String> {
|
|
require_admin(authed.is_admin, &authed.username)?;
|
|
|
|
let mute_alerts = m_r.mute_critical_alerts.unwrap_or(false);
|
|
|
|
if mute_alerts {
|
|
sqlx::query!(
|
|
"UPDATE alerts SET acknowledged_workspace = true, acknowledged = true WHERE workspace_id = $1",
|
|
&w_id
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
}
|
|
|
|
sqlx::query!(
|
|
"UPDATE workspace_settings SET mute_critical_alerts = $1 WHERE workspace_id = $2",
|
|
mute_alerts,
|
|
&w_id
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
handle_deployment_metadata(
|
|
&authed.email,
|
|
&authed.username,
|
|
&db,
|
|
&w_id,
|
|
DeployedObject::Settings { setting_type: "critical_alerts".to_string() },
|
|
None,
|
|
false,
|
|
None,
|
|
)
|
|
.await?;
|
|
|
|
Ok(format!(
|
|
"Updated mute criticital alert ui settings for workspace: {}",
|
|
&w_id
|
|
))
|
|
}
|
|
|
|
#[cfg(not(feature = "enterprise"))]
|
|
pub async fn mute_critical_alerts() -> Error {
|
|
Error::NotFound("Critical Alerts require EE".to_string())
|
|
}
|